summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-07-21 05:38:07 +0000
committerSamuel Giddins <segiddins@segiddins.me>2017-07-21 14:45:02 -0500
commitb1b26def07d9826e9b90ca680ac3784b6bd98e49 (patch)
tree7130a9565342d6750ca54496b43b3a7e53a80613
parent00537302eaf1d413f98195011b1869284758d04c (diff)
downloadbundler-b1b26def07d9826e9b90ca680ac3784b6bd98e49.tar.gz
Auto merge of #5890 - bundler:seg-require-gemdeps, r=colby-swandale
[RubyGemsIntegration] Require bundler/gemdeps before using it ### What was the end-user problem that led to this PR? The problem was `Bundler.rubygems.use_gemdeps` would raise a missing constant error. ### What was your diagnosis of the problem? My diagnosis was we needed to require the gemdeps file ### What is your fix for the problem, implemented in this PR? My fix requires the gemdeps file. ### Why did you choose this fix out of the possible options? I chose this fix because watching autocorrect struggle to understand that `gemdeps` is not the same as `genders` is priceless. (cherry picked from commit 4bcb475eecedf2a84c3aa6cf077e137f430784d1)
-rw-r--r--lib/bundler/rubygems_integration.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index e33ae41b50..2e4d01ffb9 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -814,6 +814,7 @@ module Bundler
def use_gemdeps(gemfile)
ENV["BUNDLE_GEMFILE"] ||= File.expand_path(gemfile)
+ require "bundler/gemdeps"
runtime = Bundler.setup
Bundler.ui = nil
activated_spec_names = runtime.requested_specs.map(&:to_spec).sort_by(&:name)