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-support (3.8.2)
rspec-wait (0.0.9) rspec-wait (0.0.9)
rspec (>= 3, < 4) rspec (>= 3, < 4)
rubocop (0.72.0) rubocop (0.73.0)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.6) parser (>= 2.6)

View File

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

View File

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