Merge pull request #6297 from Homebrew/dependabot/bundler/Library/Homebrew/rubocop-0.73.0

build: bump rubocop from 0.72.0 to 0.73.0 in /Library/Homebrew
This commit is contained in:
Mike McQuaid 2019-07-17 09:21:10 +01:00 committed by GitHub
commit 6fcd4734db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 22 deletions

View File

@ -80,7 +80,7 @@ GEM
rspec-support (3.8.2)
rspec-wait (0.0.9)
rspec (>= 3, < 4)
rubocop (0.72.0)
rubocop (0.73.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)

View File

@ -59,23 +59,19 @@ module Cask
end
def self.installation_info(cask)
return "Not installed\n" unless cask.installed?
install_info = +""
if cask.installed?
cask.versions.each do |version|
versioned_staged_path = cask.caskroom_path.join(version)
install_info << versioned_staged_path.to_s
.concat(" (")
.concat(
if versioned_staged_path.exist?
then versioned_staged_path.abv
else Formatter.error("does not exist")
end,
).concat(")\n")
cask.versions.each do |version|
versioned_staged_path = cask.caskroom_path.join(version)
path_details = if versioned_staged_path.exist?
versioned_staged_path.abv
else
Formatter.error("does not exist")
end
install_info.freeze
else
"Not installed\n"
install_info << "#{versioned_staged_path} (#{path_details})\n"
end
install_info.freeze
end
def self.name_info(cask)

View File

@ -66,13 +66,13 @@ class AbstractDownloadStrategy
def chdir
entries = Dir["*"]
case entries.length
when 0 then raise "Empty archive"
when 1 then begin
Dir.chdir entries.first
rescue
nil
end
raise "Empty archive" if entries.length.zero?
return if entries.length != 1
begin
Dir.chdir entries.first
rescue
nil
end
end
private :chdir