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

Fix code style.

Browse Source
This commit is contained in:
Markus Reiter 2020-12-11 16:24:49 +01:00 committed by Sam Ford
parent 90067ea8ed
commit 3b366d05b9
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/dsl.rb
View File

@ -278,7 +278,7 @@ module Cask
def livecheck(&block)
@livecheck ||= Livecheck.new(self)
return @livecheck unless block_given?
return @livecheck unless block
raise CaskInvalidError.new(cask, "'livecheck' stanza may only appear once.") if @livecheckable

12
Library/Homebrew/dev-cmd/livecheck.rb
View File

@ -61,16 +61,16 @@ module Homebrew
formulae_and_casks_to_check = if args.tap
tap = Tap.fetch(args.tap)
formulae = !args.cask? ? tap.formula_names.map { |name| Formula[name] } : []
casks = !args.formula? ? tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) } : []
formulae = args.cask? ? [] : tap.formula_names.map { |name| Formula[name] }
casks = args.formula? ? [] : tap.cask_tokens.map { |token| Cask::CaskLoader.load(token) }
formulae + casks
elsif args.installed?
formulae = !args.cask? ? Formula.installed : []
casks = !args.formula? ? Cask::Caskroom.casks : []
formulae = args.cask? ? [] : Formula.installed
casks = args.formula? ? [] : Cask::Caskroom.casks
formulae + casks
elsif args.all?
formulae = !args.cask? ? Formula.to_a : []
casks = !args.formula? ? Cask::Cask.to_a : []
formulae = args.cask? ? [] : Formula.to_a
casks = args.formula? ? [] : Cask::Cask.to_a
formulae + casks
elsif args.named.present?
if args.formula?

34
Library/Homebrew/livecheck/livecheck.rb
View File

@ -120,15 +120,15 @@ module Homebrew
separator, method = livecheck_version
Version.new(formula_or_cask.version.to_s.split(separator, 2).try(method))
elsif formula
if formula.head_only?
formula.any_installed_version.version.commit
else
formula.stable.version
end
if formula.head_only?
formula.any_installed_version.version.commit
else
formula.stable.version
end
elsif livecheck_version.is_a?(Symbol)
Version.new(Cask::DSL::Version.new(formula_or_cask.version).try(livecheck_version))
else
Version.new(formula_or_cask.version)
else
Version.new(formula_or_cask.version)
end
latest = if formula&.stable? || cask
@ -269,9 +269,9 @@ module Homebrew
if formula&.deprecated? && !formula.livecheckable?
return status_hash(formula, "deprecated", args: args) if args.json?
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
return
end
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : deprecated" unless args.quiet?
return
end
if formula&.disabled? && !formula.livecheckable?
return status_hash(formula, "disabled", args: args) if args.json?
@ -283,17 +283,17 @@ module Homebrew
if formula&.versioned_formula? && !formula.livecheckable?
return status_hash(formula, "versioned", args: args) if args.json?
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
return
end
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : versioned" unless args.quiet?
return
end
if formula&.head_only? && !formula.any_version_installed?
head_only_msg = "HEAD only formula must be installed to be livecheckable"
return status_hash(formula, "error", [head_only_msg], args: args) if args.json?
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
return
end
puts "#{Tty.red}#{formula_name(formula, args: args)}#{Tty.reset} : #{head_only_msg}" unless args.quiet?
return
end
is_gist = formula&.stable&.url&.include?("gist.github.com")
if formula_or_cask.livecheck.skip? || is_gist
@ -312,7 +312,7 @@ module Homebrew
puts "#{Tty.red}#{formula_or_cask_name(formula_or_cask, args: args)}#{Tty.reset} : skipped" \
"#{" - #{skip_msg}" if skip_msg.present?}"
end
return
return
end
false