diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-04-20 10:06:45 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-04-28 10:56:14 +0900 |
commit | de58dfc911738b2cbb2b848fa2e2cc93616a0ec5 (patch) | |
tree | bd8984ad0c91ba208e4429fd02ce29724874fa98 | |
parent | aca935a67042dd7b82e34844ae6139cedd66339d (diff) | |
download | ruby-de58dfc911738b2cbb2b848fa2e2cc93616a0ec5.tar.gz |
[rubygems/rubygems] Removed the depdendency of English library
English.rb is extracted to the default gems at
https://github.com/ruby/ruby/commit/2c5764ec223d976e0d0da1494596a1519104be3e
https://github.com/rubygems/rubygems/commit/532f488c0b
-rw-r--r-- | lib/rubygems/commands/contents_command.rb | 4 | ||||
-rw-r--r-- | lib/rubygems/commands/open_command.rb | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb index 989ca5855c..2da8c49031 100644 --- a/lib/rubygems/commands/contents_command.rb +++ b/lib/rubygems/commands/contents_command.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require 'English' require 'rubygems/command' require 'rubygems/version_option' @@ -106,7 +105,8 @@ prefix or only the files that are requireable. spec.files.map do |file| case file when /\A#{spec.bindir}\// - [RbConfig::CONFIG['bindir'], $POSTMATCH] + # $' is POSTMATCH + [RbConfig::CONFIG['bindir'], $'] when /\.so\z/ [RbConfig::CONFIG['archdir'], file] else diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb index 8eaeb64ba9..e538e58d46 100644 --- a/lib/rubygems/commands/open_command.rb +++ b/lib/rubygems/commands/open_command.rb @@ -1,5 +1,4 @@ # frozen_string_literal: true -require 'English' require 'rubygems/command' require 'rubygems/version_option' require 'rubygems/util' |