aboutsummaryrefslogtreecommitdiffstats
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:50 -0500
commit3c5446a3b700d0da44cb990a68aa73e199d7b2a1 (patch)
treef8880166b09fa252e1ebb70e68f6c55327035bf9 /spec
parent89eda4101d5e29a45238a9e757870ae58d1cfa59 (diff)
downloadbundler-3c5446a3b700d0da44cb990a68aa73e199d7b2a1.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 05c09a0b..068d3810 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -236,7 +236,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
@@ -609,7 +611,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