.github/ISSUE_TEMPLATE/bug.md

@@ -4,7 +4,9 @@ about: "If you're sure it's reproducible and not just your machine: submit an is
 
 ---
 
-# Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
+# Bug report
+
+**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
 
 - [ ] ran `brew update` and can still reproduce the problem?
 - [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?

.github/ISSUE_TEMPLATE/feature.md

@@ -4,7 +4,9 @@ about: Request our thoughts on your suggestion for a new feature for Homebrew.
 
 ---
 
-# Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
+# Feature suggestion
+
+**Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
 
 <!-- Please fill these sections with the relevant information: -->
 

Library/Homebrew/Gemfile.lock

@@ -55,7 +55,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     parallel (1.19.2)
-    parallel_tests (3.1.0)
+    parallel_tests (3.2.0)
       parallel
     parlour (4.0.1)
       commander (~> 4.5)
@@ -119,10 +119,10 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
-    sorbet (0.5.5880)
-      sorbet-static (= 0.5.5880)
-    sorbet-runtime (0.5.5880)
-    sorbet-static (0.5.5880-universal-darwin-14)
+    sorbet (0.5.5881)
+      sorbet-static (= 0.5.5881)
+    sorbet-runtime (0.5.5881)
+    sorbet-static (0.5.5881-universal-darwin-14)
     spoom (1.0.4)
       colorize
       sorbet (~> 0.5.5)

Library/Homebrew/cli/named_args.rb

@@ -3,6 +3,7 @@
 require "cask/cask_loader"
 require "delegate"
 require "formulary"
+require "missing_formula"
 
 module Homebrew
   module CLI
@@ -180,7 +181,7 @@ def resolve_keg(name)
       def warn_if_cask_conflicts(ref, loaded_type)
         cask = Cask::CaskLoader.load ref
 
-        puts "Treating #{ref} as a #{loaded_type}. For the cask, use #{cask.tap.name}/#{cask.token}"
+        opoo "Treating #{ref} as a #{loaded_type}. For the cask, use #{cask.tap.name}/#{cask.token}"
       rescue Cask::CaskUnavailableError
         # No ref conflict with a cask, do nothing
       end

Library/Homebrew/dev-cmd/sh.rb

@@ -10,18 +10,19 @@ module Homebrew
   def sh_args
     Homebrew::CLI::Parser.new do
       usage_banner <<~EOS
-        `sh` [<options>]
+        `sh` [<options>] [<file>]
 
-        Start a Homebrew build environment shell. Uses our years-battle-hardened
-        Homebrew build logic to help your `./configure && make && make install`
-        or even your `gem install` succeed. Especially handy if you run Homebrew
+        Homebrew build environment that uses years-battle-hardened
+        build logic to help your `./configure && make && make install`
+        and even your `gem install` succeed. Especially handy if you run Homebrew
         in an Xcode-only configuration since it adds tools like `make` to your `PATH`
         which build systems would not find otherwise.
       EOS
       flag   "--env=",
              description: "Use the standard `PATH` instead of superenv's when `std` is passed."
-
-      max_named 0
+      flag   "-c=", "--cmd=",
+             description: "Execute commands in a non-interactive shell."
+      max_named 1
     end
   end
 
@@ -39,21 +40,29 @@ def sh
       # superenv stopped adding brew's bin but generally users will want it
       ENV["PATH"] = PATH.new(ENV["PATH"]).insert(1, HOMEBREW_PREFIX/"bin")
     end
-    subshell = if ENV["SHELL"].include?("zsh")
-      "PS1='brew %B%F{green}%~%f%b$ ' #{ENV["SHELL"]} -d"
+
+    ENV["VERBOSE"] = "1" if args.verbose?
+
+    if args.cmd.present?
+      safe_system(ENV["SHELL"], "-c", args.cmd)
+    elsif args.named.present?
+      safe_system(ENV["SHELL"], args.named.first)
     else
-      "PS1=\"brew \\[\\033[1;32m\\]\\w\\[\\033[0m\\]$ \" #{ENV["SHELL"]}"
+      subshell = if ENV["SHELL"].include?("zsh")
+        "PS1='brew %B%F{green}%~%f%b$ ' #{ENV["SHELL"]} -d"
+      else
+        "PS1=\"brew \\[\\033[1;32m\\]\\w\\[\\033[0m\\]$ \" #{ENV["SHELL"]}"
+      end
+      puts <<~EOS
+        Your shell has been configured to use Homebrew's build environment;
+        this should help you build stuff. Notably though, the system versions of
+        gem and pip will ignore our configuration and insist on using the
+        environment they were built under (mostly). Sadly, scons will also
+        ignore our configuration.
+        When done, type `exit`.
+      EOS
+      $stdout.flush
+      safe_system subshell
     end
-    ENV["VERBOSE"] = "1"
-    puts <<~EOS
-      Your shell has been configured to use Homebrew's build environment;
-      this should help you build stuff. Notably though, the system versions of
-      gem and pip will ignore our configuration and insist on using the
-      environment they were built under (mostly). Sadly, scons will also
-      ignore our configuration.
-      When done, type `exit`.
-    EOS
-    $stdout.flush
-    safe_system subshell
   end
 end

Library/Homebrew/formulary.rb

@@ -175,7 +175,7 @@ def initialize(bottle_name)
     def get_formula(spec, force_bottle: false, flags: [], **)
       contents = Utils::Bottles.formula_contents @bottle_filename, name: name
       formula = begin
-        Formulary.from_contents(name, @bottle_filename, contents, spec, force_bottle: force_bottle, flags: flags)
+        Formulary.from_contents(name, path, contents, spec, force_bottle: force_bottle, flags: flags)
       rescue FormulaUnreadableError => e
         opoo <<~EOS
           Unreadable formula in #{@bottle_filename}: