diff --git a/.gitignore b/.gitignore index 3b397883..b90092ff 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ example_rails_app/.idea/* cookbooks/* .vagrant/* test_rails_4_app/spec/mocks/* +*.sqlite3 diff --git a/Rakefile b/Rakefile index 1026456a..53c88a28 100644 --- a/Rakefile +++ b/Rakefile @@ -5,12 +5,14 @@ Dir.glob('tasks/*.rake').each { |r| import r } task :default => 'specs' +desc "run setup and tests" task :specs do Rake::Task["setup"].invoke Rake::Task["unit"].invoke Rake::Task["integration"].invoke end +desc "run tests" task :test do Rake::Task["unit"].invoke Rake::Task["integration"].invoke diff --git a/active_mocker.gemspec b/active_mocker.gemspec index 0b717fd7..46edabba 100644 --- a/active_mocker.gemspec +++ b/active_mocker.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "virtus", '~> 1.0' spec.add_runtime_dependency "ruby-progressbar", '~> 1.7' spec.add_runtime_dependency "colorize", "~> 0.7" - spec.add_runtime_dependency "rake", "~> 10.0" + spec.add_runtime_dependency "rake", ">= 10.0" spec.add_runtime_dependency "reverse_parameters", "~> 0.4.0" spec.add_runtime_dependency "active_record_schema_scrapper", "~> 0.2.1" spec.add_runtime_dependency "dissociated_introspection", "~> 0.4.1" diff --git a/tasks/integration.rake b/tasks/integration.rake index ab5b676b..c4d2e12c 100644 --- a/tasks/integration.rake +++ b/tasks/integration.rake @@ -1,3 +1,4 @@ +desc "run integration specs" task :integration do Dir.chdir("test_rails_4_app") do root = File.expand_path('../../', __FILE__) diff --git a/tasks/setup.rake b/tasks/setup.rake index b28cec49..95355b39 100644 --- a/tasks/setup.rake +++ b/tasks/setup.rake @@ -1,3 +1,4 @@ +desc "setup" task :setup do unless ENV["TRAVIS"] Bundler.with_clean_env do @@ -13,4 +14,4 @@ task :setup do Dir.chdir("test_rails_4_app") do sh "rake db:setup" end -end \ No newline at end of file +end diff --git a/tasks/unit.rake b/tasks/unit.rake index dda437f5..d798d969 100644 --- a/tasks/unit.rake +++ b/tasks/unit.rake @@ -1,3 +1,4 @@ +desc "Run unit specs" task :unit do sh "bundle exec rspec" -end \ No newline at end of file +end diff --git a/test_rails_4_app/gemfiles/rails_4.0.gemfile.lock b/test_rails_4_app/gemfiles/rails_4.0.gemfile.lock index 78940e2c..c4d22a52 100644 --- a/test_rails_4_app/gemfiles/rails_4.0.gemfile.lock +++ b/test_rails_4_app/gemfiles/rails_4.0.gemfile.lock @@ -6,7 +6,7 @@ PATH activesupport (~> 4.0) colorize (~> 0.7) dissociated_introspection (~> 0.4.1) - rake (~> 10.0) + rake (>= 10.0) reverse_parameters (~> 0.4.0) ruby-progressbar (~> 1.7) virtus (~> 1.0) @@ -106,7 +106,7 @@ GEM omniauth-identity (1.1.1) bcrypt-ruby (~> 3.0) omniauth (~> 1.0) - parser (2.3.0.6) + parser (2.3.1.0) ast (~> 2.2) procto (0.0.3) rack (1.6.4) @@ -159,7 +159,7 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.0) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.0) sprockets (3.4.0) rack (> 1, < 3) sprockets-rails (2.3.3) diff --git a/test_rails_4_app/gemfiles/rails_4.1.gemfile.lock b/test_rails_4_app/gemfiles/rails_4.1.gemfile.lock index b7236e59..c276509b 100644 --- a/test_rails_4_app/gemfiles/rails_4.1.gemfile.lock +++ b/test_rails_4_app/gemfiles/rails_4.1.gemfile.lock @@ -6,7 +6,7 @@ PATH activesupport (~> 4.0) colorize (~> 0.7) dissociated_introspection (~> 0.4.1) - rake (~> 10.0) + rake (>= 10.0) reverse_parameters (~> 0.4.0) ruby-progressbar (~> 1.7) virtus (~> 1.0) @@ -106,7 +106,7 @@ GEM omniauth-identity (1.1.1) bcrypt-ruby (~> 3.0) omniauth (~> 1.0) - parser (2.3.0.6) + parser (2.3.1.0) ast (~> 2.2) procto (0.0.3) rack (1.6.4) @@ -159,7 +159,7 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.0) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.0) sprockets (3.4.0) rack (> 1, < 3) sprockets-rails (2.3.3) diff --git a/test_rails_4_app/gemfiles/rails_4.2.gemfile.lock b/test_rails_4_app/gemfiles/rails_4.2.gemfile.lock index 3f562f9d..e56e8cb3 100644 --- a/test_rails_4_app/gemfiles/rails_4.2.gemfile.lock +++ b/test_rails_4_app/gemfiles/rails_4.2.gemfile.lock @@ -6,7 +6,7 @@ PATH activesupport (~> 4.0) colorize (~> 0.7) dissociated_introspection (~> 0.4.1) - rake (~> 10.0) + rake (>= 10.0) reverse_parameters (~> 0.4.0) ruby-progressbar (~> 1.7) virtus (~> 1.0) @@ -106,7 +106,7 @@ GEM omniauth-identity (1.1.1) bcrypt-ruby (~> 3.0) omniauth (~> 1.0) - parser (2.3.0.6) + parser (2.3.1.0) ast (~> 2.2) procto (0.0.3) rack (1.6.4) @@ -159,7 +159,7 @@ GEM rspec-mocks (~> 3.4.0) rspec-support (~> 3.4.0) rspec-support (3.4.0) - ruby-progressbar (1.7.5) + ruby-progressbar (1.8.0) sprockets (3.4.0) rack (> 1, < 3) sprockets-rails (2.3.3)