Merge pull request #847 from marshall-lee/tracepoint-allow-reentry

 Use TracePoint.allow_reentry to support TracePoint events while eval

Author: deivid-rodriguez

.github/workflows/ubuntu.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        version: [2.5.8, 2.6.6, 2.7.2]
+        version: [2.5.9, 2.6.10, 2.7.8, 3.0.6, 3.1.4, 3.2.2]
         line_editor: [libedit, readline]
         compiler: [clang, gcc]
 

.rubocop.yml

@@ -7,6 +7,7 @@ require:
 AllCops:
   Exclude:
     - tmp/**/*
+    - bin/*
 
   DisplayCopNames: true
   DisplayStyleGuide: true

Gemfile.lock

@@ -56,4 +56,4 @@ DEPENDENCIES
   yard (= 0.9.26)
 
 BUNDLED WITH
-   2.2.0.rc.2
+   2.3.26

bin/bundle

@@ -1,42 +1,114 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
 require "rubygems"
 
 m = Module.new do
-  extend self
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_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`
+    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
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
 
   def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
     File.expand_path("../Gemfile", __dir__)
   end
 
   def lockfile
-    "#{gemfile}.lock"
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
   end
 
   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
 
-    regexp = /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-
-    regexp.match(lockfile_contents)[1]
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version || cli_arg_version ||
+        bundler_requirement_for(lockfile_version)
   end
 
-  def bundler_version
-    @bundler_version ||= lockfile_version
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem.rubygems_version < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
   end
 
   def load_bundler!
     ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-    activate_bundler(bundler_version)
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    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
 
-  def activate_bundler(bundler_version)
-    gem "bundler", bundler_version
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
   end
 end
 
 m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

bin/mdl

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["BUNDLE_GEMFILE"] = File.expand_path("gemfiles/lint/Gemfile")
-
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLE_GEMFILE"] = File.expand_path("../gemfiles/lint/Gemfile", __dir__)
 
+require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("mdl", "mdl")

bin/minitest

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
+require "rubygems"
 require "bundler/setup"
 
 require_relative "../test/minitest_runner"
 
-Byebug::MinitestRunner.new.run
+exit Byebug::MinitestRunner.new.run

bin/rake

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
+require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("rake", "rake")

bin/rubocop

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["BUNDLE_GEMFILE"] = File.expand_path("gemfiles/lint/Gemfile")
-
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLE_GEMFILE"] = File.expand_path("../gemfiles/lint/Gemfile", __dir__)
 
+require "rubygems"
 require "bundler/setup"
 
 load Gem.bin_path("rubocop", "rubocop")

bin/setup.sh

@@ -4,8 +4,8 @@ set -eo pipefail
 
 set +x
 
-gem update --system 3.1.2
-gem install bundler --version 2.2.0.rc.2 --force
+gem update --system 3.4.20
+gem install bundler --version 2.3.26 --force
 
 bundle install
 

docker/manager.rb

@@ -10,9 +10,12 @@ module Docker
   #
   class Manager
     VERSIONS = %w[
-      2.5.8
-      2.6.6
-      2.7.2
+      2.5.9
+      2.6.10
+      2.7.8
+      3.0.6
+      3.1.4
+      3.2.2
     ].freeze
 
     LINE_EDITORS = %w[