summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-17 12:11:24 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-17 18:41:12 +0100
commita9e819aa5a4021c8e29dcdc8da3aae34963bdbfe (patch)
treeec314031dfb20c35656fbbe6370eb294fc71e09a
parenta03dd65152775c93e939aedff58c09827d72357f (diff)
downloadbundler-fix_rubygems_bundler_integration.tar.gz
Add compatibility methods for `rubygems-bundler` gemfix_rubygems_bundler_integration
Hopefully `rvm` won't install this gem by default, but for now I'm adding the following two methods for compatibility with it.
-rw-r--r--.travis.yml3
-rw-r--r--Rakefile8
-rw-r--r--lib/bundler/rubygems_integration.rb8
3 files changed, 19 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 47e775cba7..e7828fd4af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,9 @@ jobs:
- rvm: 2.6.5
script: bin/rake rubocop
stage: linting
+ - rvm: 2.6.5
+ script: bin/rake check_rvm_integration
+ stage: linting
# Ruby 2.3 also tested in 2.x mode
- rvm: 2.3.8
env: RGV=master
diff --git a/Rakefile b/Rakefile
index 841563bc79..4fd9a5179a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -122,6 +122,14 @@ task :rubocop do
sh("bin/rubocop --parallel")
end
+desc "Check RVM integration"
+task :check_rvm_integration do
+ # The rubygems-bundler gem is installed by RVM by default and it could easily
+ # break when we change bundler. Make sure that binstubs still run with it
+ # installed.
+ sh("bin/rake install && gem install rubygems-bundler && rake -T")
+end
+
namespace :man do
if RUBY_ENGINE == "jruby"
task(:build) {}
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 3ca1831dee..17f2d7d9fa 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -496,6 +496,14 @@ module Bundler
end
end
+ def plain_specs
+ Gem::Specification._all
+ end
+
+ def plain_specs=(specs)
+ Gem::Specification.all = specs
+ end
+
def fetch_specs(remote, name)
path = remote.uri.to_s + "#{name}.#{Gem.marshal_version}.gz"
fetcher = gem_remote_fetcher