Add common logger configuration

Joel AZEMAR committed Apr 21, 2014

commit b11fb2bbc9613d1b47c3b83d34e83f5e3473ce46

.gitignore +1 -0

.travis.yml +2 -1

Gemfile +13 -1

@@	@@ -11,7 +11,19 @@ gemspec
	# gem 'locomotivecms_common', path: '../gems/common/', require: false
	# gem 'locomotivecms_steam', path: '../gems/steam/' require: false

+	group :development do
+	gem 'locomotivecms_common', '~> 0.0.1', path: '../common'
+	end
+
	group :test do
	gem 'pry'
	gem 'coveralls', require: false
-	end
	\ No newline at end of file
+	end
+
+	platform :jruby do
+	ruby '1.9.3', engine: 'jruby', engine_version: '1.7.11'
+	end
+
+	platform :ruby do
+	ruby '2.1.1'
+	end

bin/wagon +3 -8

@@	@@ -1,11 +1,6 @@
-	#!/usr/bin/env ruby
-
-	# needed if you launch it without bundler
-	$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
-
	$stdout.sync = true

-	require 'locomotive/wagon'
-	require 'locomotive/wagon/cli'
+	require_relative 'locomotive/wagon'
+	require_relative 'locomotive/wagon/cli'

-	Locomotive::Wagon::CLI::Main.start
	\ No newline at end of file
+	Locomotive::Wagon::CLI::Main.start

locomotive/wagon.rb b/lib/locomotive/wagon.rb +2 -2

@@	@@ -1,6 +1,6 @@
	require 'common'
+	require 'locomotive/wagon/initializers'
	require 'locomotive/wagon/version'
-	require 'locomotive/wagon/logger'
	require 'locomotive/wagon/listen'
	require 'better_errors'

@@	@@ -210,4 +210,4 @@ module Locomotive
	end
	end
	end
-	end
	\ No newline at end of file
+	end

locomotive/wagon/initializers.rb b/lib/locomotive/wagon/initializers.rb +5 -0

@@	@@ -0,0 +1,5 @@
+	# require_relative 'initializers/*'
+
+	Locomotive::Common.configure do \|config\|
+	config.notifier = Locomotive::Common::Logger.setup
+	end

locomotivecms_wagon.gemspec +7 -7

@@	@@ -25,17 +25,17 @@ Gem::Specification.new do \|gem\|

	gem.add_dependency 'httmultiparty', '0.3.10'
	gem.add_dependency 'locomotivecms_mounter', '~> 1.4.0'
-	gem.add_dependency 'locomotivecms_steam', '~> 0.1.0'
+	# gem.add_dependency 'locomotivecms_steam', '~> 0.1.1'
	gem.add_dependency 'locomotivecms_common', '~> 0.0.1'
-	gem.add_dependency 'better_errors', '~> 1.0'
-	gem.add_dependency 'listen', '~> 2.4.0'
+	gem.add_dependency 'better_errors', '~> 1.1'
+	gem.add_dependency 'listen', '~> 2.7'

-	gem.add_dependency 'faker', '~> 0.9.5'
+	gem.add_dependency 'faker', '~> 1.3.0'

-	gem.add_development_dependency 'rake', '~> 10.0.4'
-	gem.add_development_dependency 'rspec', '~> 2.6.0'
+	gem.add_development_dependency 'rake', '~> 10.3.1'
+	gem.add_development_dependency 'rspec', '~> 2.14.1'
	gem.add_development_dependency 'vcr'
-	gem.add_development_dependency 'webmock', '~> 1.8.0'
+	gem.add_development_dependency 'webmock', '~> 1.17.4'
	gem.add_development_dependency 'rack-test'
	gem.add_development_dependency 'launchy'
	end

spec/spec_helper.rb +14 -11

@@	@@ -1,20 +1,23 @@
-	require "locomotive/wagon"
-	require "rspec"
-	require "launchy"
+	require 'rubygems'
+	require 'bundler/setup'
+
+	require 'launchy'
	require 'coveralls'
	require 'pry'
-	Coveralls.wear!

-	Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do \|file\|
-	require file
-	end
+	require_relative '../lib/locomotive/wagon'
+	require_relative 'support'
+
+	Coveralls.wear!

	RSpec.configure do \|config\|
	config.include Spec::Helpers
-	config.before(:all) { remove_logs }
-	config.before { reset! }
-	config.after { reset! }
+
	config.filter_run focused: true
	config.run_all_when_everything_filtered = true

-	end
	\ No newline at end of file
+	config.before(:all) { remove_logs }
+	config.before { reset! }
+
+	config.after { reset! }
+	end

spec/support.rb +2 -0

@@	@@ -0,0 +1,2 @@
+	require_relative 'support/matchers'
+	require_relative 'support/helpers'