diff options
| author | Olle Jonsson <olle.jonsson@auctionet.com> | 2020-04-19 22:39:42 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-06-05 07:32:42 +0900 |
| commit | 5eacf4e72cffadde3c4c2b6dada6cd5343310ae3 (patch) | |
| tree | e5e98963fa1a51886eaea7ba84201e05ee545e83 /lib | |
| parent | f8f5e7fadf689a11a8ee28b7af4e7777e2dec1ea (diff) | |
Enable rubocop-performance StartWith cop
- this would keep the could-be-a-string-method matches few
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3184
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/command.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/platform.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/security/signer.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/specification.rb | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb index 1c9ce033be..f08749bf98 100644 --- a/lib/rubygems/command.rb +++ b/lib/rubygems/command.rb @@ -456,9 +456,7 @@ class Gem::Command until extra.empty? do ex = [] ex << extra.shift - if (!extra.first.to_s.empty? && !extra.first.to_s.start_with?("-")) - ex << extra.shift - end + ex << extra.shift if extra.first.to_s =~ /^[^-]/ # rubocop:disable Performance/StartWith result << ex if handles?(ex) end diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index cf676854dc..92e6126ada 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -584,9 +584,9 @@ class Gem::Installer def shebang(bin_file_name) ruby_name = RbConfig::CONFIG['ruby_install_name'] if @env_shebang path = File.join gem_dir, spec.bindir, bin_file_name - first_line = File.open(path, "rb") {|file| file.gets} + first_line = File.open(path, "rb") {|file| file.gets} || "" - if /\A#!/ =~ first_line + if first_line.start_with?("#!") # Preserve extra words on shebang line, like "-w". Thanks RPA. shebang = first_line.sub(/\A\#!.*?ruby\S*((\s+\S+)+)/, "#!#{Gem.ruby}") opts = $1 diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 1692eb7e5d..868a9de3b9 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -150,7 +150,7 @@ class Gem::Platform # cpu ([nil,'universal'].include?(@cpu) or [nil, 'universal'].include?(other.cpu) or @cpu == other.cpu or - (@cpu == 'arm' and other.cpu =~ /\Aarm/)) and + (@cpu == 'arm' and other.cpu.start_with?("arm"))) and # os @os == other.os and diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb index 8fb1b1ddc1..cc1d109dc8 100644 --- a/lib/rubygems/security/signer.rb +++ b/lib/rubygems/security/signer.rb @@ -109,7 +109,7 @@ class Gem::Security::Signer subject_alt_name = cert.extensions.find { |e| 'subjectAltName' == e.oid } if subject_alt_name - /\Aemail:/ =~ subject_alt_name.value + /\Aemail:/ =~ subject_alt_name.value # rubocop:disable Performance/StartWith $' || subject_alt_name.value else diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index 1d698074b9..362cb3756b 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1151,7 +1151,7 @@ class Gem::Specification < Gem::BasicSpecification def self.normalize_yaml_input(input) result = input.respond_to?(:read) ? input.read : input - result = "--- " + result unless result =~ /\A--- / + result = "--- " + result unless result.start_with?("--- ") result = result.dup result.gsub!(/ !!null \n/, " \n") # date: 2011-04-26 00:00:00.000000000Z @@ -2104,7 +2104,7 @@ class Gem::Specification < Gem::BasicSpecification end if @specification_version > CURRENT_SPECIFICATION_VERSION and - sym.to_s.end_with?("=") + sym.to_s.end_with?("=") warn "ignoring #{sym} loading #{full_name}" if $DEBUG else super |