Merge tag Homebrew/1.9.3 into Linuxbrew/master

See https://github.com/Homebrew/brew/releases/tag/1.9.3

Author: sjackman

.gitignore

@@ -17,6 +17,7 @@
 /Library/Homebrew/test/fs_leak_log
 /Library/Homebrew/vendor/portable-ruby
 /Library/Taps
+/Library/PinnedTaps
 
 # Ignore Bundler files
 **/.bundle/bin

Library/.rubocop.yml

@@ -110,7 +110,10 @@ Style/GuardClause:
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
   Exclude:
-  - '**/cmd/*.rb'
+  - '**/Guardfile'
+  - '**/cmd/**/*.rb'
+  - '**/lib/**/*.rb'
+  - '**/spec/**/*.rb'
 
 # ruby style guide favorite
 Style/StringLiterals:

Library/.rubocop_rspec.yml

@@ -0,0 +1,22 @@
+inherit_from: ./.rubocop.yml
+
+NewFormulaAudit:
+  Enabled: true
+
+# TODO: try to enable these
+RSpec/AnyInstance:
+  Enabled: false
+RSpec/ContextWording:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
+RSpec/ExampleLength:
+  Enabled: false
+RSpec/MessageSpies:
+  Enabled: false
+
+# TODO: try to reduce these
+RSpec/MultipleExpectations:
+  Max: 26
+RSpec/NestedGroups:
+  Max: 5

Library/Homebrew/.rubocop.yml

@@ -1,4 +1,4 @@
-inherit_from: ../.rubocop.yml
+inherit_from: ../.rubocop_rspec.yml
 
 AllCops:
   Include:

Library/Homebrew/brew.rb

@@ -10,6 +10,9 @@
   raise "Homebrew must be run under Ruby 2.3! You're running #{RUBY_VERSION}."
 end
 
+# Also define here so we can rescue regardless of location.
+class MissingEnvironmentVariables < RuntimeError; end
+
 begin
   require_relative "global"
 rescue MissingEnvironmentVariables => e

Library/Homebrew/cleanup.rb

@@ -52,7 +52,7 @@ def prune?(days)
 
       return true if symlink? && !exist?
 
-      mtime < days.days.ago
+      mtime < days.days.ago && ctime < days.days.ago
     end
 
     def stale?(scrub = false)
@@ -124,7 +124,10 @@ def stale_cask?(scrub)
 
       return true if scrub && !cask.versions.include?(cask.version)
 
-      return mtime < CLEANUP_DEFAULT_DAYS.days.ago if cask.version.latest?
+      if cask.version.latest?
+        return mtime < CLEANUP_DEFAULT_DAYS.days.ago &&
+               ctime < CLEANUP_DEFAULT_DAYS.days.ago
+      end
 
       false
     end

Library/Homebrew/cli_parser.rb

@@ -59,6 +59,7 @@ def switch(*names, description: nil, env: nil, required_for: nil, depends_on: ni
 
         enable_switch(*names) if !env.nil? && !ENV["HOMEBREW_#{env.to_s.upcase}"].nil?
       end
+      alias switch_option switch
 
       def usage_banner(text)
         @parser.banner = "#{text}\n"

Library/Homebrew/cmd/analytics.rb

@@ -8,15 +8,35 @@
 #:  * `analytics` `regenerate-uuid`:
 #:    Regenerate UUID used in Homebrew's analytics.
 
+require "cli_parser"
+
 module Homebrew
   module_function
 
+  def analytics_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `analytics` (`on`|`off`) [`state`] [`regenerate-uuid`]
+
+        If `on`|`off` is passed, turn Homebrew's analytics on or off respectively.
+
+        If `state` is passed, display anonymous user behaviour analytics state.
+        Read more at <https://docs.brew.sh/Analytics>.
+
+        If `regenerate-uuid` is passed, regenerate UUID used in Homebrew's analytics.
+      EOS
+      switch :verbose
+      switch :debug
+    end
+  end
+
   def analytics
+    analytics_args.parse
     config_file = HOMEBREW_REPOSITORY/".git/config"
 
-    raise UsageError if ARGV.named.size > 1
+    raise UsageError if args.remaining.size > 1
 
-    case ARGV.named.first
+    case args.remaining.first
     when nil, "state"
       analyticsdisabled =
         Utils.popen_read("git config --file=#{config_file} --get homebrew.analyticsdisabled").chomp

Library/Homebrew/cmd/cat.rb

@@ -1,16 +1,29 @@
 #:  * `cat` <formula>:
 #:    Display the source to <formula>.
 
+require "cli_parser"
+
 module Homebrew
   module_function
 
+  def cat_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `cat` <formula>
+
+        Display the source to <formula>.
+      EOS
+    end
+  end
+
   def cat
+    cat_args.parse
     # do not "fix" this to support multiple arguments, the output would be
     # unparsable, if the user wants to cat multiple formula they can call
     # brew cat multiple times.
     formulae = ARGV.formulae
     raise FormulaUnspecifiedError if formulae.empty?
-    raise "`brew cat` doesn't support multiple arguments" if formulae.size > 1
+    raise "`brew cat` doesn't support multiple arguments" if args.remaining.size > 1
 
     cd HOMEBREW_REPOSITORY
     exec "cat", formulae.first.path, *ARGV.options_only

Library/Homebrew/cmd/command.rb

@@ -2,14 +2,28 @@
 #:    Display the path to the file which is used when invoking `brew` <cmd>.
 
 require "commands"
+require "cli_parser"
 
 module Homebrew
   module_function
 
+  def command_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `command` <cmd>
+
+        Display the path to the file which is used when invoking `brew` <cmd>.
+      EOS
+      switch :verbose
+      switch :debug
+    end
+  end
+
   def command
-    abort "This command requires a command argument" if ARGV.empty?
+    command_args.parse
+    abort "This command requires a command argument" if args.remaining.empty?
 
-    cmd = HOMEBREW_INTERNAL_COMMAND_ALIASES.fetch(ARGV.first, ARGV.first)
+    cmd = HOMEBREW_INTERNAL_COMMAND_ALIASES.fetch(args.remaining.first, args.remaining.first)
 
     path = Commands.path(cmd)
 

Library/Homebrew/cmd/commands.rb

@@ -4,15 +4,36 @@
 #:    If `--quiet` is passed, list only the names of commands without the header.
 #:    With `--include-aliases`, the aliases of internal commands will be included.
 
+require "cli_parser"
+
 module Homebrew
   module_function
 
+  def commands_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `commands` [<options>]
+
+        Show a list of built-in and external commands.
+      EOS
+      switch "--quiet",
+        description: "List only the names of commands without the header."
+      switch "--include-aliases",
+        depends_on:  "--quiet",
+        description: "Include the aliases of internal commands."
+      switch :verbose
+      switch :debug
+    end
+  end
+
   def commands
-    if ARGV.include? "--quiet"
+    commands_args.parse
+
+    if args.quiet?
       cmds = internal_commands
       cmds += external_commands
       cmds += internal_developer_commands
-      cmds += HOMEBREW_INTERNAL_COMMAND_ALIASES.keys if ARGV.include? "--include-aliases"
+      cmds += HOMEBREW_INTERNAL_COMMAND_ALIASES.keys if args.include_aliases?
       puts Formatter.columns(cmds.sort)
       return
     end

Library/Homebrew/cmd/config.rb

@@ -4,11 +4,28 @@
 #:    provide it.
 
 require "system_config"
+require "cli_parser"
 
 module Homebrew
   module_function
 
+  def config_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `config`
+
+        Show Homebrew and system configuration useful for debugging. If you file
+        a bug report, you will likely be asked for this information if you do not
+        provide it.
+      EOS
+      switch :verbose
+      switch :debug
+    end
+  end
+
   def config
+    config_args.parse
+    raise UsageError unless args.remaining.empty?
     SystemConfig.dump_verbose_config
   end
 end

Library/Homebrew/cmd/gist-logs.rb

@@ -15,6 +15,7 @@
 #:    If no logs are found, an error message is presented.
 
 require "formula"
+require "install"
 require "system_config"
 require "stringio"
 require "socket"
@@ -134,6 +135,8 @@ def create_issue(repo, title, body)
   def gist_logs
     raise FormulaUnspecifiedError if ARGV.resolved_formulae.length != 1
 
+    Install.perform_preinstall_checks(all_fatal: true)
+    Install.perform_build_from_source_checks(all_fatal: true)
     gistify_logs(ARGV.resolved_formulae.first)
   end
 end

Library/Homebrew/cmd/info.rb

@@ -174,9 +174,7 @@ def info_formula(f)
     end
 
     if devel = f.devel
-      s = "devel #{devel.version}"
-      s += " (bottled)" if devel.bottled?
-      specs << s
+      specs << "devel #{devel.version}"
     end
 
     specs << "HEAD" if f.head

Library/Homebrew/cmd/sh.rb

@@ -9,11 +9,31 @@
 
 require "extend/ENV"
 require "formula"
+require "cli_parser"
 
 module Homebrew
   module_function
 
+  def sh_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `sh` [<options>]
+
+        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
+        in an Xcode-only configuration since it adds tools like `make` to your `PATH`
+        which otherwise build systems would not find.
+      EOS
+      flag "--env=",
+        description: "Use the standard `PATH` instead of superenv's, when <std> is passed"
+      switch :verbose
+      switch :debug
+    end
+  end
+
   def sh
+    sh_args.parse
     ENV.activate_extensions!
 
     if superenv?

Library/Homebrew/cmd/switch.rb

@@ -3,12 +3,26 @@
 
 require "formula"
 require "keg"
+require "cli_parser"
 
 module Homebrew
   module_function
 
+  def switch_args
+    Homebrew::CLI::Parser.new do
+      usage_banner <<~EOS
+        `switch` <formula> <version>
+
+        Symlink all of the specific <version> of <formula>'s install to Homebrew prefix.
+      EOS
+      switch_option :verbose
+      switch_option :debug
+    end
+  end
+
   def switch
-    name = ARGV.first
+    switch_args.parse
+    name = args.remaining.first
 
     usage = "Usage: brew switch <formula> <version>"
 
@@ -28,9 +42,9 @@ def switch
                    .map { |d| Keg.new(d).version }
                    .sort
                    .join(", ")
-    version = ARGV.second
+    version = args.remaining.second
 
-    if !version || ARGV.named.length > 2
+    if !version || args.remaining.length > 2
       onoe usage
       puts "#{name} installed versions: #{versions}"
       exit 1

Library/Homebrew/cmd/upgrade.rb

@@ -147,7 +147,7 @@ def upgrade_formula(f)
 
     fi = FormulaInstaller.new(f)
     fi.options = options
-    fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?)
+    fi.build_bottle = ARGV.build_bottle? || (!f.bottle_defined? && f.build.bottle?)
     fi.installed_on_request = !ARGV.named.empty?
     fi.link_keg           ||= keg_was_linked if keg_had_linked_opt
     if tab