ruby-changes:65255
From: Nobuyoshi <ko1@a...>
Date: Sun, 14 Feb 2021 17:47:44 +0900 (JST)
Subject: [ruby-changes:65255] 504d6dc429 (master): Revert following rbinstall.rb changes
https://git.ruby-lang.org/ruby.git/commit/?id=504d6dc429 From 504d6dc429f931d0ea45d1b0d969cd27476ff91b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 14 Feb 2021 16:49:14 +0900 Subject: Revert following rbinstall.rb changes Because unexpected names are listed in gemspec files. * "Fix gemspec only case" fc56b96b09e477686975c978142e3af9179219cd * "Refined installation of gemspecs placed other than ext and lib" 31f4dec6373c15a58899f8b86e35d48a7d813bf6 --- tool/rbinstall.rb | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 56502f1..debf73a 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -701,20 +701,14 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L701 when "lib" base = @base_dir prefix = base.sub(/lib\/.*?\z/, "") - else - # other/something.gemspec -> - # [other/something.rb, other/something/foo.rb, ...] - base = @gemspec.chomp('.gemspec') - prefix = @base_dir end - libs = Dir.glob("#{base}{.rb,/**/*.rb}").collect do |ruby_source| - remove_prefix(prefix, ruby_source) - end - if libs.empty? - [File.basename(@gemspec, '.gemspec') + '.rb'] + if base + Dir.glob("#{base}{.rb,/**/*.rb}").collect do |ruby_source| + remove_prefix(prefix, ruby_source) + end else - libs + [File.basename(@gemspec, '.gemspec') + '.rb'] end end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/