[前][次][番号順一覧][スレッド一覧]

ruby-changes:66734

From: Nobuyoshi <ko1@a...>
Date: Thu, 8 Jul 2021 17:58:58 +0900 (JST)
Subject: [ruby-changes:66734] d6cf4c0c99 (master): rbinstall.rb: just call File.basename directly

https://git.ruby-lang.org/ruby.git/commit/?id=d6cf4c0c99

From d6cf4c0c997752c9e23876a8d5c205737317a6e3 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 8 Jul 2021 17:58:25 +0900
Subject: rbinstall.rb: just call File.basename directly

---
 tool/rbinstall.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 7f522e5..305287c 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -22,7 +22,6 @@ require 'fileutils' https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L22
 require 'shellwords'
 require 'optparse'
 require 'optparse/shellwords'
-require 'pathname'
 require 'rubygems'
 begin
   require "zlib"
@@ -730,7 +729,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L729
           base = @base_dir
           prefix = base.sub(/lib\/.*?\z/, "")
           # for lib/net/net-smtp.gemspec
-          if m = Pathname.new(@gemspec).basename(".gemspec").to_s.match(/.*\-(.*)\z/)
+          if m = File.basename(@gemspec, ".gemspec").match(/.*\-(.*)\z/)
             base = "#{@base_dir}/#{m[1]}" unless remove_prefix(prefix, @base_dir).include?(m[1])
           end
         end
@@ -743,7 +742,7 @@ module RbInstall https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L742
                   [File.basename(@gemspec, '.gemspec') + '.rb']
                 end
 
-        case Pathname.new(@gemspec).basename(".gemspec").to_s
+        case File.basename(@gemspec, ".gemspec")
         when "net-http"
           files << "lib/net/https.rb"
         when "optparse"
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]