ruby-changes:67415
From: David <ko1@a...>
Date: Tue, 31 Aug 2021 19:06:58 +0900 (JST)
Subject: [ruby-changes:67415] 1d6551a02d (master): [rubygems/rubygems] Remove unnecessary `path` local variable
https://git.ruby-lang.org/ruby.git/commit/?id=1d6551a02d From 1d6551a02da866dc82866736cb216ce22dbd39d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Fri, 30 Jul 2021 12:27:11 +0200 Subject: [rubygems/rubygems] Remove unnecessary `path` local variable We can use `__dir__` directly. https://github.com/rubygems/rubygems/commit/0e6083ca94 --- lib/bundler/installer/standalone.rb | 3 +-- spec/bundler/install/gems/standalone_spec.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bundler/installer/standalone.rb b/lib/bundler/installer/standalone.rb index 0dd1ef0..10ccf7d 100644 --- a/lib/bundler/installer/standalone.rb +++ b/lib/bundler/installer/standalone.rb @@ -14,10 +14,9 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/installer/standalone.rb#L14 file.puts "require 'rbconfig'" file.puts "ruby_engine = RUBY_ENGINE" file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]" - file.puts "path = File.expand_path('..', __FILE__)" file.puts reverse_rubygems_kernel_mixin paths.each do |path| - file.puts %($:.unshift File.expand_path("\#{path}/#{path}")) + file.puts %($:.unshift File.expand_path("\#{__dir__}/#{path}")) end end end diff --git a/spec/bundler/install/gems/standalone_spec.rb b/spec/bundler/install/gems/standalone_spec.rb index 6578997..5a46e8b 100644 --- a/spec/bundler/install/gems/standalone_spec.rb +++ b/spec/bundler/install/gems/standalone_spec.rb @@ -159,7 +159,7 @@ RSpec.shared_examples "bundle install --standalone" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/gems/standalone_spec.rb#L159 it "generates a bundle/bundler/setup.rb with the proper paths" do expected_path = bundled_app("bundle/bundler/setup.rb") extension_line = File.read(expected_path).each_line.find {|line| line.include? "/extensions/" }.strip - expect(extension_line).to start_with '$:.unshift File.expand_path("#{path}/../#{ruby_engine}/#{ruby_version}/extensions/' + expect(extension_line).to start_with '$:.unshift File.expand_path("#{__dir__}/../#{ruby_engine}/#{ruby_version}/extensions/' expect(extension_line).to end_with '/very_simple_binary-1.0")' end end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/