Update bin

Author: chrisseaton

bin/bundle

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# ignored by Ruby interpreter
+
+# get the absolute path of the executable and resolve symlinks
+SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
+while [ -h "$SELF_PATH" ]; do
+  # 1) cd to directory of the symlink
+  # 2) cd to the directory of where the symlink points
+  # 3) get the pwd
+  # 4) append the basename
+  DIR=$(dirname "$SELF_PATH")
+  SYM=$(readlink "$SELF_PATH")
+  SELF_PATH=$(cd "$DIR" && cd "$(dirname "$SYM")" && pwd)/$(basename "$SYM")
+done
+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)
+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)
+end

bin/bundler

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# ignored by Ruby interpreter
+
+# get the absolute path of the executable and resolve symlinks
+SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
+while [ -h "$SELF_PATH" ]; do
+  # 1) cd to directory of the symlink
+  # 2) cd to the directory of where the symlink points
+  # 3) get the pwd
+  # 4) append the basename
+  DIR=$(dirname "$SELF_PATH")
+  SYM=$(readlink "$SELF_PATH")
+  SELF_PATH=$(cd "$DIR" && cd "$(dirname "$SYM")" && pwd)/$(basename "$SYM")
+done
+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)
+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)
+end

bin/irb

@@ -17,6 +17,8 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 #!ruby
 # ^ marks start of Ruby interpretation
 
+# from libexec/irb
+
 #
 #   irb.rb - interactive ruby
 #   	$Release Version: 0.9.6 $

bin/rdoc

@@ -17,6 +17,8 @@ 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)

bin/ri

@@ -17,6 +17,8 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
 #!ruby
 # ^ marks start of Ruby interpretation
 
+# from libexec/ri
+
 begin
   gem 'rdoc'
 rescue NameError => e # --disable-gems

mx.truffleruby/mx_truffleruby.py

@@ -145,6 +145,8 @@ def ruby_testdownstream_sulong(args):
         'truffleruby:TRUFFLERUBY_GRAALVM_SUPPORT',
     ],
     provided_executables=[
+        'bin/bundle',
+        'bin/bundler',
         'bin/gem',
         'bin/irb',
         'bin/rake',

mx.truffleruby/suite.py

@@ -384,6 +384,8 @@
                 "LICENSE_TRUFFLERUBY.md": "file:LICENCE.md",
                 "3rd_party_licenses_truffleruby.txt": "file:3rd_party_licenses.txt",
                 "bin/": [
+                    "file:bin/bundle",
+                    "file:bin/bundler",
                     "file:bin/gem",
                     "file:bin/irb",
                     "file:bin/rake",