aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-11-30 21:07:46 -0800
committerAndre Arko <andre@arko.net>2012-11-30 21:07:46 -0800
commit2a1fb62c969f71bdeecf2d4965be047f1af3d375 (patch)
tree4bb9445ac881d3fa413a366b7e03ddb98a90aca5
parent96fc0e114871f72c5a4691e7b122cb202d29371e (diff)
downloadbundler-2a1fb62c969f71bdeecf2d4965be047f1af3d375.tar.gz
try to force rake 10.0.2 everywhere
-rw-r--r--.travis.yml3
-rw-r--r--Rakefile1
-rw-r--r--spec/install/gemspec_spec.rb2
-rw-r--r--spec/lock/lockfile_spec.rb4
-rw-r--r--spec/other/newgem_spec.rb2
-rw-r--r--spec/other/show_spec.rb2
-rw-r--r--spec/support/builders.rb2
7 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 01a0afcb..35563b2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
language: ruby
script: rake spec:travis
before_script:
+ - rake --version
- sudo apt-get install groff -y
- rake spec:deps
+ - gem list rake
+ - rake --version
notifications:
email:
- mail@arko.net
diff --git a/Rakefile b/Rakefile
index 54cd5ae7..997155fd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -22,6 +22,7 @@ namespace :spec do
task :deps do
sh "#{Gem.ruby} -S gem list ronn | (grep 'ronn' 1> /dev/null) || #{Gem.ruby} -S gem install ronn --no-ri --no-rdoc"
sh "#{Gem.ruby} -S gem list rspec | (grep 'rspec (2.' 1> /dev/null) || #{Gem.ruby} -S gem install rspec --no-ri --no-rdoc"
+ sh "#{Gem.ruby} -S gem list rake | (grep 'rake (10.' 1> /dev/null) || #{Gem.ruby} -S gem install rake -v '~> 10.0.2' --no-ri --no-rdoc"
end
end
diff --git a/spec/install/gemspec_spec.rb b/spec/install/gemspec_spec.rb
index a8d0f3d3..7746e459 100644
--- a/spec/install/gemspec_spec.rb
+++ b/spec/install/gemspec_spec.rb
@@ -114,7 +114,7 @@ describe "bundle install from an existing gemspec" do
build_lib("foo", :path => tmp.join("foo")) do |s|
s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
s.add_dependency "actionpack", "=2.3.2"
- s.add_development_dependency "rake", '=0.8.7'
+ s.add_development_dependency "rake", '=10.0.2'
end
Dir.chdir(tmp.join("foo")) do
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 45173f3b..2f51a3b0 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -317,8 +317,8 @@ describe "the lockfile format" do
actionpack (= 2.3.2)
activerecord (= 2.3.2)
activeresource (= 2.3.2)
- rake (= 0.8.7)
- rake (0.8.7)
+ rake (= 10.0.2)
+ rake (10.0.2)
PLATFORMS
#{generic(Gem::Platform.local)}
diff --git a/spec/other/newgem_spec.rb b/spec/other/newgem_spec.rb
index e89c2148..d289c838 100644
--- a/spec/other/newgem_spec.rb
+++ b/spec/other/newgem_spec.rb
@@ -73,7 +73,7 @@ describe "bundle gem" do
end
it "runs rake without problems" do
- system_gems ["rake-0.8.7"]
+ system_gems ["rake-10.0.2"]
rakefile = <<-RAKEFILE
task :default do
diff --git a/spec/other/show_spec.rb b/spec/other/show_spec.rb
index a44b330c..46ca7e65 100644
--- a/spec/other/show_spec.rb
+++ b/spec/other/show_spec.rb
@@ -41,7 +41,7 @@ describe "bundle show" do
it "prints path of all gems in bundle" do
bundle "show --paths"
- expect(out).to include(default_bundle_path('gems', 'rake-0.8.7').to_s)
+ expect(out).to include(default_bundle_path('gems', 'rake-10.0.2').to_s)
expect(out).to include(default_bundle_path('gems', 'rails-2.3.2').to_s)
end
end
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 12049fee..95524a3f 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -35,7 +35,7 @@ module Spec
build_gem "rails", "2.3.2" do |s|
s.executables = "rails"
- s.add_dependency "rake", "0.8.7"
+ s.add_dependency "rake", "10.0.2"
s.add_dependency "actionpack", "2.3.2"
s.add_dependency "activerecord", "2.3.2"
s.add_dependency "actionmailer", "2.3.2"