ruby-changes:61089
From: David <ko1@a...>
Date: Fri, 8 May 2020 14:14:00 +0900 (JST)
Subject: [ruby-changes:61089] df39476a12 (master): [rubygems/rubygems] Remove unneeded dups
https://git.ruby-lang.org/ruby.git/commit/?id=df39476a12 From df39476a122135de458d614dec7ad34ef05ebdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 8 Apr 2020 20:58:32 +0200 Subject: [rubygems/rubygems] Remove unneeded dups https://github.com/rubygems/rubygems/commit/2f072e3dc7 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index a330157..62d0922 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1637,8 +1637,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1637 assert_equal expected_specs, Gem.use_gemdeps.sort_by { |s| s.name } end - LIB_PATH = File.expand_path "../../../lib".dup, __FILE__.dup - BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }.dup + LIB_PATH = File.expand_path "../../../lib", __FILE__ + BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) } BUNDLER_FULL_NAME = "bundler-#{Bundler::VERSION}".freeze def add_bundler_full_name(names) @@ -1665,7 +1665,7 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1665 ENV['RUBYGEMS_GEMDEPS'] = "-" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup, "-I#{LIB_PATH}", + cmd = [Gem.ruby, "-I#{LIB_PATH}", "-I#{BUNDLER_LIB_PATH}", "-rrubygems"] cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" @@ -1703,7 +1703,7 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1703 Dir.mkdir "sub1" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup, "-Csub1", "-I#{LIB_PATH}", + cmd = [Gem.ruby, "-Csub1", "-I#{LIB_PATH}", "-I#{BUNDLER_LIB_PATH}", "-rrubygems"] cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/