Bundler 2.7 compatibility

[g-arjones]

On top of #395

See https://bundler.io/changelog.html#270-2025-07-16
and ruby/rubygems#8345

[g-arjones]

Alternatively, we could also have something like:

def write_bundle_shim(shims_path, bundler_version: nil)
    script = <<~INSTALLER
        require 'rubygems/installer'
        spec = Gem::Specification.find_by_name("bundler", '#{bundler_version || '>= 0'}')
        installer = Gem::Installer.for_spec(spec)
        installer.generate_bin_script("bundle", '#{shims_path}')
    INSTALLER

    pid = fork { exec(env_for_child, Gem.ruby, "-e", script) }
    Process.wait(pid)

    raise "Could not generate 'bundle' binstub" unless $CHILD_STATUS.success?
end

Instead of hardcoding the contents of the shim... @doudou thoughts?

[g-arjones]

Tagging @dbcesar since you mentioned you would like to have a look

[doudou]

Just did a rebase on master.

[doudou]

Alternatively, we could also have something like:

def write_bundle_shim(shims_path, bundler_version: nil)
    script = <<~INSTALLER
        require 'rubygems/installer'
        spec = Gem::Specification.find_by_name("bundler", '#{bundler_version || '>= 0'}')
        installer = Gem::Installer.for_spec(spec)
        installer.generate_bin_script("bundle", '#{shims_path}')
    INSTALLER

    pid = fork { exec(env_for_child, Gem.ruby, "-e", script) }
    Process.wait(pid)

    raise "Could not generate 'bundle' binstub" unless $CHILD_STATUS.success?
end

Instead of hardcoding the contents of the shim... @doudou thoughts?

It feels better.

The fork/exec/wait is done by system, which returns false if the command failed.

[doudou]

Hey ... I might be a tiny bit lost here.

bundle is not generating a binstub for bundle, but gem is, and we install bundler with gem. I don't think this is the right fix, actually. I guess we should be picking bundle from $GEM_HOME/bin instead of from our binstub path.

[g-arjones]

I guess we should be picking bundle from $GEM_HOME/bin instead of from our binstub path.

Yes, my initial plan was to store the path to the gem-generated stub in a bundle_executable config setting and then use it instead of the autoproj-generated one in BundlerManager. However, in the end, I figured the current patch was better with regard to backward compatibility.

In hindsight, maybe we could have a "minimal" shim that just exec's the stub generated by gem. Similar to what we do with .autoproj/bin/ruby. This would be backward-compatible and avoid having to write the stub ourselves. What do you think?

[doudou]

I guess we should be picking bundle from $GEM_HOME/bin instead of from our binstub path.

Yes, my initial plan was to store the path to the gem-generated stub in a bundle_executable config setting and then use it instead of the autoproj-generated one in BundlerManager. However, in the end, I figured the current patch was better with regard to backward compatibility.

In hindsight, maybe we could have a "minimal" shim that just exec's the stub generated by gem. Similar to what we do with .autoproj/bin/ruby. This would be backward-compatible and avoid having to write the stub ourselves. What do you think?

Sounds good. The bundler/rubygem's people plan is definitely to have people use the gem-generated stub, better follow their plan ;-)

[g-arjones]

@doudou Done!