From ba7ffb2db8c12614b2610083a769702193d57515 Mon Sep 17 00:00:00 2001 From: Wes Higbee Date: Mon, 6 Mar 2023 07:31:48 -0600 Subject: [PATCH 1/6] mention alternative in brew cat failure message --- Library/Homebrew/dev-cmd/cat.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb index ec466c6e1a79e..a596e3e7db903 100644 --- a/Library/Homebrew/dev-cmd/cat.rb +++ b/Library/Homebrew/dev-cmd/cat.rb @@ -53,7 +53,7 @@ def cat end if Homebrew.failed? - $stderr.puts "The name may be wrong, or the tap hasn't been tapped." + $stderr.puts "The name may be wrong, or the tap hasn't been tapped. Consider using `brew info --github formula|cask [...]` instead." return end From 1e95de4757f4cb6117160df73c94f64a780be8eb Mon Sep 17 00:00:00 2001 From: Wes Higbee Date: Mon, 6 Mar 2023 07:51:36 -0600 Subject: [PATCH 2/6] split up suggestions --- Library/Homebrew/dev-cmd/cat.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb index a596e3e7db903..ff0e429a4649a 100644 --- a/Library/Homebrew/dev-cmd/cat.rb +++ b/Library/Homebrew/dev-cmd/cat.rb @@ -53,7 +53,8 @@ def cat end if Homebrew.failed? - $stderr.puts "The name may be wrong, or the tap hasn't been tapped. Consider using `brew info --github formula|cask [...]` instead." + $stderr.puts "The name may be wrong, or the tap hasn't been tapped." + $stderr.puts "Consider using `brew info --github formula|cask [...]` instead." return end From 12d93c480fc9779bc8c7bf2f888cf0423faff57d Mon Sep 17 00:00:00 2001 From: Wes Higbee Date: Mon, 6 Mar 2023 13:30:06 -0600 Subject: [PATCH 3/6] include formula/cask args in brew info --github suggestion --- Library/Homebrew/dev-cmd/cat.rb | 2 +- Library/Homebrew/test/dev-cmd/cat_spec.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb index ff0e429a4649a..0a10a5f41da43 100644 --- a/Library/Homebrew/dev-cmd/cat.rb +++ b/Library/Homebrew/dev-cmd/cat.rb @@ -54,7 +54,7 @@ def cat if Homebrew.failed? $stderr.puts "The name may be wrong, or the tap hasn't been tapped." - $stderr.puts "Consider using `brew info --github formula|cask [...]` instead." + $stderr.puts "Consider using `brew info --github #{args.named.join(" ")}` instead." return end diff --git a/Library/Homebrew/test/dev-cmd/cat_spec.rb b/Library/Homebrew/test/dev-cmd/cat_spec.rb index 6a5d6a6d79351..3d2fce97917e4 100644 --- a/Library/Homebrew/test/dev-cmd/cat_spec.rb +++ b/Library/Homebrew/test/dev-cmd/cat_spec.rb @@ -15,4 +15,13 @@ .and not_to_output.to_stderr .and be_a_success end + + describe "when a source file isn't found" do + it "prints a suggestion to use brew info --github" , :integration_test do + + expect { brew "cat", "asdf", "bogus"} + .to output(/Consider using `brew info --github asdf bogus` instead/).to_stderr + .and be_a_failure + end + end end From 66c268b190c7435db94f9d146ac6ddf5709a6765 Mon Sep 17 00:00:00 2001 From: Wes Higbee Date: Mon, 6 Mar 2023 13:43:28 -0600 Subject: [PATCH 4/6] rearrange output to easily copy command suggestion --- Library/Homebrew/dev-cmd/cat.rb | 4 ++-- Library/Homebrew/test/dev-cmd/cat_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/cat.rb b/Library/Homebrew/dev-cmd/cat.rb index 0a10a5f41da43..2d77b8056c233 100644 --- a/Library/Homebrew/dev-cmd/cat.rb +++ b/Library/Homebrew/dev-cmd/cat.rb @@ -53,8 +53,8 @@ def cat end if Homebrew.failed? - $stderr.puts "The name may be wrong, or the tap hasn't been tapped." - $stderr.puts "Consider using `brew info --github #{args.named.join(" ")}` instead." + $stderr.puts "The name may be wrong, or the tap hasn't been tapped. Instead try:" + $stderr.puts " brew info --github #{args.named.join(" ")}" return end diff --git a/Library/Homebrew/test/dev-cmd/cat_spec.rb b/Library/Homebrew/test/dev-cmd/cat_spec.rb index 3d2fce97917e4..5741878b9c00b 100644 --- a/Library/Homebrew/test/dev-cmd/cat_spec.rb +++ b/Library/Homebrew/test/dev-cmd/cat_spec.rb @@ -20,7 +20,7 @@ it "prints a suggestion to use brew info --github" , :integration_test do expect { brew "cat", "asdf", "bogus"} - .to output(/Consider using `brew info --github asdf bogus` instead/).to_stderr + .to output(/brew info --github asdf bogus/).to_stderr .and be_a_failure end end From f9b73ca621e371c317ed34954b562a05a445d36b Mon Sep 17 00:00:00 2001 From: Wes Higbee Date: Mon, 6 Mar 2023 14:15:46 -0600 Subject: [PATCH 5/6] Fixes per brew style Library/Homebrew/**/cat* --- Library/Homebrew/test/dev-cmd/cat_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/test/dev-cmd/cat_spec.rb b/Library/Homebrew/test/dev-cmd/cat_spec.rb index 5741878b9c00b..c9162025a335a 100644 --- a/Library/Homebrew/test/dev-cmd/cat_spec.rb +++ b/Library/Homebrew/test/dev-cmd/cat_spec.rb @@ -17,9 +17,8 @@ end describe "when a source file isn't found" do - it "prints a suggestion to use brew info --github" , :integration_test do - - expect { brew "cat", "asdf", "bogus"} + it "prints a suggestion to use brew info --github", :integration_test do + expect { brew "cat", "asdf", "bogus" } .to output(/brew info --github asdf bogus/).to_stderr .and be_a_failure end From 742824228ff7b0c7beb4ba8fc7a5fec383986d9f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 7 Mar 2023 09:10:04 +0000 Subject: [PATCH 6/6] dev-cmd/cat_spec: remove unneeded test. --- Library/Homebrew/test/dev-cmd/cat_spec.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Library/Homebrew/test/dev-cmd/cat_spec.rb b/Library/Homebrew/test/dev-cmd/cat_spec.rb index c9162025a335a..6a5d6a6d79351 100644 --- a/Library/Homebrew/test/dev-cmd/cat_spec.rb +++ b/Library/Homebrew/test/dev-cmd/cat_spec.rb @@ -15,12 +15,4 @@ .and not_to_output.to_stderr .and be_a_success end - - describe "when a source file isn't found" do - it "prints a suggestion to use brew info --github", :integration_test do - expect { brew "cat", "asdf", "bogus" } - .to output(/brew info --github asdf bogus/).to_stderr - .and be_a_failure - end - end end