[GR-20580] Update bundler/bundle to match format expected by rubygems installer.

bjfish · bjfish · commit 49f199abd48f · 2020-01-16T09:15:04.000Z
PullRequest: truffleruby/1264
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,6 +70,7 @@ Bug fixes:
 * Fixed `ENV.udpate` implementation.
 * Fixed argument handling in `Kernel.printf`.
 * Fixed character length after conversion to binary from a non-US-ASCII String.
+* Fixed issue with installing latest bundler (#1880).
 
 Compatibility:
 
diff --git a/bin/bundle b/bin/bundle
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
@@ -16,34 +19,29 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 
 #!ruby
 # ^ marks start of Ruby interpretation
-
-# from libexec/bundler (not libexec/bundle)
-
-# Exit cleanly from an early interrupt
-Signal.trap("INT") do
-  Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
-  exit 1
-end
-
-require "bundler"
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
 end
 
-require "bundler/friendly_errors"
-Bundler.with_friendly_errors do
-  require "bundler/cli"
-
-  # Allow any command to use --help flag to show help for that command
-  help_flags = %w[--help -h]
-  help_flag_used = ARGV.any? {|a| help_flags.include? a }
-  args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
-
-  Bundler::CLI.start(args, :debug => true)
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundle', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundle", version)
 end
diff --git a/bin/bundler b/bin/bundler
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
@@ -16,34 +19,29 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 
 #!ruby
 # ^ marks start of Ruby interpretation
-
-# from libexec/bundler
-
-# Exit cleanly from an early interrupt
-Signal.trap("INT") do
-  Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
-  exit 1
-end
-
-require "bundler"
-# Check if an older version of bundler is installed
-$LOAD_PATH.each do |path|
-  next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
-  err = String.new
-  err << "Looks like you have a version of bundler that's older than 0.9.\n"
-  err << "Please remove your old versions.\n"
-  err << "An easy way to do this is by running `gem cleanup bundler`."
-  abort(err)
+#
+# This file was generated by RubyGems.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
 end
 
-require "bundler/friendly_errors"
-Bundler.with_friendly_errors do
-  require "bundler/cli"
-
-  # Allow any command to use --help flag to show help for that command
-  help_flags = %w[--help -h]
-  help_flag_used = ARGV.any? {|a| help_flags.include? a }
-  args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
-
-  Bundler::CLI.start(args, :debug => true)
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('bundler', 'bundler', version)
+else
+gem "bundler", version
+load Gem.bin_path("bundler", "bundler", version)
 end
diff --git a/bin/irb b/bin/irb
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
@@ -17,15 +20,22 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 #!ruby
 # ^ marks start of Ruby interpretation
 
-# from libexec/irb
+require 'rubygems'
 
-#
-#   irb.rb - interactive ruby
-#   	$Release Version: 0.9.6 $
-#   	$Revision$
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
+version = ">= 0.a"
 
-require "irb"
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
 
-IRB.start(__FILE__)
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('irb', 'irb', version)
+else
+gem "irb", version
+load Gem.bin_path("irb", "irb", version)
+end
diff --git a/bin/rake b/bin/rake
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
diff --git a/bin/rdoc b/bin/rdoc
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
@@ -17,48 +20,22 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 #!ruby
 # ^ marks start of Ruby interpretation
 
-# from libexec/rdoc
-
-#
-#  RDoc: Documentation tool for source code
-#        (see lib/rdoc/rdoc.rb for more information)
-#
-#  Copyright (c) 2003 Dave Thomas
-#  Released under the same terms as Ruby
-
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+require 'rubygems'
 
-require 'rdoc/rdoc'
+version = ">= 0.a"
 
-begin
-  r = RDoc::RDoc.new
-  r.document ARGV
-rescue Errno::ENOSPC
-  $stderr.puts 'Ran out of space creating documentation'
-  $stderr.puts
-  $stderr.puts 'Please free up some space and try again'
-rescue SystemExit
-  raise
-rescue Exception => e
-  if $DEBUG_RDOC then
-    $stderr.puts e.message
-    $stderr.puts "#{e.backtrace.join "\n\t"}"
-    $stderr.puts
-  elsif Interrupt === e then
-    $stderr.puts
-    $stderr.puts 'Interrupted'
-  else
-    $stderr.puts "uh-oh! RDoc had a problem:"
-    $stderr.puts e.message
-    $stderr.puts
-    $stderr.puts "run with --debug for full backtrace"
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
   end
-
-  exit 1
 end
 
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'rdoc', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "rdoc", version)
+end
diff --git a/bin/ri b/bin/ri
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 # ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
@@ -17,15 +21,22 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 #!ruby
 # ^ marks start of Ruby interpretation
 
-# from libexec/ri
+require 'rubygems'
 
-begin
-  gem 'rdoc'
-rescue NameError => e # --disable-gems
-  raise unless e.name == :gem
-rescue Gem::LoadError
-end
+version = ">= 0.a"
 
-require 'rdoc/ri/driver'
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
 
-RDoc::RI::Driver.run ARGV
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rdoc', 'ri', version)
+else
+gem "rdoc", version
+load Gem.bin_path("rdoc", "ri", version)
+end
diff --git a/doc/contributor/updating-ruby.md b/doc/contributor/updating-ruby.md
@@ -100,7 +100,10 @@ shebang has a format as follows:
 
 ```bash
 #!/usr/bin/env bash
-# ignored by Ruby interpreter
+#
+# This file was generated by RubyGems.
+# The above lines match the format expected by rubygems/installer.rb check_executable_overwrite
+# bash section ignored by the Ruby interpreter
 
 # get the absolute path of the executable and resolve symlinks
 SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
