summaryrefslogtreecommitdiff
path: root/bin/bundle
diff options
context:
space:
mode:
Diffstat (limited to 'bin/bundle')
-rwxr-xr-xbin/bundle38
1 files changed, 21 insertions, 17 deletions
diff --git a/bin/bundle b/bin/bundle
index ee73929..22995af 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -8,7 +8,7 @@
# this file is here to facilitate running it.
#
-require "rubygems"
+require 'rubygems'
m = Module.new do
module_function
@@ -18,36 +18,36 @@ m = Module.new do
end
def env_var_version
- ENV["BUNDLER_VERSION"]
+ ENV['BUNDLER_VERSION']
end
def cli_arg_version
return unless invoked_as_script? # don't want to hijack other binstubs
- return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+ return unless 'update'.start_with?(ARGV.first || ' ') # must be running `bundle update`
+
bundler_version = nil
update_index = nil
ARGV.each_with_index do |a, i|
- if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
- bundler_version = a
- end
+ bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
- bundler_version = $1
+
+ bundler_version = Regexp.last_match(1)
update_index = i
end
bundler_version
end
def gemfile
- gemfile = ENV["BUNDLE_GEMFILE"]
+ gemfile = ENV['BUNDLE_GEMFILE']
return gemfile if gemfile && !gemfile.empty?
- File.expand_path("../Gemfile", __dir__)
+ File.expand_path('../Gemfile', __dir__)
end
def lockfile
lockfile =
case File.basename(gemfile)
- when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+ when 'gems.rb' then gemfile.sub(/\.rb$/, gemfile)
else "#{gemfile}.lock"
end
File.expand_path(lockfile)
@@ -55,8 +55,10 @@ m = Module.new do
def lockfile_version
return unless File.file?(lockfile)
+
lockfile_contents = File.read(lockfile)
return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
Regexp.last_match(1)
end
@@ -76,20 +78,24 @@ m = Module.new do
end
def load_bundler!
- ENV["BUNDLE_GEMFILE"] ||= gemfile
+ ENV['BUNDLE_GEMFILE'] ||= gemfile
activate_bundler
end
def activate_bundler
gem_error = activation_error_handling do
- gem "bundler", bundler_requirement
+ gem 'bundler', bundler_requirement
end
return if gem_error.nil?
+
require_error = activation_error_handling do
- require "bundler/version"
+ require 'bundler/version'
+ end
+ if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+ return
end
- return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+
warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
exit 42
end
@@ -104,6 +110,4 @@ end
m.load_bundler!
-if m.invoked_as_script?
- load Gem.bin_path("bundler", "bundle")
-end
+load Gem.bin_path('bundler', 'bundle') if m.invoked_as_script?