Skip to content

Commit

Permalink
Merge pull request #43 from markburns/patch-1
Browse files Browse the repository at this point in the history
Make rake dependency less strict
  • Loading branch information
zeisler committed Apr 30, 2016
2 parents 1e57b5a + 9f0c87f commit 1372a8c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -25,3 +25,4 @@ example_rails_app/.idea/*
cookbooks/*
.vagrant/*
test_rails_4_app/spec/mocks/*
*.sqlite3
2 changes: 2 additions & 0 deletions Rakefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion active_mocker.gemspec
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions 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__)
Expand Down
3 changes: 2 additions & 1 deletion tasks/setup.rake
@@ -1,3 +1,4 @@
desc "setup"
task :setup do
unless ENV["TRAVIS"]
Bundler.with_clean_env do
Expand All @@ -13,4 +14,4 @@ task :setup do
Dir.chdir("test_rails_4_app") do
sh "rake db:setup"
end
end
end
3 changes: 2 additions & 1 deletion tasks/unit.rake
@@ -1,3 +1,4 @@
desc "Run unit specs"
task :unit do
sh "bundle exec rspec"
end
end
6 changes: 3 additions & 3 deletions test_rails_4_app/gemfiles/rails_4.0.gemfile.lock
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions test_rails_4_app/gemfiles/rails_4.1.gemfile.lock
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions test_rails_4_app/gemfiles/rails_4.2.gemfile.lock
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 1372a8c

Please sign in to comment.