admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix style issues

Browse Source
This commit is contained in:
L. E. Segovia 2017-11-06 18:33:29 -03:00
parent 7f2e4f583a
commit 84c128411f
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/cask/lib/hbc/cli/upgrade.rb
View File

@ -13,14 +13,12 @@ module Hbc
end end
def run def run
outdated_casks = casks(alternative: -> { Hbc.installed }).find_all { |cask| cask.outdated?(greedy?) } outdated_casks = casks(alternative: -> { Hbc.installed }).select { |cask| cask.outdated?(greedy?) }
if outdated_casks.empty? return if outdated_casks.empty?
oh1 "No packages to upgrade"
else oh1 "Upgrading #{Formatter.pluralize(outdated_casks.length, "outdated package")}, with result:"
oh1 "Upgrading #{Formatter.pluralize(outdated_casks.length, "outdated package")}, with result:" puts outdated_casks.map { |f| "#{f.full_name} #{f.version}" } * ", "
puts outdated_casks.map { |f| "#{f.full_name} #{f.version}" } * ", "
end
outdated_casks.each do |old_cask| outdated_casks.each do |old_cask|
odebug "Uninstalling Cask #{old_cask}" odebug "Uninstalling Cask #{old_cask}"

12
Library/Homebrew/cask/lib/hbc/installer.rb
View File

@ -31,7 +31,7 @@ module Hbc
@upgrade = upgrade @upgrade = upgrade
end end
attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?, :verbose? attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?, :upgrade?, :verbose?
def self.print_caveats(cask) def self.print_caveats(cask)
odebug "Printing caveats" odebug "Printing caveats"
@ -84,7 +84,7 @@ module Hbc
odebug "Hbc::Installer#install" odebug "Hbc::Installer#install"
if @cask.installed? && !force? && !@reinstall if @cask.installed? && !force? && !@reinstall
raise CaskAlreadyInstalledError, @cask unless @upgrade raise CaskAlreadyInstalledError, @cask unless upgrade?
end end
check_conflicts check_conflicts
@ -130,7 +130,7 @@ module Hbc
installed_cask = installed_caskfile.exist? ? CaskLoader.load(installed_caskfile) : @cask installed_cask = installed_caskfile.exist? ? CaskLoader.load(installed_caskfile) : @cask
# Always force uninstallation, ignore method parameter # Always force uninstallation, ignore method parameter
Installer.new(installed_cask, binaries: binaries?, verbose: verbose?, force: true, upgrade: @upgrade).uninstall Installer.new(installed_cask, binaries: binaries?, verbose: verbose?, force: true, upgrade: upgrade?).uninstall
end end
def summary def summary
@ -374,7 +374,7 @@ module Hbc
end end
def start_upgrade def start_upgrade
return unless @upgrade return unless upgrade?
oh1 "Starting upgrade for Cask #{@cask}" oh1 "Starting upgrade for Cask #{@cask}"
disable_accessibility_access disable_accessibility_access
@ -382,13 +382,13 @@ module Hbc
end end
def revert_upgrade def revert_upgrade
return unless @upgrade return unless upgrade?
opoo "Reverting upgrade for Cask #{@cask}" opoo "Reverting upgrade for Cask #{@cask}"
reinstall reinstall
end end
def finalize_upgrade def finalize_upgrade
return unless @upgrade return unless upgrade?
purge_versioned_files(upgrade: true) purge_versioned_files(upgrade: true)
oh1 "Cask #{@cask} was successfully upgraded!" oh1 "Cask #{@cask} was successfully upgraded!"
end end