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

Fix style issues

Browse Source
This commit is contained in:
William Ma 2020-06-22 16:07:18 -04:00
parent 0e61ca6715
commit 78ccb05166
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/--cache.rb
View File

@ -38,14 +38,16 @@ module Homebrew
else
puts formula.cached_download
end
rescue FormulaUnavailableError => fe
rescue FormulaUnavailableError => e
formula_error_message = e.message
begin
cask = Cask::CaskLoader.load name
puts "cask: #{Cask::Cmd::Cache.cached_location(cask)}"
rescue Cask::CaskUnavailableError => ce
rescue Cask::CaskUnavailableError => e
cask_error_message = e.message
odie "No available formula or cask with the name \"#{name}\"\n" \
"#{fe.message}\n" \
"#{ce.message}\n"
"#{formula_error_message}\n" \
"#{cask_error_message}\n"
end
end
end

10
Library/Homebrew/cmd/home.rb
View File

@ -27,15 +27,17 @@ module Homebrew
else
homepages = args.named.map do |ref|
Formulary.factory(ref).homepage
rescue FormulaUnavailableError => fe
rescue FormulaUnavailableError => e
formula_error_message = e.message
begin
cask = Cask::CaskLoader.load(ref)
puts "Formula \"#{ref}\" not found. Found a cask instead."
cask.homepage
rescue Cask::CaskUnavailableError => ce
rescue Cask::CaskUnavailableError => e
cask_error_message = e.message
odie "No available formula or cask with the name \"#{name}\"\n" \
"#{fe.message}\n" \
"#{ce.message}\n"
"#{formula_error_message}\n" \
"#{cask_error_message}\n"
end
end
exec_browser(*homepages)

6
Library/Homebrew/test/cmd/home_spec.rb
View File

@ -31,8 +31,7 @@ describe "brew home", :integration_test do
it "opens the homepage for a given Cask" do
expect { brew "home", cask_path("local-caffeine"), "HOMEBREW_BROWSER" => "echo" }
.to output(/Formula "#{local_caffeine_path}" not found. Found a cask instead.\n#{local_caffeine_homepage}/m)
.to_stdout
.to output(/#{local_caffeine_homepage}/).to_stdout
.and not_to_output.to_stderr
.and be_a_success
end
@ -41,8 +40,7 @@ describe "brew home", :integration_test do
setup_test_formula "testballhome"
expect { brew "home", "testballhome", cask_path("local-caffeine"), "HOMEBREW_BROWSER" => "echo" }
.to output(/Formula "#{local_caffeine_path}" not found. Found a cask instead.\n#{testballhome_homepage} #{local_caffeine_homepage}/m)
.to_stdout
.to output(/#{testballhome_homepage} #{local_caffeine_homepage}/).to_stdout
.and not_to_output.to_stderr
.and be_a_success
end