summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTerence Lee <hone02@gmail.com>2013-12-17 01:43:05 -0500
committerTerence Lee <hone02@gmail.com>2013-12-17 22:02:43 -0500
commitbc56cc49f0ace974967b9d7d1037ecf1bce3292b (patch)
tree00679a07b94376e6b5a8564d63ffb922f08855e0 /spec
parentbead9260b6eea2ef6bc1327f945caa79d764118a (diff)
downloadbundler-bc56cc49f0ace974967b9d7d1037ecf1bce3292b.tar.gz
fix build for Ruby 2.1.0
Diffstat (limited to 'spec')
-rw-r--r--spec/support/builders.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 856f0479cc..9cb923bf55 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -234,7 +234,9 @@ module Spec
end
# Capistrano did this (at least until version 2.5.10)
- build_gem "double_deps" do |s|
+ # Rubygems 2.2 doesn't allow the specifying of a dependency twice
+ # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f
+ build_gem "double_deps", "1.0", :skip_validation => true do |s|
s.add_dependency "net-ssh", ">= 1.0.0"
s.add_dependency "net-ssh"
end
@@ -605,7 +607,7 @@ module Spec
@spec.authors = ["that guy"]
end
- Bundler.rubygems.build(@spec)
+ Bundler.rubygems.build(@spec, opts[:skip_validation])
if opts[:to_system]
`gem install --ignore-dependencies #{@spec.full_name}.gem`
else