Merge remote-tracking branch 'upstream/master' into mb-only-some-locals

Author: tekknolagi

.github/dependabot.yml

@@ -15,6 +15,8 @@ updates:
     directories:
       - '/yjit'
       - '/zjit'
+    exclude-paths:
+      - 'gc/mmtk/**'
     schedule:
       interval: 'daily'
     groups:

NEWS.md

@@ -66,7 +66,8 @@ releases.
 * resolv-replace 0.2.0
 * syslog 0.4.0
 * repl_type_completor 0.1.13
-* rdoc 7.1.0
+* rdoc 7.2.0
+* irb 1.17.0
 
 ### RubyGems and Bundler
 

gems/bundled_gems

@@ -39,9 +39,9 @@ ostruct             0.6.3   https://github.com/ruby/ostruct
 pstore              0.2.0   https://github.com/ruby/pstore
 benchmark           0.5.0   https://github.com/ruby/benchmark
 logger              1.7.0   https://github.com/ruby/logger
-rdoc                7.1.0   https://github.com/ruby/rdoc
+rdoc                7.2.0   https://github.com/ruby/rdoc
 win32ole            1.9.2   https://github.com/ruby/win32ole
-irb                 1.16.0  https://github.com/ruby/irb
+irb                 1.17.0  https://github.com/ruby/irb
 reline              0.6.3   https://github.com/ruby/reline
 readline            0.0.4   https://github.com/ruby/readline
 fiddle              1.1.8   https://github.com/ruby/fiddle

ruby.c

@@ -2301,6 +2301,16 @@ process_options_global_setup(const ruby_cmdline_options_t *opt, const rb_iseq_t
     rb_exec_event_hook_script_compiled(ec, iseq, script);
 }
 
+static bool
+has_dir_sep(const char *path)
+{
+    if (strchr(path, '/')) return true;
+#ifdef _WIN32
+    if (strchr(path, '\\')) return true;
+#endif
+    return false;
+}
+
 static VALUE
 process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 {
@@ -2406,7 +2416,7 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
             if (!opt->script || opt->script[0] == '\0') {
                 opt->script = "-";
             }
-            else if (opt->do_search) {
+            else if (opt->do_search && !has_dir_sep(opt->script)) {
                 const char *path = getenv("RUBYPATH");
 
                 opt->script = 0;

spec/ruby/command_line/dash_upper_s_spec.rb

@@ -2,28 +2,66 @@
 
 describe 'The -S command line option' do
   before :each do
-    @path = [ENV['PATH'], fixture(__FILE__, "bin")].join(':')
+    @bin = fixture(__FILE__, "bin")
+    @path = [ENV['PATH'], @bin].join(File::PATH_SEPARATOR)
   end
 
   platform_is_not :windows do
     # On VirtualBox shared directory (vboxsf) all files are world writable
     # and MRI shows warning when including world writable path in ENV['PATH'].
     # This is why we are using /success$/ matching in the following cases.
 
+    it "runs launcher found in RUBYPATH, but only code after the first /\#!.*ruby.*/-ish line in target file" do
+      result = ruby_exe(nil, options: '-S hybrid_launcher.sh', env: { 'RUBYPATH' => @bin }, args: '2>&1')
+      result.should =~ /success$/
+    end
+
     it "runs launcher found in PATH, but only code after the first /\#!.*ruby.*/-ish line in target file" do
       result = ruby_exe(nil, options: '-S hybrid_launcher.sh', env: { 'PATH' => @path }, args: '2>&1')
       result.should =~ /success$/
     end
 
+    it "runs launcher found in RUBYPATH" do
+      result = ruby_exe(nil, options: '-S launcher.rb', env: { 'RUBYPATH' => @bin }, args: '2>&1')
+      result.should =~ /success$/
+    end
+
     it "runs launcher found in PATH" do
       result = ruby_exe(nil, options: '-S launcher.rb', env: { 'PATH' => @path }, args: '2>&1')
       result.should =~ /success$/
     end
 
+    it "runs launcher found in RUBYPATH and sets the exit status to 1 if it fails" do
+      result = ruby_exe(nil, options: '-S dash_s_fail', env: { 'RUBYPATH' => @bin }, args: '2>&1', exit_status: 1)
+      result.should =~ /\bdie\b/
+      $?.exitstatus.should == 1
+    end
+
     it "runs launcher found in PATH and sets the exit status to 1 if it fails" do
       result = ruby_exe(nil, options: '-S dash_s_fail', env: { 'PATH' => @path }, args: '2>&1', exit_status: 1)
       result.should =~ /\bdie\b/
       $?.exitstatus.should == 1
     end
+
+    ruby_version_is "4.1" do
+      describe "if the script name contains separator" do
+        before(:each) do
+          @bin = File.dirname(@bin)
+          @path = [ENV['PATH'], @bin].join(File::PATH_SEPARATOR)
+        end
+
+        it "does not search launcher in RUBYPATH" do
+          result = ruby_exe(nil, options: '-S bin/launcher.rb', env: { 'RUBYPATH' => @bin }, args: '2>&1', exit_status: 1)
+          result.should =~ /LoadError/
+          $?.should_not.success?
+        end
+
+        it "does not search launcher in PATH" do
+          result = ruby_exe(nil, options: '-S bin/launcher.rb', env: { 'PATH' => @path }, args: '2>&1', exit_status: 1)
+          result.should =~ /LoadError/
+          $?.should_not.success?
+        end
+      end
+    end
   end
 end

spec/ruby/core/unboundmethod/equal_value_spec.rb

@@ -35,6 +35,12 @@
 
     @method_one = UnboundMethodSpecs::Methods.instance_method(:one)
     @method_two = UnboundMethodSpecs::Methods.instance_method(:two)
+
+    @mixin = UnboundMethodSpecs::Mixin.instance_method(:mixin_method)
+    @includer_base = UnboundMethodSpecs::IncluderBase.new.method(:mixin_method).unbind
+    @includer_child = UnboundMethodSpecs::IncluderChild.new.method(:mixin_method).unbind
+    @extender_base = UnboundMethodSpecs::ExtenderBase.method(:mixin_method).unbind
+    @extender_child = UnboundMethodSpecs::ExtenderChild.method(:mixin_method).unbind
   end
 
   it "returns true if objects refer to the same method" do
@@ -91,6 +97,30 @@
     (@includer == @includee).should == true
   end
 
+  ruby_bug "#21873", ""..."4.1" do
+    it "returns true if same method is present in an object through module inclusion" do
+      (@mixin == @includer_base).should == true
+      (@includer_base == @mixin).should == true
+
+      (@mixin == @includer_child).should == true
+      (@includer_child == @mixin).should == true
+
+      (@includer_base == @includer_child).should == true
+      (@includer_child == @includer_base).should == true
+    end
+
+    it "returns true if same method is present in an object through module extension" do
+      (@mixin == @extender_base).should == true
+      (@extender_base == @mixin).should == true
+
+      (@mixin == @extender_child).should == true
+      (@extender_child == @mixin).should == true
+
+      (@extender_base == @extender_child).should == true
+      (@extender_child == @extender_base).should == true
+    end
+  end
+
   it "returns false if both have same Module, same name, identical body but not the same" do
     class UnboundMethodSpecs::Methods
       def discard_1; :discard; end

spec/ruby/core/unboundmethod/fixtures/classes.rb

@@ -80,6 +80,22 @@ class << self
     end
   end
 
+  module Mixin
+    def mixin_method; end
+  end
+
+  class IncluderBase
+    include Mixin
+  end
+
+  class IncluderChild < IncluderBase; end
+
+  class ExtenderBase
+    extend Mixin
+  end
+
+  class ExtenderChild < ExtenderBase; end
+
   class A
     def baz(a, b)
       return [__FILE__, self.class]

test/ruby/test_require.rb

@@ -54,7 +54,7 @@ def test_require_too_long_filename
     end;
 
     begin
-      assert_in_out_err(["-S", "-w", "foo/" * 1024 + "foo"], "") do |r, e|
+      assert_in_out_err(["-S", "-w", (["foo"] * 1025).join("_")], "") do |r, e|
         assert_equal([], r)
         assert_operator(2, :<=, e.size)
         assert_match(/warning: openpath: pathname too long \(ignored\)/, e.first)

test/ruby/test_rubyoptions.rb

@@ -446,37 +446,28 @@ def test_rubyopt
   def test_search
     rubypath_orig = ENV['RUBYPATH']
     path_orig = ENV['PATH']
+    libpath = (path_orig if path_orig && RbConfig::CONFIG['LIBPATHENV'] == 'PATH')
 
-    Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) {|t|
-      t.puts "p 1"
-      t.close
-
-      @verbose = $VERBOSE
-      $VERBOSE = nil
+    Dir.mktmpdir("test_ruby_test_rubyoption") do |path|
+      name = "test_rubyoption.rb"
+      parent, dir = File.split(path)
+      File.write("#{path}/#{name}", "p 1")
+      load_error = %r[#{Regexp.quote dir}/#{Regexp.quote name} \(LoadError\)]
 
-      path, name = File.split(t.path)
-
-      ENV['PATH'] = (path_orig && RbConfig::CONFIG['LIBPATHENV'] == 'PATH') ?
-          [path, path_orig].join(File::PATH_SEPARATOR) : path
+      ENV['PATH'] = [path, *libpath].join(File::PATH_SEPARATOR)
       assert_in_out_err(%w(-S) + [name], "", %w(1), [])
+      ENV['PATH'] = [parent, *libpath].join(File::PATH_SEPARATOR)
+      assert_in_out_err(%W(-S) + ["#{dir}/#{name}"], "", [], load_error)
       ENV['PATH'] = path_orig
 
       ENV['RUBYPATH'] = path
       assert_in_out_err(%w(-S) + [name], "", %w(1), [])
-    }
-
-  ensure
-    if rubypath_orig
+      ENV['RUBYPATH'] = parent
+      assert_in_out_err(%w(-S) + ["#{dir}/#{name}"], "", [], load_error)
+    ensure
       ENV['RUBYPATH'] = rubypath_orig
-    else
-      ENV.delete('RUBYPATH')
-    end
-    if path_orig
       ENV['PATH'] = path_orig
-    else
-      ENV.delete('PATH')
     end
-    $VERBOSE = @verbose
   end
 
   def test_shebang