Merge pull request #4919 from reitermarkus/rubocop

Update to RuboCop 0.59.1.

Library/.rubocop.yml

@@ -47,11 +47,14 @@ Layout/SpaceAroundOperators:
 Layout/Tab:
   Enabled: true
 
+# Auto-correct is broken (https://github.com/rubocop-hq/rubocop/issues/6300).
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 # favour parens-less DSL-style arguments
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 
-
 # so many of these in formulae and can't be autocorrected
 # TODO: fix these as `ruby -w` complains about them.
 Lint/AmbiguousRegexpLiteral:

Library/Homebrew/.rubocop.yml

@@ -97,6 +97,11 @@ Naming/UncommunicativeMethodParamName:
     - 'to'
     - 'v'
 
+# Auto-correct is broken (https://github.com/rubocop-hq/rubocop/issues/6258)
+# and layout is not configurable (https://github.com/rubocop-hq/rubocop/issues/6254).
+Layout/RescueEnsureAlignment:
+  Enabled: false
+
 # Avoid false positives on modifiers used on symbols of methods
 # See https://github.com/rubocop-hq/rubocop/issues/5953
 Style/AccessModifierDeclarations:

Library/Homebrew/brew.rb

@@ -128,6 +128,7 @@ rescue BuildError => e
   exit 1
 rescue RuntimeError, SystemCallError => e
   raise if e.message.empty?
+
   onoe e
   $stderr.puts e.backtrace if ARGV.debug?
   exit 1

Library/Homebrew/build.rb

@@ -32,6 +32,7 @@ class Build
     # Only allow Homebrew-approved directories into the PATH, unless
     # a formula opts-in to allowing the user's path.
     return unless formula.env.userpaths? || reqs.any? { |rq| rq.env.userpaths? }
+
     ENV.userpaths!
   end
 

Library/Homebrew/cache_store.rb

@@ -26,12 +26,14 @@ class CacheStoreDatabase
   # Gets a value from the underlying database (if it already exists).
   def get(key)
     return unless created?
+
     db[key]
   end
 
   # Gets a value from the underlying database (if it already exists).
   def delete(key)
     return unless created?
+
     db.delete(key)
   end
 

Library/Homebrew/cask/artifact/abstract_flight_block.rb

@@ -35,6 +35,7 @@ module Cask
 
       def abstract_phase(dsl_key)
         return if (block = directives[dsl_key]).nil?
+
         class_for_dsl_key(dsl_key).new(cask).instance_eval(&block)
       end
 

Library/Homebrew/cask/artifact/abstract_uninstall.rb

@@ -54,6 +54,7 @@ module Cask
 
         ORDERED_DIRECTIVES.each do |directive_sym|
           next unless directives.key?(directive_sym)
+
           args = directives[directive_sym]
           send("uninstall_#{directive_sym}", *(args.is_a?(Hash) ? [args] : args), **options)
         end
@@ -66,6 +67,7 @@ module Cask
       def warn_for_unknown_directives(directives)
         unknown_keys = directives.keys - ORDERED_DIRECTIVES
         return if unknown_keys.empty?
+
         opoo "Unknown arguments to #{stanza} -- #{unknown_keys.inspect}. " \
              "Running \"brew update; brew cleanup\" will likely fix it."
       end
@@ -100,6 +102,7 @@ module Cask
             end
             # undocumented and untested: pass a path to uninstall :launchctl
             next unless Pathname(service).exist?
+
             command.run!("/bin/launchctl", args: ["unload", "-w", "--", service], sudo: with_sudo)
             command.run!("/bin/rm",        args: ["-f", "--", service], sudo: with_sudo)
             sleep 1
@@ -113,6 +116,7 @@ module Cask
                .map { |pid, state, id| [pid.to_i, state.to_i, id] }
                .select do |fields|
                  next if fields[0].zero?
+
                  fields[2] =~ /^#{Regexp.escape(bundle_id)}($|\.\d+)/
                end
       end
@@ -122,6 +126,7 @@ module Cask
         bundle_ids.each do |bundle_id|
           ohai "Quitting application ID #{bundle_id}"
           next if running_processes(bundle_id, command: command).empty?
+
           command.run!("/usr/bin/osascript", args: ["-e", %Q(tell application id "#{bundle_id}" to quit)], sudo: true)
 
           begin
@@ -147,6 +152,7 @@ module Cask
           ohai "Signalling '#{signal}' to application ID '#{bundle_id}'"
           pids = running_processes(bundle_id, command: command).map(&:first)
           next unless pids.any?
+
           # Note that unlike :quit, signals are sent from the current user (not
           # upgraded to the superuser). This is a todo item for the future, but
           # there should be some additional thought/safety checks about that, as a
@@ -201,11 +207,13 @@ module Cask
 
         ohai "Running uninstall script #{executable}"
         raise CaskInvalidError.new(cask, "#{stanza} :#{directive_name} without :executable.") if executable.nil?
+
         executable_path = cask.staged_path.join(executable)
 
         unless executable_path.exist?
           message = "uninstall script #{executable} does not exist"
           raise CaskError, "#{message}." unless force
+
           opoo "#{message}, skipping."
           return
         end

Library/Homebrew/cask/artifact/binary.rb

@@ -6,6 +6,7 @@ module Cask
       def link(command: nil, **options)
         super(command: command, **options)
         return if source.executable?
+
         if source.writable?
           FileUtils.chmod "+x", source
         else

Library/Homebrew/cask/artifact/moved.rb

@@ -30,6 +30,7 @@ module Cask
           message = "It seems there is already #{self.class.english_article} " \
                     "#{self.class.english_name} at '#{target}'"
           raise CaskError, "#{message}." unless force
+
           opoo "#{message}; overwriting."
           delete(target, force: force, command: command, **options)
         end
@@ -55,12 +56,14 @@ module Cask
           message = "It seems there is already #{self.class.english_article} " \
                     "#{self.class.english_name} at '#{source}'"
           raise CaskError, "#{message}." unless force
+
           opoo "#{message}; overwriting."
           delete(source, force: force, command: command, **options)
         end
 
         unless target.exist?
           return if skip || force
+
           raise CaskError, "It seems the #{self.class.english_name} source '#{target}' is not there."
         end
 

Library/Homebrew/cask/artifact/pkg.rb

@@ -39,6 +39,7 @@ module Cask
         unless path.exist?
           raise CaskError, "pkg source file not found: '#{path.relative_path_from(cask.staged_path)}'"
         end
+
         args = [
           "-pkg",    path,
           "-target", "/"

Library/Homebrew/cask/artifact/relocated.rb

@@ -11,6 +11,7 @@ module Cask
 
         if target_hash
           raise CaskInvalidError unless target_hash.respond_to?(:keys)
+
           target_hash.assert_valid_keys!(:target)
         end
 
@@ -56,6 +57,7 @@ module Cask
       # bundles. Alfred 2.2 respects it even for App bundles.
       def add_altname_metadata(file, altname, command: nil)
         return if altname.to_s.casecmp(file.basename.to_s).zero?
+
         odebug "Adding #{ALT_NAME_ATTRIBUTE} metadata"
         altnames = command.run("/usr/bin/xattr",
                                 args:         ["-p", ALT_NAME_ATTRIBUTE, file],

Library/Homebrew/cask/artifact/symlinked.rb

@@ -54,6 +54,7 @@ module Cask
 
       def unlink(**)
         return unless target.symlink?
+
         ohai "Unlinking #{self.class.english_name} '#{target}'."
         target.delete
       end

Library/Homebrew/cask/audit.rb

@@ -65,6 +65,7 @@ module Cask
       return if tap.user != "Homebrew"
 
       return unless cask.artifacts.any? { |k| k.is_a?(Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) }
+
       add_warning "allow_untrusted is not permitted in official Homebrew Cask taps"
     end
 
@@ -73,6 +74,7 @@ module Cask
 
       return if cask.artifacts.none? { |k| k.is_a?(Artifact::Pkg) || k.is_a?(Artifact::Installer) }
       return if cask.artifacts.any? { |k| k.is_a?(Artifact::Uninstall) }
+
       add_warning "installer and pkg stanzas require an uninstall stanza"
     end
 
@@ -118,6 +120,7 @@ module Cask
       end
 
       return unless cask.artifacts.count { |k| k.is_a?(Artifact::Zap) } > 1
+
       add_warning "only a single zap stanza is allowed"
     end
 
@@ -141,6 +144,7 @@ module Cask
       return if tap.nil?
 
       return if commit_range.nil?
+
       previous_cask_contents = Git.last_revision_of_file(tap.path, @cask.sourcefile_path, before_commit: commit_range)
       return if previous_cask_contents.empty?
 
@@ -158,6 +162,7 @@ module Cask
 
     def check_version
       return unless cask.version
+
       check_no_string_version_latest
       check_no_file_separator_in_version
     end
@@ -165,6 +170,7 @@ module Cask
     def check_no_string_version_latest
       odebug "Verifying version :latest does not appear as a string ('latest')"
       return unless cask.version.raw_version == "latest"
+
       add_error "you should use version :latest instead of version 'latest'"
     end
 
@@ -172,11 +178,13 @@ module Cask
       odebug "Verifying version does not contain '#{File::SEPARATOR}'"
       return unless cask.version.raw_version.is_a?(String)
       return unless cask.version.raw_version.include?(File::SEPARATOR)
+
       add_error "version should not contain '#{File::SEPARATOR}'"
     end
 
     def check_sha256
       return unless cask.sha256
+
       check_sha256_no_check_if_latest
       check_sha256_actually_256
       check_sha256_invalid
@@ -186,6 +194,7 @@ module Cask
       odebug "Verifying sha256 :no_check with version :latest"
       return unless cask.version.latest?
       return if cask.sha256 == :no_check
+
       add_error "you should use sha256 :no_check when version is :latest"
     end
 
@@ -193,6 +202,7 @@ module Cask
       odebug "Verifying #{stanza} string is a legal SHA-256 digest"
       return unless sha256.is_a?(String)
       return if sha256.length == 64 && sha256[/^[0-9a-f]+$/i]
+
       add_error "#{stanza} string must be of 64 hexadecimal characters"
     end
 
@@ -200,6 +210,7 @@ module Cask
       odebug "Verifying #{stanza} is not a known invalid value"
       empty_sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
       return unless sha256 == empty_sha256
+
       add_error "cannot use the sha256 for an empty string in #{stanza}: #{empty_sha256}"
     end
 
@@ -232,9 +243,11 @@ module Cask
       case cask.url.to_s
       when %r{github.com/([^/]+)/([^/]+)/releases/download/(\S+)}
         return if cask.version.latest?
+
         add_warning "Download uses GitHub releases, #{add_appcast}"
       when %r{sourceforge.net/(\S+)}
         return if cask.version.latest?
+
         add_warning "Download is hosted on SourceForge, #{add_appcast}"
       when %r{dl.devmate.com/(\S+)}
         add_warning "Download is hosted on DevMate, #{add_appcast}"
@@ -245,6 +258,7 @@ module Cask
 
     def check_url
       return unless cask.url
+
       check_download_url_format
     end
 
@@ -259,6 +273,7 @@ module Cask
 
     def bad_url_format?(regex, valid_formats_array)
       return false unless cask.url.to_s =~ regex
+
       valid_formats_array.none? { |format| cask.url.to_s =~ format }
     end
 
@@ -289,6 +304,7 @@ module Cask
     def check_token_conflicts
       return unless check_token_conflicts?
       return unless core_formula_names.include?(cask.token)
+
       add_warning "possible duplicate, cask token conflicts with Homebrew core formula: #{core_formula_url}"
     end
 
@@ -306,6 +322,7 @@ module Cask
 
     def check_download
       return unless download && cask.url
+
       odebug "Auditing download"
       downloaded_path = download.perform
       Verify.all(cask, downloaded_path)

Library/Homebrew/cask/cask.rb

@@ -27,6 +27,7 @@ module Cask
 
     def tap
       return super if block_given? # Object#tap
+
       @tap
     end
 
@@ -37,6 +38,7 @@ module Cask
       @config = config
       @dsl = DSL.new(self)
       return unless block_given?
+
       @dsl.instance_eval(&block)
       @dsl.language_eval
     end
@@ -62,6 +64,7 @@ module Cask
     def full_name
       return token if tap.nil?
       return token if tap.user == "Homebrew"
+
       "#{tap.name}/#{token}"
     end
 

Library/Homebrew/cask/cask_dependencies.rb

@@ -16,6 +16,7 @@ module Cask
 
     def graph_dependencies(cask = self.cask, acc = TopologicalHash.new)
       return acc if acc.key?(cask)
+
       deps = cask.depends_on.cask.map(&CaskLoader.public_method(:load))
       acc[cask] = deps
       deps.each do |dep|
@@ -26,6 +27,7 @@ module Cask
 
     def sort
       raise CaskSelfReferencingDependencyError, cask.token if graph[cask].include?(cask)
+
       graph.tsort - [cask]
     rescue TSort::Cyclic
       strongly_connected_components = graph.strongly_connected_components.sort_by(&:count)

Library/Homebrew/cask/cask_loader.rb

@@ -8,6 +8,7 @@ module Cask
 
       def self.can_load?(ref)
         return false unless ref.respond_to?(:to_str)
+
         content = ref.to_str
 
         token  = /(?:"[^"]*"|'[^']*')/

Library/Homebrew/cask/cmd.rb

@@ -236,6 +236,7 @@ module Cask
         puts "Commands:\n\n"
         Cmd.command_classes.each do |klass|
           next unless klass.visible
+
           puts "    #{klass.command_name.ljust(max_command_len)}  #{_help_for(klass)}"
         end
         puts %Q(\nSee also "man brew-cask")

Library/Homebrew/cask/cmd/abstract_command.rb

@@ -45,6 +45,7 @@ module Cask
 
       def casks(alternative: -> { [] })
         return @casks if defined?(@casks)
+
         casks = args.empty? ? alternative.call : args
         @casks = casks.map { |cask| CaskLoader.load(cask) }
       rescue CaskUnavailableError => e

Library/Homebrew/cask/cmd/audit.rb

@@ -13,6 +13,7 @@ module Cask
                        .reject { |cask| audit(cask) }
 
         return if failed_casks.empty?
+
         raise CaskError, "audit failed for casks: #{failed_casks.join(" ")}"
       end
 

Library/Homebrew/cask/cmd/doctor.rb

@@ -9,6 +9,7 @@ module Cask
       def initialize(*)
         super
         return if args.empty?
+
         raise ArgumentError, "#{self.class.command_name} does not take arguments."
       end
 
@@ -151,6 +152,7 @@ module Cask
       def self.check_sip
         csrutil = "/usr/bin/csrutil"
         return "N/A" unless File.executable?(csrutil)
+
         Open3.capture2(csrutil, "status")
              .first
              .gsub("This is an unsupported configuration, likely to break in " \
@@ -186,6 +188,7 @@ module Cask
 
       def self.render_env_var(var)
         return unless ENV.key?(var)
+
         var = %Q(#{var}="#{ENV[var]}")
         puts user_tilde(var)
       end

Library/Homebrew/cask/cmd/edit.rb

@@ -20,6 +20,7 @@ module Cask
       rescue CaskInvalidError
         path = CaskLoader.path(args.first)
         return path if path.file?
+
         raise
       end
 

Library/Homebrew/cask/cmd/info.rb

@@ -90,6 +90,7 @@ module Cask
         cask.artifacts.each do |artifact|
           next unless artifact.respond_to?(:install_phase)
           next unless DSL::ORDINARY_ARTIFACT_CLASSES.include?(artifact.class)
+
           puts artifact.to_s
         end
       end

Library/Homebrew/cask/cmd/internal_help.rb

@@ -4,6 +4,7 @@ module Cask
       def initialize(*)
         super
         return if args.empty?
+
         raise ArgumentError, "#{self.class.command_name} does not take arguments."
       end
 
@@ -12,6 +13,7 @@ module Cask
         puts "Unstable Internal-use Commands:\n\n"
         Cmd.command_classes.each do |klass|
           next if klass.visible
+
           puts "    #{klass.command_name.ljust(max_command_len)}  #{self.class.help_for(klass)}"
         end
         puts "\n"

Library/Homebrew/cask/cmd/internal_stanza.rb

@@ -45,6 +45,7 @@ module Cask
         @format = :to_yaml if yaml?
 
         return if DSL::DSL_METHODS.include?(stanza)
+
         raise ArgumentError,
           <<~EOS
             Unknown/unsupported stanza: '#{stanza}'

Library/Homebrew/cask/cmd/list.rb

@@ -32,6 +32,7 @@ module Cask
       def self.list_artifacts(cask)
         cask.artifacts.group_by(&:class).each do |klass, artifacts|
           next unless klass.respond_to?(:english_description)
+
           ohai klass.english_description, artifacts.map(&:summarize_installed)
         end
       end

Library/Homebrew/cask/cmd/options.rb

@@ -9,6 +9,7 @@ module Cask
         def options
           @options ||= {}
           return @options unless superclass.respond_to?(:options)
+
           superclass.options.merge(@options)
         end
 
@@ -25,11 +26,13 @@ module Cask
           if [true, false].include?(default_value)
             define_method(:"#{method}?") do
               return default_value unless instance_variable_defined?(:"@#{method}")
+
               instance_variable_get(:"@#{method}") == true
             end
           else
             define_method(:"#{method}") do
               return default_value unless instance_variable_defined?(:"@#{method}")
+
               instance_variable_get(:"@#{method}")
             end
           end

Library/Homebrew/cask/cmd/upgrade.rb

@@ -18,6 +18,7 @@ module Cask
           end
         }).select do |cask|
           raise CaskNotInstalledError, cask unless cask.installed? || force?
+
           cask.outdated?(true)
         end
 

Library/Homebrew/cask/dsl.rb

@@ -87,6 +87,7 @@ module Cask
     def name(*args)
       @name ||= []
       return @name if args.empty?
+
       @name.concat(args.flatten)
     end
 
@@ -188,6 +189,7 @@ module Cask
         if !arg.is_a?(String) && arg != :latest
           raise CaskInvalidError.new(cask, "invalid 'version' value: '#{arg.inspect}'")
         end
+
         DSL::Version.new(arg)
       end
     end
@@ -197,6 +199,7 @@ module Cask
         if !arg.is_a?(String) && arg != :no_check
           raise CaskInvalidError.new(cask, "invalid 'sha256' value: '#{arg.inspect}'")
         end
+
         arg
       end
     end
@@ -205,6 +208,7 @@ module Cask
     def depends_on(*args)
       @depends_on ||= DSL::DependsOn.new
       return @depends_on if args.empty?
+
       begin
         @depends_on.load(*args)
       rescue RuntimeError => e
@@ -228,6 +232,7 @@ module Cask
 
     def staged_path
       return @staged_path if @staged_path
+
       cask_version = version || :unknown
       @staged_path = caskroom_path.join(cask_version.to_s)
     end

Library/Homebrew/cask/dsl/caveats.rb

@@ -39,11 +39,13 @@ module Cask
         result = instance_eval(&block)
         return unless result
         return if result == :built_in_caveat
+
         @custom_caveats << result.to_s.sub(/\s*\Z/, "\n")
       end
 
       caveat :kext do
         next if MacOS.version < :high_sierra
+
         <<~EOS
           To install and/or use #{@cask} you may need to enable their kernel extension in
 
@@ -76,6 +78,7 @@ module Cask
 
       caveat :files_in_usr_local do
         next unless HOMEBREW_PREFIX.to_s.downcase.start_with?("/usr/local")
+
         <<~EOS
           Cask #{@cask} installs files under /usr/local. The presence of such
           files can cause warnings when running "brew doctor", which is considered

Library/Homebrew/cask/dsl/conflicts_with.rb

@@ -21,6 +21,7 @@ module Cask
 
         pairs.each do |key, value|
           raise "invalid conflicts_with key: '#{key.inspect}'" unless VALID_KEYS.include?(key)
+
           instance_variable_set("@#{key}", instance_variable_get("@#{key}").merge([*value]))
         end
       end

Library/Homebrew/cask/dsl/container.rb

@@ -15,11 +15,13 @@ module Cask
         @pairs = pairs
         pairs.each do |key, value|
           raise "invalid container key: '#{key.inspect}'" unless VALID_KEYS.include?(key)
+
           send(:"#{key}=", value)
         end
 
         return if type.nil?
         return unless UnpackStrategy.from_type(type).nil?
+
         raise "invalid container type: #{type.inspect}"
       end
 

Library/Homebrew/cask/dsl/depends_on.rb

@@ -30,6 +30,7 @@ module Cask
       def load(**pairs)
         pairs.each do |key, value|
           raise "invalid depends_on key: '#{key.inspect}'" unless VALID_KEYS.include?(key)
+
           self[key] = send(:"#{key}=", *value)
         end
       end
@@ -65,11 +66,13 @@ module Cask
         @macos ||= []
         macos = if args.count == 1 && args.first =~ /^\s*(<|>|[=<>]=)\s*(\S+)\s*$/
           raise "'depends_on macos' comparison expressions cannot be combined" unless @macos.empty?
+
           operator = Regexp.last_match[1].to_sym
           release = self.class.coerce_os_release(Regexp.last_match[2])
           [[operator, release]]
         else
           raise "'depends_on macos' comparison expressions cannot be combined" if @macos.first.is_a?(Symbol)
+
           args.map(&self.class.method(:coerce_os_release)).sort
         end
         @macos.concat(macos)
@@ -82,11 +85,13 @@ module Cask
         end
         invalid_arches = arches - VALID_ARCHES.keys
         raise "invalid 'depends_on arch' values: #{invalid_arches.inspect}" unless invalid_arches.empty?
+
         @arch.concat(arches.map { |arch| VALID_ARCHES[arch] })
       end
 
       def x11=(arg)
         raise "invalid 'depends_on x11' value: #{arg.inspect}" unless [true, false].include?(arg)
+
         @x11 = arg
       end
     end

Library/Homebrew/cask/dsl/version.rb

@@ -112,6 +112,7 @@ module Cask
 
       def version
         return self if empty? || latest?
+
         self.class.new(yield)
       end
     end

Library/Homebrew/cask/installer.rb

@@ -151,6 +151,7 @@ module Cask
     def verify_has_sha
       odebug "Checking cask has checksum"
       return unless @cask.sha256 == :no_check
+
       raise CaskNoShasumError, @cask.token
     end
 
@@ -198,6 +199,7 @@ module Cask
 
       artifacts.each do |artifact|
         next unless artifact.respond_to?(:install_phase)
+
         odebug "Installing artifact of class #{artifact.class}"
 
         if artifact.is_a?(Artifact::Binary)
@@ -211,6 +213,7 @@ module Cask
       begin
         already_installed_artifacts.each do |artifact|
           next unless artifact.respond_to?(:uninstall_phase)
+
           odebug "Reverting installation of artifact of class #{artifact.class}"
           artifact.uninstall_phase(command: @command, verbose: verbose?, force: force?)
         end
@@ -236,6 +239,7 @@ module Cask
 
     def macos_dependencies
       return unless @cask.depends_on.macos
+
       if @cask.depends_on.macos.first.is_a?(Array)
         operator, release = @cask.depends_on.macos.first
         unless MacOS.version.send(operator, release)
@@ -262,11 +266,13 @@ module Cask
 
     def arch_dependencies
       return if @cask.depends_on.arch.nil?
+
       @current_arch ||= { type: Hardware::CPU.type, bits: Hardware::CPU.bits }
       return if @cask.depends_on.arch.any? do |arch|
         arch[:type] == @current_arch[:type] &&
         Array(arch[:bits]).include?(@current_arch[:bits])
       end
+
       raise CaskError,
         "Cask #{@cask} depends on hardware architecture being one of " \
         "[#{@cask.depends_on.arch.map(&:to_s).join(", ")}], " \
@@ -362,6 +368,7 @@ module Cask
     # TODO: logically could be in a separate class
     def enable_accessibility_access
       return unless @cask.accessibility_access
+
       ohai "Enabling accessibility access"
       if MacOS.version <= :mountain_lion
         @command.run!(
@@ -402,6 +409,7 @@ module Cask
 
     def disable_accessibility_access
       return unless @cask.accessibility_access
+
       if MacOS.version >= :mavericks && MacOS.version <= :el_capitan
         ohai "Disabling accessibility access"
         @command.run!("/usr/bin/sqlite3",
@@ -480,6 +488,7 @@ module Cask
 
       artifacts.each do |artifact|
         next unless artifact.respond_to?(:uninstall_phase)
+
         odebug "Un-installing artifact of class #{artifact.class}"
         artifact.uninstall_phase(command: @command, verbose: verbose?, skip: clear, force: force?)
       end
@@ -502,11 +511,13 @@ module Cask
 
     def backup_path
       return if @cask.staged_path.nil?
+
       Pathname("#{@cask.staged_path}.upgrading")
     end
 
     def backup_metadata_path
       return if @cask.metadata_versioned_path.nil?
+
       Pathname("#{@cask.metadata_versioned_path}.upgrading")
     end
 

Library/Homebrew/cask/pkg.rb

@@ -99,6 +99,7 @@ module Cask
 
     def rmdir(path)
       return unless path.children.empty?
+
       if path.symlink?
         @command.run!("/bin/rm", args: ["-f", "--", path], sudo: true)
       else
@@ -125,6 +126,7 @@ module Cask
 
     def clean_ds_store(dir)
       return unless (ds_store = dir.join(".DS_Store")).exist?
+
       @command.run!("/bin/rm", args: ["--", ds_store], sudo: true)
     end
 

Library/Homebrew/cask/staged.rb

@@ -26,6 +26,7 @@ module Cask
     def set_permissions(paths, permissions_str)
       full_paths = remove_nonexistent(paths)
       return if full_paths.empty?
+
       @command.run!("/bin/chmod", args: ["-R", "--", permissions_str] + full_paths,
                                   sudo: false)
     end
@@ -33,6 +34,7 @@ module Cask
     def set_ownership(paths, user: current_user, group: "staff")
       full_paths = remove_nonexistent(paths)
       return if full_paths.empty?
+
       ohai "Changing ownership of paths required by #{@cask}; your password may be necessary"
       @command.run!("/usr/sbin/chown", args: ["-R", "--", "#{user}:#{group}"] + full_paths,
                                        sudo: true)

Library/Homebrew/cask/url.rb

@@ -18,6 +18,7 @@ class URL
 
     ATTRIBUTES.each do |attribute|
       next unless options.key?(attribute)
+
       instance_variable_set("@#{attribute}", options[attribute])
     end
 

Library/Homebrew/cleanup.rb

@@ -57,6 +57,7 @@ module CleanupRefinement
 
     def stale?(scrub = false)
       return false unless resolved_path.file?
+
       stale_formula?(scrub) || stale_cask?(scrub)
     end
 
@@ -162,6 +163,7 @@ module Homebrew
         cleanup_cache
         cleanup_logs
         return if dry_run?
+
         rm_ds_store
       else
         args.each do |arg|
@@ -211,6 +213,7 @@ module Homebrew
 
     def cleanup_logs
       return unless HOMEBREW_LOGS.directory?
+
       HOMEBREW_LOGS.subdirs.each do |dir|
         cleanup_path(dir) { dir.rmtree } if dir.prune?(days || DEFAULT_LOG_DAYS)
       end

Library/Homebrew/cli_parser.rb

@@ -115,6 +115,7 @@ module Homebrew
         end
 
         return if depends_on.nil?
+
         primary = option_to_name(depends_on)
         @constraints << [primary, secondary, :optional]
       end
@@ -139,6 +140,7 @@ module Homebrew
           end
 
           next if violations.count < 2
+
           raise OptionConflictError, violations.map(&method(:name_to_option))
         end
       end
@@ -147,6 +149,7 @@ module Homebrew
         @conflicts.each do |mutually_exclusive_options_group|
           @constraints.each do |p, s|
             next unless Set[p, s].subset?(Set[*mutually_exclusive_options_group])
+
             raise InvalidConstraintError.new(p, s)
           end
         end

Library/Homebrew/cmd/analytics.rb

@@ -15,6 +15,7 @@ module Homebrew
     config_file = HOMEBREW_REPOSITORY/".git/config"
 
     raise UsageError if ARGV.named.size > 1
+
     case ARGV.named.first
     when nil, "state"
       analyticsdisabled = \

Library/Homebrew/cmd/commands.rb

@@ -48,8 +48,10 @@ module Homebrew
     cmd_paths.each_with_object([]) do |path, cmds|
       Dir["#{path}/brew-*"].each do |file|
         next unless File.executable?(file)
+
         cmd = File.basename(file, ".rb")[5..-1]
         next if cmd.include?(".")
+
         cmds << cmd
       end
     end.sort

Library/Homebrew/cmd/deps.rb

@@ -73,6 +73,7 @@ module Homebrew
         puts_deps_tree Formula.installed.sort, !ARGV.one?
       else
         raise FormulaUnspecifiedError if ARGV.named.empty?
+
         puts_deps_tree ARGV.formulae, !ARGV.one?
       end
       return
@@ -92,6 +93,7 @@ module Homebrew
 
     if ARGV.named.empty?
       raise FormulaUnspecifiedError unless mode.installed?
+
       puts_deps Formula.installed.sort
       return
     end
@@ -107,6 +109,7 @@ module Homebrew
 
   def condense_requirements(deps)
     return deps if ARGV.include?("--include-requirements")
+
     deps.select { |dep| dep.is_a? Dependency }
   end
 

Library/Homebrew/cmd/desc.rb

@@ -24,6 +24,7 @@ module Homebrew
 
     if search_type.empty?
       raise FormulaUnspecifiedError if ARGV.named.empty?
+
       desc = {}
       ARGV.formulae.each { |f| desc[f.full_name] = f.desc }
       results = Descriptions.new(desc)

Library/Homebrew/cmd/doctor.rb

@@ -45,6 +45,7 @@ module Homebrew
 
       out = checks.send(method)
       next if out.nil? || out.empty?
+
       if first_warning
         $stderr.puts <<~EOS
           #{Tty.bold}Please note that these warnings are just used to help the Homebrew maintainers

Library/Homebrew/cmd/fetch.rb

@@ -54,6 +54,7 @@ module Homebrew
           raise
         rescue => e
           raise if ARGV.homebrew_developer?
+
           fetched_bottle = false
           onoe e.message
           opoo "Bottle fetch failed: fetching the source."
@@ -63,6 +64,7 @@ module Homebrew
       end
 
       next if fetched_bottle
+
       fetch_formula(f)
 
       f.resources.each do |r|

Library/Homebrew/cmd/gist-logs.rb

@@ -106,6 +106,7 @@ module Homebrew
       end
     end
     raise "No logs." if logs.empty?
+
     logs
   end
 

Library/Homebrew/cmd/info.rb

@@ -171,6 +171,7 @@ module Homebrew
       %w[build required recommended optional].map do |type|
         reqs = f.requirements.select(&:"#{type}?")
         next if reqs.to_a.empty?
+
         puts "#{type.capitalize}: #{decorate_requirements(reqs)}"
       end
     end
@@ -243,6 +244,7 @@ module Homebrew
 
   def dep_display_s(dep)
     return dep.name if dep.option_tags.empty?
+
     "#{dep.name} #{dep.option_tags.map { |o| "--#{o}" }.join(" ")}"
   end
 end

Library/Homebrew/cmd/install.rb

@@ -98,6 +98,7 @@ module Homebrew
         if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX
           next
         end
+
         tap = Tap.fetch(Regexp.last_match(1), Regexp.last_match(2))
         tap.install unless tap.installed?
       end
@@ -237,6 +238,7 @@ module Homebrew
         # Even if we don't install this formula mark it as no longer just
         # installed as a dependency.
         next unless f.opt_prefix.directory?
+
         keg = Keg.new(f.opt_prefix.resolved_path)
         tab = Tab.for_keg(keg)
         unless tab.installed_on_request
@@ -246,6 +248,7 @@ module Homebrew
       end
 
       return if formulae.empty?
+
       Install.perform_preinstall_checks
 
       formulae.each do |f|
@@ -288,6 +291,7 @@ module Homebrew
 
       # Do not search taps if the formula name is qualified
       return if e.name.include?("/")
+
       ohai "Searching taps..."
       taps_search_results = search_taps(e.name)[:formulae]
       case taps_search_results.length

Library/Homebrew/cmd/list.rb

@@ -47,6 +47,7 @@ module Homebrew
     # Things below use the CELLAR, which doesn't until the first formula is installed.
     unless HOMEBREW_CELLAR.exist?
       raise NoSuchKegError, ARGV.named.first unless ARGV.named.empty?
+
       return
     end
 
@@ -56,6 +57,7 @@ module Homebrew
       if args.full_name?
         full_names = Formula.installed.map(&:full_name).sort(&tap_and_name_comparison)
         return if full_names.empty?
+
         puts Formatter.columns(full_names)
       else
         ENV["CLICOLOR"] = nil
@@ -136,6 +138,7 @@ module Homebrew
       names.sort.each do |d|
         versions = d.subdirs.map { |pn| pn.basename.to_s }
         next if args.multiple? && versions.length < 2
+
         puts "#{d.basename} #{versions * " "}"
       end
     end

Library/Homebrew/cmd/options.rb

@@ -21,6 +21,7 @@ module Homebrew
       puts_options Formula.installed.sort
     else
       raise FormulaUnspecifiedError if ARGV.named.empty?
+
       puts_options ARGV.formulae
     end
   end
@@ -28,6 +29,7 @@ module Homebrew
   def puts_options(formulae)
     formulae.each do |f|
       next if f.options.empty?
+
       if ARGV.include? "--compact"
         puts f.options.as_flags.sort * " "
       else

Library/Homebrew/cmd/prune.rb

@@ -17,6 +17,7 @@ module Homebrew
 
     Keg::PRUNEABLE_DIRECTORIES.each do |dir|
       next unless dir.directory?
+
       dir.find do |path|
         path.extend(ObserverPathnameExtension)
         if path.symlink?

Library/Homebrew/cmd/search.rb

@@ -117,12 +117,14 @@ module Homebrew
 
     return unless $stdout.tty?
     return if args.remaining.empty?
+
     metacharacters = %w[\\ | ( ) [ ] { } ^ $ * + ?].freeze
     return unless metacharacters.any? do |char|
       args.remaining.any? do |arg|
         arg.include?(char) && !arg.start_with?("/")
       end
     end
+
     ohai <<~EOS
       Did you mean to perform a regular expression search?
       Surround your query with /slashes/ to search locally by regex.

Library/Homebrew/cmd/tap-pin.rb

@@ -9,6 +9,7 @@ module Homebrew
     ARGV.named.each do |name|
       tap = Tap.fetch(name)
       raise "pinning #{tap} is not allowed" if tap.core_tap?
+
       tap.pin
       ohai "Pinned #{tap}"
     end

Library/Homebrew/cmd/tap-unpin.rb

@@ -8,6 +8,7 @@ module Homebrew
     ARGV.named.each do |name|
       tap = Tap.fetch(name)
       raise "unpinning #{tap} is not allowed" if tap.core_tap?
+
       tap.unpin
       ohai "Unpinned #{tap}"
     end

Library/Homebrew/cmd/uninstall.rb

@@ -22,6 +22,7 @@ module Homebrew
       Hash[ARGV.named.map do |name|
         rack = Formulary.to_rack(name)
         next unless rack.directory?
+
         [rack, rack.subdirs.map { |d| Keg.new(d) }]
       end]
     else

Library/Homebrew/cmd/unpack.rb

@@ -33,6 +33,7 @@ module Homebrew
 
       if stage_dir.exist?
         raise "Destination #{stage_dir} already exists!" unless ARGV.force?
+
         rm_rf stage_dir
       end
 
@@ -46,6 +47,7 @@ module Homebrew
       ENV["VERBOSE"] = nil
 
       next unless ARGV.git?
+
       ohai "Setting up git repository"
       cd stage_dir
       system "git", "init", "-q"

Library/Homebrew/cmd/untap.rb

@@ -10,6 +10,7 @@ module Homebrew
     ARGV.named.each do |tapname|
       tap = Tap.fetch(tapname)
       raise "untapping #{tap} is not allowed" if tap.core_tap?
+
       tap.uninstall
     end
   end

Library/Homebrew/cmd/update-report.rb

@@ -92,6 +92,7 @@ module Homebrew
     updated_taps = []
     Tap.each do |tap|
       next unless tap.git?
+
       begin
         reporter = Reporter.new(tap)
       rescue Reporter::ReporterRevisionUnsetError => e
@@ -150,8 +151,10 @@ module Homebrew
 
   def install_core_tap_if_necessary
     return if ENV["HOMEBREW_UPDATE_TEST"]
+
     core_tap = CoreTap.instance
     return if core_tap.installed?
+
     CoreTap.ensure_installed!
     revision = core_tap.git_head
     ENV["HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_CORE"] = revision
@@ -236,6 +239,7 @@ class Reporter
         dst_full_name = tap.formula_file_to_name(dst)
         # Don't report formulae that are moved within a tap but not renamed
         next if src_full_name == dst_full_name
+
         @report[:D] << src_full_name
         @report[:A] << dst_full_name
       end
@@ -302,6 +306,7 @@ class Reporter
       # This means it is a Cask
       if report[:DC].include? full_name
         next unless (HOMEBREW_PREFIX/"Caskroom"/new_name).exist?
+
         new_tap = Tap.fetch(new_tap_name)
         new_tap.install unless new_tap.installed?
         ohai "#{name} has been moved to Homebrew.", <<~EOS
@@ -309,6 +314,7 @@ class Reporter
             brew cask uninstall --force #{name}
         EOS
         next if (HOMEBREW_CELLAR/new_name.split("/").last).directory?
+
         ohai "Installing #{new_name}..."
         system HOMEBREW_BREW_FILE, "install", new_full_name
         begin
@@ -322,8 +328,10 @@ class Reporter
       end
 
       next unless (dir = HOMEBREW_CELLAR/name).exist? # skip if formula is not installed.
+
       tabs = dir.subdirs.map { |d| Tab.for_keg(Keg.new(d)) }
       next unless tabs.first.tap == tap # skip if installed formula is not from this tap.
+
       new_tap = Tap.fetch(new_tap_name)
       # For formulae migrated to cask: Auto-install cask or provide install instructions.
       if new_tap_name.start_with?("homebrew/cask")
@@ -445,6 +453,7 @@ class ReporterHub
     end.compact
 
     return if formulae.empty?
+
     # Dump formula list.
     ohai title
     puts Formatter.columns(formulae.sort)

Library/Homebrew/cmd/upgrade.rb

@@ -109,6 +109,7 @@ module Homebrew
         upgrade_formula(f)
         next if !ARGV.include?("--cleanup") && !ENV["HOMEBREW_UPGRADE_CLEANUP"]
         next unless f.installed?
+
         Cleanup.new.cleanup_formula(f)
       rescue UnsatisfiedRequirements => e
         Homebrew.failed = true

Library/Homebrew/cmd/uses.rb

@@ -76,6 +76,7 @@ module Homebrew
     end
 
     return if uses.empty?
+
     puts Formatter.columns(uses.map(&:full_name).sort)
     odie "Missing formulae should not have dependents!" if used_formulae_missing
   end

Library/Homebrew/compat/cask/cmd/--version.rb

@@ -11,6 +11,7 @@ module Cask
       def initialize(*)
         super
         return if args.empty?
+
         raise ArgumentError, "#{self.class.command_name} does not take arguments."
       end
 

Library/Homebrew/constants.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 # RuboCop version used for `brew style` and `brew cask style`
-HOMEBREW_RUBOCOP_VERSION = "0.58.2"
+HOMEBREW_RUBOCOP_VERSION = "0.59.1"
-HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.21.0" # has to be updated when RuboCop version changes
+HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.22.0" # has to be updated when RuboCop version changes

Library/Homebrew/cxxstdlib.rb

@@ -16,6 +16,7 @@ class CxxStdlib
     if type && ![:libstdcxx, :libcxx].include?(type)
       raise ArgumentError, "Invalid C++ stdlib type: #{type}"
     end
+
     klass = (compiler.to_s =~ GNU_GCC_REGEXP) ? GnuStdlib : AppleStdlib
     klass.new(type, compiler)
   end

Library/Homebrew/dependable.rb

@@ -35,12 +35,14 @@ module Dependable
 
   def prune_from_option?(build)
     return if !optional? && !recommended?
+
     build.without?(self)
   end
 
   def prune_if_build_and_not_dependent?(dependent, formula = nil)
     return false unless build?
     return dependent.installed? unless formula
+
     dependent != formula
   end
 end

Library/Homebrew/dependencies.rb

@@ -41,6 +41,7 @@ class Requirements < DelegateClass(Set)
     if other.is_a?(Comparable)
       grep(other.class) do |req|
         return self if req > other
+
         delete(req)
       end
     end
@@ -126,6 +127,7 @@ module Homebrew
   def reject_ignores(dependables, ignores, includes)
     dependables.reject do |dep|
       next false unless ignores.any? { |ignore| dep.send(ignore) }
+
       includes.none? { |include| dep.send(include) }
     end
   end

Library/Homebrew/dependency.rb

@@ -93,11 +93,13 @@ class Dependency
           next
         when :skip
           next if @expand_stack.include? dep.name
+
           expanded_deps.concat(expand(dep.to_formula, &block))
         when :keep_but_prune_recursive_deps
           expanded_deps << dep
         else
           next if @expand_stack.include? dep.name
+
           expanded_deps.concat(expand(dep.to_formula, &block))
           expanded_deps << dep
         end
@@ -167,6 +169,7 @@ class Dependency
     def merge_temporality(deps)
       # Means both build and runtime dependency.
       return [] unless deps.all?(&:build?)
+
       [:build]
     end
   end

Library/Homebrew/dependency_collector.rb

@@ -53,11 +53,13 @@ class DependencyCollector
 
   def git_dep_if_needed(tags)
     return if Utils.git_available?
+
     Dependency.new("git", tags)
   end
 
   def subversion_dep_if_needed(tags)
     return if Utils.svn_available?
+
     Dependency.new("subversion", tags)
   end
 

Library/Homebrew/descriptions.rb

@@ -39,10 +39,12 @@ class Descriptions
   # repos were updated more recently than it was.
   def self.cache_fresh?
     return false unless CACHE_FILE.exist?
+
     cache_mtime = File.mtime(CACHE_FILE)
 
     Tap.each do |tap|
       next unless tap.git?
+
       repo_mtime = File.mtime(tap.path/".git/refs/heads/master")
       return false if repo_mtime > cache_mtime
     end
@@ -93,6 +95,7 @@ class Descriptions
   # the cache. Save the updated cache to disk, unless explicitly told not to.
   def self.uncache_formulae(formula_names, options = { save: true })
     return unless cache
+
     formula_names.each { |name| @cache.delete(name) }
     save_cache if options[:save]
   end

Library/Homebrew/dev-cmd/audit.rb

@@ -126,6 +126,7 @@ module Homebrew
       fa = FormulaAuditor.new(f, options)
       fa.audit
       next if fa.problems.empty? && fa.new_formula_problems.empty?
+
       fa.problems
       formula_count += 1
       problem_count += fa.problems.size
@@ -240,9 +241,11 @@ module Homebrew
 
     def audit_style
       return unless @style_offenses
+
       @style_offenses.each do |offense|
         if offense.cop_name.start_with?("NewFormulaAudit")
           next if formula.versioned_formula?
+
           new_formula_problem offense.to_s(display_cop_name: @display_cop_names)
           next
         end
@@ -430,6 +433,7 @@ module Homebrew
 
           next unless @new_formula
           next unless @official_tap
+
           if dep.tags.include?(:recommended) || dep.tags.include?(:optional)
             new_formula_problem options_message
           end
@@ -437,6 +441,7 @@ module Homebrew
 
         next unless @new_formula
         next unless @official_tap
+
         if spec.requirements.map(&:recommended?).any? || spec.requirements.map(&:optional?).any?
           new_formula_problem options_message
         end
@@ -487,6 +492,7 @@ module Homebrew
       end
 
       return unless reason.end_with?(".")
+
       problem "keg_only reason should not end with a period."
     end
 
@@ -498,6 +504,7 @@ module Homebrew
       return unless @online
 
       return unless DevelopmentTools.curl_handles_most_https_certificates?
+
       if http_content_problem = curl_check_http_content(homepage,
                                   user_agents: [:browser, :default],
                                   check_content: true,
@@ -518,6 +525,7 @@ module Homebrew
           leafnode
         ]
         return if bottle_disabled_whitelist.include?(formula.name)
+
         problem "Formulae should not use `bottle :disabled`" if @official_tap
       end
     end
@@ -549,6 +557,7 @@ module Homebrew
       end
 
       return if Date.parse(metadata["created_at"]) <= (Date.today - 30)
+
       new_formula_problem "GitHub repository too new (<30 days old)"
     end
 
@@ -577,6 +586,7 @@ module Homebrew
 
         next if spec.patches.empty?
         next unless @new_formula
+
         new_formula_problem(
           "Formulae should not require patches to build. " \
           "Patches should be submitted and accepted upstream first.",
@@ -585,6 +595,7 @@ module Homebrew
 
       %w[Stable Devel].each do |name|
         next unless spec = formula.send(name.downcase)
+
         version = spec.version
         if version.to_s !~ /\d/
           problem "#{name}: version (#{version}) is set to a string without a digit"
@@ -627,6 +638,7 @@ module Homebrew
 
       throttled.each_slice(2).to_a.map do |a, b|
         next if formula.stable.nil?
+
         version = formula.stable.version.to_s.split(".").last.to_i
         if @strict && a == formula.name && version.modulo(b.to_i).nonzero?
           problem "should only be updated every #{b} releases on multiples of #{b}"
@@ -675,10 +687,12 @@ module Homebrew
         matched = Regexp.last_match(1)
         version_prefix = stable.version.to_s.sub(/\d+$/, "")
         return if unstable_whitelist.include?([formula.name, version_prefix])
+
         problem "Stable version URLs should not contain #{matched}"
       when %r{download\.gnome\.org/sources}, %r{ftp\.gnome\.org/pub/GNOME/sources}i
         version_prefix = stable.version.to_s.split(".")[0..1].join(".")
         return if gnome_devel_whitelist.include?([formula.name, version_prefix])
+
         version = Version.parse(stable.url)
         if version >= Version.create("1.0")
           minor_version = version.to_s.split(".", 3)[1].to_i
@@ -701,6 +715,7 @@ module Homebrew
         next unless spec = formula.send(spec_sym)
         next unless previous_version_and_checksum[spec_sym][:version] == spec.version
         next if previous_version_and_checksum[spec_sym][:checksum] == spec.checksum
+
         problem(
           "#{spec_sym}: sha256 changed without the version also changing; " \
           "please create an issue upstream to rule out malicious " \
@@ -743,6 +758,7 @@ module Homebrew
         map_includes_version = spec_version_scheme_map.key?(spec_version)
         next if !current_version_scheme.zero? &&
                 (above_max_version_scheme || map_includes_version)
+
         problem "#{spec} version should not decrease (from #{max_version} to #{spec_version})"
       end
 
@@ -777,6 +793,7 @@ module Homebrew
       bin_names += formula.aliases
       [formula.bin, formula.sbin].each do |dir|
         next unless dir.exist?
+
         bin_names += dir.children.map(&:basename).map(&:to_s)
       end
       bin_names.each do |name|
@@ -848,6 +865,7 @@ module Homebrew
       end
 
       return unless line =~ %r{share(\s*[/+]\s*)(['"])#{Regexp.escape(formula.name)}(?:\2|/)}
+
       problem "Use pkgshare instead of (share#{Regexp.last_match(1)}\"#{formula.name}\")"
     end
 
@@ -976,6 +994,7 @@ module Homebrew
       end
 
       return unless version.to_s =~ /_\d+$/
+
       problem "version #{version} should not end with an underline and a number"
     end
 
@@ -1011,6 +1030,7 @@ module Homebrew
       end
 
       return unless url_strategy == DownloadStrategyDetector.detect("", using)
+
       problem "Redundant :using value in URL"
     end
 
@@ -1040,6 +1060,7 @@ module Homebrew
       end
 
       return unless @online
+
       urls.each do |url|
         next if !@strict && mirrors.include?(url)
 
@@ -1048,6 +1069,7 @@ module Homebrew
           # A `brew mirror`'ed URL is usually not yet reachable at the time of
           # pull request.
           next if url =~ %r{^https://dl.bintray.com/homebrew/mirror/}
+
           if http_content_problem = curl_check_http_content(url, require_http: curl_openssl_or_deps)
             problem http_content_problem
           end
@@ -1058,6 +1080,7 @@ module Homebrew
         elsif strategy <= SubversionDownloadStrategy
           next unless DevelopmentTools.subversion_handles_most_https_certificates?
           next unless Utils.svn_available?
+
           unless Utils.svn_remote_exists? url
             problem "The URL #{url} is not a valid svn URL"
           end

Library/Homebrew/dev-cmd/bottle.rb

@@ -86,6 +86,7 @@ module Homebrew
     end
 
     return merge if args.merge?
+
     ensure_relocation_formulae_installed!
     ARGV.resolved_formulae.each do |f|
       bottle_formula f
@@ -95,6 +96,7 @@ module Homebrew
   def ensure_relocation_formulae_installed!
     Keg.relocation_formulae.each do |f|
       next if Formula[f].installed?
+
       ohai "Installing #{f}..."
       safe_system HOMEBREW_BREW_FILE, "install", f
     end
@@ -140,6 +142,7 @@ module Homebrew
           str = io.readline.chomp
           next if ignores.any? { |i| i =~ str }
           next unless str.include? string
+
           offset, match = str.split(" ", 2)
           next if linked_libraries.include? match # Don't bother reporting a string if it was found by otool
 
@@ -149,6 +152,7 @@ module Homebrew
       end
 
       next unless args.verbose? && !text_matches.empty?
+
       print_filename.call(string, file)
       text_matches.first(MAXIMUM_STRING_MATCHES).each do |match, offset|
         puts " #{Tty.bold}-->#{Tty.reset} match '#{match}' at offset #{Tty.bold}0x#{offset}#{Tty.reset}"
@@ -166,6 +170,7 @@ module Homebrew
     absolute_symlinks_start_with_string = []
     keg.find do |pn|
       next unless pn.symlink? && (link = pn.readlink).absolute?
+
       absolute_symlinks_start_with_string << pn if link.to_s.start_with?(string)
     end
 
@@ -376,6 +381,7 @@ module Homebrew
     puts output
 
     return unless args.json?
+
     tag = Utils::Bottles.tag.to_s
     tag += "_or_later" if args.or_later?
     json = {
@@ -444,6 +450,7 @@ module Homebrew
               bottle_block_contents.lines.each do |line|
                 line = line.strip
                 next if line.empty?
+
                 key, old_value_original, _, tag = line.split " ", 4
                 valid_key = %w[root_url prefix cellar rebuild sha1 sha256].include? key
                 next unless valid_key
@@ -465,6 +472,7 @@ module Homebrew
                 value = value_original.to_s
                 next if key == "cellar" && old_value == "any" && value == "any_skip_relocation"
                 next unless old_value.empty? || value != old_value
+
                 old_value = old_value_original.inspect
                 value = value_original.inspect
                 mismatches << "#{key}: old: #{old_value}, new: #{value}"

Library/Homebrew/dev-cmd/bump-formula-pr.rb

@@ -378,11 +378,13 @@ module Homebrew
         unless old
           raise "No old value for new value #{new}! Did you pass the wrong arguments?"
         end
+
         contents.gsub!(old, new)
       end
       unless contents.errors.empty?
         raise Utils::InreplaceError, path => contents.errors
       end
+
       path.atomic_write(contents) if args.write?
       contents
     else
@@ -394,6 +396,7 @@ module Homebrew
           unless old
             raise "No old value for new value #{new}! Did you pass the wrong arguments?"
           end
+
           s.gsub!(old, new)
         end
       end
@@ -425,6 +428,7 @@ module Homebrew
     pull_requests = fetch_pull_requests(formula)
     return unless pull_requests
     return if pull_requests.empty?
+
     duplicates_message = <<~EOS
       These open pull requests may be duplicates:
       #{pull_requests.map { |pr| "#{pr["title"]} #{pr["html_url"]}" }.join("\n")}

Library/Homebrew/dev-cmd/create.rb

@@ -58,6 +58,7 @@ module Homebrew
     fc.version = version
     fc.tap = Tap.fetch(tap || "homebrew/core")
     raise TapUnavailableError, tap unless fc.tap.installed?
+
     fc.url = url
 
     fc.mode = if args.cmake?

Library/Homebrew/dev-cmd/edit.rb

@@ -32,6 +32,7 @@ module Homebrew
     paths ||= ARGV.named.map do |name|
       path = Formulary.path(name)
       raise FormulaUnavailableError, name if !path.file? && !args.force?
+
       path
     end
 

Library/Homebrew/dev-cmd/extract.rb

@@ -127,10 +127,12 @@ module Homebrew
           rev = Git.last_revision_commit_of_file(repo, file, before_commit: "#{rev}~1")
           break if rev.empty?
           break unless Git.last_revision_of_file(repo, file, before_commit: rev).empty?
+
           ohai "Skipping revision #{rev} - file is empty at this revision" if ARGV.debug?
         end
         test_formula = formula_at_revision(repo, name, file, rev)
         break if test_formula.nil? || test_formula.version == version
+
         ohai "Trying #{test_formula.version} from revision #{rev} against desired #{version}" if ARGV.debug?
       end
       odie "Could not find #{name}! The formula or version may not have existed." if test_formula.nil?
@@ -172,6 +174,7 @@ module Homebrew
   # @private
   def formula_at_revision(repo, name, file, rev)
     return if rev.empty?
+
     contents = Git.last_revision_of_file(repo, file, before_commit: rev)
     contents.gsub!("@url=", "url ")
     contents.gsub!("require 'brewkit'", "require 'formula'")

Library/Homebrew/dev-cmd/formula.rb

@@ -14,6 +14,7 @@ module Homebrew
     end
 
     raise FormulaUnspecifiedError if ARGV.named.empty?
+
     ARGV.resolved_formulae.each { |f| puts f.path }
   end
 end

Library/Homebrew/dev-cmd/pull.rb

@@ -64,6 +64,7 @@ module GitHub
   def test_bot_user(user, test_bot)
     return test_bot if test_bot
     return "BrewTestBot" if user.casecmp("homebrew").zero?
+
     "#{user.capitalize}TestBot"
   end
 end
@@ -194,6 +195,7 @@ module Homebrew
           "--diff-filter=AM", orig_revision, "HEAD", "--", tap.formula_dir.to_s
         ).each_line do |line|
           next unless line.end_with? ".rb\n"
+
           name = "#{tap.name}/#{File.basename(line.chomp, ".rb")}"
           changed_formulae_names << name
         end
@@ -227,6 +229,7 @@ module Homebrew
           end
         else
           next unless f.bottle_defined?
+
           opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
         end
       end
@@ -320,8 +323,10 @@ module Homebrew
       changed_formulae_names.each do |name|
         f = Formula[name]
         next if f.bottle_unneeded? || f.bottle_disabled?
+
         bintray_org = args.bintray_org || tap.user.downcase
         next unless publish_bottle_file_on_bintray(f, bintray_org, bintray_creds)
+
         published << f.full_name
       end
     else
@@ -481,6 +486,7 @@ module Homebrew
     if info.nil?
       raise "Failed publishing bottle: failed reading formula info for #{f.full_name}"
     end
+
     unless info.bottle_info_any
       opoo "No bottle defined in formula #{package}"
       return false
@@ -495,6 +501,7 @@ module Homebrew
     true
   rescue => e
     raise unless @args.warn_on_publish_failure?
+
     onoe e
     false
   end
@@ -521,14 +528,17 @@ module Homebrew
 
     def bottle_tags
       return [] unless info["bottle"]["stable"]
+
       info["bottle"]["stable"]["files"].keys
     end
 
     def bottle_info(my_bottle_tag = Utils::Bottles.tag)
       tag_s = my_bottle_tag.to_s
       return unless info["bottle"]["stable"]
+
       btl_info = info["bottle"]["stable"]["files"][tag_s]
       return unless btl_info
+
       BottleInfo.new(btl_info["url"], btl_info["sha256"])
     end
 
@@ -623,6 +633,7 @@ module Homebrew
             if retry_count >= max_retries
               raise "Failed to find published #{f} bottle at #{url}!"
             end
+
             print(wrote_dots ? "." : "Waiting on Bintray.")
             wrote_dots = true
             sleep poll_retry_delay_seconds
@@ -647,6 +658,7 @@ module Homebrew
             if retry_count >= max_curl_retries
               raise "Failed to download #{f} bottle from #{url}!"
             end
+
             puts "curl download failed; retrying in #{curl_retry_delay_seconds} sec"
             sleep curl_retry_delay_seconds
             curl_retry_delay_seconds *= 2
@@ -663,6 +675,7 @@ module Homebrew
     headers, = curl_output("--connect-timeout", "15", "--location", "--head", url)
     status_code = headers.scan(%r{^HTTP\/.* (\d+)}).last.first
     return if status_code.start_with?("2")
+
     opoo "The Bintray mirror #{url} is not reachable (HTTP status code #{status_code})."
     opoo "Do you need to upload it with `brew mirror #{name}`?"
   end

Library/Homebrew/dev-cmd/release-notes.rb

@@ -25,6 +25,7 @@ module Homebrew
 
     [previous_tag, end_ref].each do |ref|
       next if quiet_system "git", "-C", HOMEBREW_REPOSITORY, "rev-parse", "--verify", "--quiet", ref
+
       odie "Ref #{ref} does not exist!"
     end
 

Library/Homebrew/dev-cmd/tap-new.rb

@@ -11,6 +11,7 @@ module Homebrew
     path = tap.path/filename
     tap.path.mkpath
     raise "#{path} already exists" if path.exist?
+
     path.write content
   end
 

Library/Homebrew/dev-cmd/test.rb

@@ -49,6 +49,7 @@ module Homebrew
       missing_test_deps = f.recursive_dependencies do |_, dependency|
         Dependency.prune if dependency.installed?
         next if dependency.test?
+
         Dependency.prune if dependency.optional?
         Dependency.prune if dependency.build?
       end.map(&:to_s)

Library/Homebrew/dev-cmd/tests.rb

@@ -130,6 +130,7 @@ module Homebrew
       end
 
       return if $CHILD_STATUS.success?
+
       Homebrew.failed = true
     end
   end

Library/Homebrew/diagnostic.rb

@@ -12,6 +12,7 @@ module Homebrew
       ff.each do |f|
         missing_dependencies = f.missing_dependencies(hide: hide)
         next if missing_dependencies.empty?
+
         yield f.full_name, missing_dependencies if block_given?
         missing[f.full_name] = missing_dependencies
       end
@@ -32,6 +33,7 @@ module Homebrew
         vol_index = @volumes.index(vols[0])
         # volume not found in volume list
         return -1 if vol_index.nil?
+
         vol_index
       end
 
@@ -276,6 +278,7 @@ module Homebrew
 
         Keg::PRUNEABLE_DIRECTORIES.each do |d|
           next unless d.directory?
+
           d.find do |path|
             if path.symlink? && !path.resolved_path_exists?
               broken_symlinks << path
@@ -408,6 +411,7 @@ module Homebrew
 
       def check_for_config_scripts
         return unless HOMEBREW_CELLAR.exist?
+
         real_cellar = HOMEBREW_CELLAR.realpath
 
         scripts = []
@@ -604,6 +608,7 @@ module Homebrew
         f.installed_prefixes.each do |prefix|
           prefix.find do |src|
             next if src == prefix
+
             dst = HOMEBREW_PREFIX + src.relative_path_from(prefix)
             return true if dst.symlink? && src == dst.resolved_path
           end
@@ -642,6 +647,7 @@ module Homebrew
 
       def check_missing_deps
         return unless HOMEBREW_CELLAR.exist?
+
         missing = Set.new
         Homebrew::Diagnostic.missing_deps(Formula.installed).each_value do |deps|
           missing.merge(deps)
@@ -659,6 +665,7 @@ module Homebrew
 
       def check_git_status
         return unless Utils.git_available?
+
         HOMEBREW_REPOSITORY.cd do
           return if `git status --untracked-files=all --porcelain -- Library/Homebrew/ 2>/dev/null`.chomp.empty?
         end
@@ -674,6 +681,7 @@ module Homebrew
 
       def check_for_bad_python_symlink
         return unless which "python"
+
         `python -V 2>&1` =~ /Python (\d+)\./
         # This won't be the right warning if we matched nothing at all
         return if Regexp.last_match(1).nil?
@@ -764,14 +772,17 @@ module Homebrew
           unused_formula_dirs = tap.potential_formula_dirs - [tap.formula_dir]
           unused_formula_dirs.each do |dir|
             next unless dir.exist?
+
             dir.children.each do |path|
               next unless path.extname == ".rb"
+
               bad_tap_files[tap] ||= []
               bad_tap_files[tap] << path
             end
           end
         end
         return if bad_tap_files.empty?
+
         bad_tap_files.keys.map do |tap|
           <<~EOS
             Found Ruby file outside #{tap} tap formula directory

Library/Homebrew/download_strategy.rb

@@ -139,6 +139,7 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
     return unless @ref_type == :tag
     return unless @revision && current_revision
     return if current_revision == @revision
+
     raise <<~EOS
       #{@ref} tag should be #{@revision}
       but is actually #{current_revision}
@@ -194,6 +195,7 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
 
   def symlink_location
     return @symlink_location if defined?(@symlink_location)
+
     ext = Pathname(parse_basename(url)).extname
     @symlink_location = @cache/"#{name}--#{version}#{ext}"
   end
@@ -230,6 +232,7 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
 
   def resolved_url_and_basename
     return @resolved_url_and_basename if defined?(@resolved_url_and_basename)
+
     @resolved_url_and_basename = [url, parse_basename(url)]
   end
 
@@ -301,6 +304,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
       FileUtils.ln_s cached_location.relative_path_from(symlink_location.dirname), symlink_location, force: true
     rescue CurlDownloadStrategyError
       raise if urls.empty?
+
       puts "Trying a mirror..."
       retry
     end
@@ -315,6 +319,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
 
   def resolved_url_and_basename
     return @resolved_url_and_basename if defined?(@resolved_url_and_basename)
+
     @resolved_url_and_basename = resolve_url_and_basename(url)
   end
 
@@ -378,6 +383,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy
 
   def _curl_opts
     return { user_agent: meta.fetch(:user_agent) } if meta.key?(:user_agent)
+
     {}
   end
 
@@ -417,6 +423,7 @@ class CurlApacheMirrorDownloadStrategy < CurlDownloadStrategy
 
   def apache_mirrors
     return @apache_mirrors if defined?(@apache_mirrors)
+
     json, = curl_output("--silent", "--location", "#{url}&asjson=1")
     @apache_mirrors = JSON.parse(json)
   rescue JSON::ParserError
@@ -472,6 +479,7 @@ class S3DownloadStrategy < CurlDownloadStrategy
        url !~ %r{^s3://([^.].*?)/(.+)$}
       raise "Bad S3 URL: " + url
     end
+
     bucket = Regexp.last_match(1)
     key = Regexp.last_match(2)
 
@@ -531,6 +539,7 @@ class GitHubPrivateRepositoryDownloadStrategy < CurlDownloadStrategy
     unless @github_token
       raise CurlDownloadStrategyError, "Environmental variable HOMEBREW_GITHUB_API_TOKEN is required."
     end
+
     validate_github_repository_access!
   end
 
@@ -933,6 +942,7 @@ class GitHubGitDownloadStrategy < GitDownloadStrategy
     super
 
     return unless %r{^https?://github\.com/(?<user>[^/]+)/(?<repo>[^/]+)\.git$} =~ @url
+
     @user = user
     @repo = repo
   end
@@ -972,6 +982,7 @@ class GitHubGitDownloadStrategy < GitDownloadStrategy
     else
       return true unless commit
       return true unless @last_commit.start_with?(commit)
+
       if multiple_short_commits_exist?(commit)
         true
       else
@@ -1003,6 +1014,7 @@ class CVSDownloadStrategy < VCSDownloadStrategy
     cached_location.find do |f|
       Find.prune if f.directory? && f.basename.to_s == "CVS"
       next unless f.file?
+
       mtime = f.mtime
       max_mtime = mtime if mtime > max_mtime
     end
@@ -1110,6 +1122,7 @@ class BazaarDownloadStrategy < VCSDownloadStrategy
     out, = system_command("bzr", args: ["log", "-l", "1", "--timezone=utc", cached_location])
     timestamp = out.chomp
     raise "Could not get any timestamps from bzr!" if timestamp.blank?
+
     Time.parse(timestamp)
   end
 

Library/Homebrew/exceptions.rb

@@ -429,6 +429,7 @@ class BuildError < RuntimeError
     checks.build_error_checks.each do |check|
       out = checks.send(check)
       next if out.nil?
+
       puts
       ofail out
     end

Library/Homebrew/extend/ARGV.rb

@@ -125,6 +125,7 @@ module HomebrewArgvExtension
   # @see value
   def values(name)
     return unless val = value(name)
+
     val.split(",")
   end
 
@@ -226,6 +227,7 @@ module HomebrewArgvExtension
   def build_formula_from_source?(f)
     return true if build_all_from_source?
     return false unless build_from_source? || build_bottle?
+
     formulae.any? { |argv_f| argv_f.full_name == f.full_name }
   end
 
@@ -244,6 +246,7 @@ module HomebrewArgvExtension
   # eg. `foo -ns -i --bar` has three switches, n, s and i
   def switch?(char)
     return false if char.length > 1
+
     options_only.any? { |arg| arg.scan("-").size == 1 && arg.include?(char) }
   end
 

Library/Homebrew/extend/ENV.rb

@@ -30,6 +30,7 @@ module EnvActivation
   def clear_sensitive_environment!
     each_key do |key|
       next unless /(cookie|key|token|password)/i =~ key
+
       delete key
     end
   end

Library/Homebrew/extend/ENV/shared.rb

@@ -95,6 +95,7 @@ module SharedEnvExtension
   # (e.g. <pre>ENV.prepend_path "PATH", which("emacs").dirname</pre>)
   def prepend_path(key, path)
     return if %w[/usr/bin /bin /usr/sbin /sbin].include? path.to_s
+
     self[key] = PATH.new(self[key]).prepend(path)
   end
 
@@ -106,8 +107,10 @@ module SharedEnvExtension
 
   def remove(keys, value)
     return if value.nil?
+
     Array(keys).each do |key|
       next unless self[key]
+
       self[key] = self[key].sub(value, "")
       delete(key) if self[key].empty?
     end
@@ -223,6 +226,7 @@ module SharedEnvExtension
     # building with an alternative Fortran compiler without optimization flags,
     # despite it often being the Homebrew-provided one set up in the first call.
     return if @fortran_setup_done
+
     @fortran_setup_done = true
 
     flags = []
@@ -294,6 +298,7 @@ module SharedEnvExtension
     end
 
     return if gcc_formula.opt_prefix.exist?
+
     raise <<~EOS
       The requested Homebrew GCC was not installed. You must:
         brew install #{gcc_formula.full_name}
@@ -313,6 +318,7 @@ module SharedEnvExtension
   # @private
   def compiler_with_cxx11_support?(cc)
     return if compiler_any_clang?(cc)
+
     version = cc[/^gcc-(\d+(?:\.\d+)?)$/, 1]
     version && Version.create(version) >= Version.create("4.8")
   end
@@ -344,6 +350,7 @@ module SharedEnvExtension
 
   def check_for_compiler_universal_support
     return unless homebrew_cc =~ GNU_GCC_REGEXP
+
     raise "Non-Apple GCC can't build universal binaries"
   end
 end

Library/Homebrew/extend/ENV/std.rb

@@ -46,6 +46,7 @@ module Stdenv
     send(compiler)
 
     return unless cc =~ GNU_GCC_REGEXP
+
     gcc_formula = gcc_version_formula($&)
     append_path "PATH", gcc_formula.opt_bin.to_s
   end
@@ -159,6 +160,7 @@ module Stdenv
 
     return if compiler_any_clang?
     return unless Hardware.is_32_bit?
+
     # Can't mix "-march" for a 32-bit CPU  with "-arch x86_64"
     replace_in_cflags(/-march=\S*/, "-Xarch_#{Hardware::CPU.arch_32_bit} \\0")
   end

Library/Homebrew/extend/ENV/super.rb

@@ -278,6 +278,7 @@ module Superenv
     # GCC doesn't accept "-march" for a 32-bit CPU with "-arch x86_64"
     return if compiler_any_clang?
     return unless Hardware::CPU.is_32_bit?
+
     self["HOMEBREW_OPTFLAGS"] = self["HOMEBREW_OPTFLAGS"].sub(
       /-march=\S*/,
       "-Xarch_#{Hardware::CPU.arch_32_bit} \\0",

Library/Homebrew/extend/git_repository.rb

@@ -8,36 +8,43 @@ module GitRepositoryExtension
 
   def git_origin
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "config", "--get", "remote.origin.url", chdir: self).chuzzle
   end
 
   def git_origin=(origin)
     return unless git? && Utils.git_available?
+
     safe_system "git", "remote", "set-url", "origin", origin, chdir: self
   end
 
   def git_head
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "rev-parse", "--verify", "-q", "HEAD", chdir: self).chuzzle
   end
 
   def git_short_head
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "rev-parse", "--short=4", "--verify", "-q", "HEAD", chdir: self).chuzzle
   end
 
   def git_last_commit
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "show", "-s", "--format=%cr", "HEAD", chdir: self).chuzzle
   end
 
   def git_branch
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "rev-parse", "--abbrev-ref", "HEAD", chdir: self).chuzzle
   end
 
   def git_last_commit_date
     return unless git? && Utils.git_available?
+
     Utils.popen_read("git", "show", "-s", "--format=%cd", "--date=short", "HEAD", chdir: self).chuzzle
   end
 end

Library/Homebrew/extend/hash_validator.rb

@@ -3,6 +3,7 @@ module HashValidator
     def assert_valid_keys!(*valid_keys)
       unknown_keys = keys - valid_keys
       return if unknown_keys.empty?
+
       raise ArgumentError, "invalid keys: #{unknown_keys.map(&:inspect).join(", ")}"
     end
   end

Library/Homebrew/extend/io.rb

@@ -5,6 +5,7 @@ class IO
 
     loop do
       break if buffer == sep
+
       read_nonblock(1, buffer)
       line.concat(buffer)
     end
@@ -12,6 +13,7 @@ class IO
     line
   rescue IO::WaitReadable, EOFError => e
     raise e if line.empty?
+
     line
   end
 end

Library/Homebrew/extend/os/linux/diagnostic.rb

@@ -8,6 +8,7 @@ module Homebrew
       def check_tmpdir_sticky_bit
         message = generic_check_tmpdir_sticky_bit
         return if message.nil?
+
         message + <<~EOS
           If you don't have administrative privileges on this machine,
           create a directory and set the HOMEBREW_TEMP environment variable,
@@ -23,6 +24,7 @@ module Homebrew
         f.chmod 0700
         f.close
         return if system f.path
+
         <<~EOS.undent
           The directory #{HOMEBREW_TEMP} does not permit executing
           programs. It is likely mounted as "noexec". Please set HOMEBREW_TEMP
@@ -37,6 +39,7 @@ module Homebrew
       def check_xdg_data_dirs
         return if ENV["XDG_DATA_DIRS"].blank?
         return if ENV["XDG_DATA_DIRS"].split("/").include?(HOMEBREW_PREFIX/"share")
+
         <<~EOS
           Homebrew's share was not found in your XDG_DATA_DIRS but you have
           this variable set to include other locations.

Library/Homebrew/extend/os/linux/extend/ENV/super.rb

@@ -36,6 +36,7 @@ module Superenv
   def determine_dynamic_linker_path
     path = "#{HOMEBREW_PREFIX}/lib/ld.so"
     return unless File.readable? path
+
     path
   end
 end

Library/Homebrew/extend/os/linux/hardware/cpu.rb

@@ -9,6 +9,7 @@ module Hardware
         return :arm if arm?
         return :ppc if ppc?
         return :dunno unless intel?
+
         # See https://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers
         cpu_family = cpuinfo[/^cpu family\s*: ([0-9]+)/, 1].to_i
         cpu_model = cpuinfo[/^model\s*: ([0-9]+)/, 1].to_i

Library/Homebrew/extend/os/linux/keg_relocate.rb

@@ -45,6 +45,7 @@ class Keg
     end
 
     return if old_rpath == new_rpath && old_interpreter == new_interpreter
+
     safe_system(*cmd, file)
   end
 
@@ -54,6 +55,7 @@ class Keg
     elf_files.each do |file|
       next unless file.dynamic_elf?
       next if file.binary_executable? && skip_executables
+
       dylibs = file.dynamically_linked_libraries
       results << :libcxx if dylibs.any? { |s| s.include? "libc++.so" }
       results << :libstdcxx if dylibs.any? { |s| s.include? "libstdc++.so" }
@@ -72,6 +74,7 @@ class Keg
       # same dev ID and inode). This prevents relocations from being performed
       # on a binary more than once.
       next unless hardlinks.add? [pn.stat.dev, pn.stat.ino]
+
       elf_files << pn
     end
     elf_files

Library/Homebrew/extend/os/linux/requirements/osxfuse_requirement.rb

@@ -5,6 +5,7 @@ class OsxfuseRequirement < Requirement
 
   satisfy(build_env: false) do
     next true if libfuse_formula_exists? && Formula["libfuse"].installed?
+
     includedirs = %w[
       /usr/include
       /usr/local/include
@@ -12,6 +13,7 @@ class OsxfuseRequirement < Requirement
     next true if (includedirs.map do |dir|
       File.exist? "#{dir}/fuse.h"
     end).any?
+
     false
   end
 

Library/Homebrew/extend/os/linux/system_config.rb

@@ -18,17 +18,20 @@ class SystemConfig
     def host_glibc_version
       version = OS::Linux::Glibc.system_version
       return "N/A" if version.null?
+
       version
     end
 
     def host_gcc_version
       gcc = Pathname.new "/usr/bin/gcc"
       return "N/A" unless gcc.executable?
+
       `#{gcc} --version 2>/dev/null`[/ (\d+\.\d+\.\d+)/, 1]
     end
 
     def formula_linked_version(formula)
       return "N/A" unless CoreTap.instance.installed?
+
       Formulary.factory(formula).linked_version || "N/A"
     rescue FormulaUnavailableError
       "N/A"

Library/Homebrew/extend/os/mac/dependency_collector.rb

@@ -7,6 +7,7 @@ class DependencyCollector
 
   def git_dep_if_needed(tags)
     return if MacOS.version >= :lion
+
     Dependency.new("git", tags)
   end
 
@@ -14,11 +15,13 @@ class DependencyCollector
 
   def cvs_dep_if_needed(tags)
     return if MacOS.version < :lion
+
     Dependency.new("cvs", tags)
   end
 
   def xz_dep_if_needed(tags)
     return if MacOS.version >= :mavericks
+
     Dependency.new("xz", tags)
   end
 
@@ -29,6 +32,7 @@ class DependencyCollector
   def ld64_dep_if_needed(*)
     # Tiger's ld is too old to properly link some software
     return if MacOS.version > :tiger
+
     LD64Dependency.new
   end
 end

Library/Homebrew/extend/os/mac/diagnostic.rb

@@ -352,6 +352,7 @@ module Homebrew
 
       def check_for_multiple_volumes
         return unless HOMEBREW_CELLAR.exist?
+
         volumes = Volumes.new
 
         # Find the volumes for the TMP folder & HOMEBREW_CELLAR

Library/Homebrew/extend/os/mac/extend/ENV/std.rb

@@ -55,6 +55,7 @@ module Stdenv
     # Leopard's ld needs some convincing that it's building 64-bit
     # See: https://github.com/mistydemeo/tigerbrew/issues/59
     return unless MacOS.version == :leopard && MacOS.prefer_64_bit?
+
     append "LDFLAGS", "-arch #{Hardware::CPU.arch_64_bit}"
 
     # Many, many builds are broken thanks to Leopard's buggy ld.
@@ -94,6 +95,7 @@ module Stdenv
     remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
 
     return unless (sdk = MacOS.sdk_path_if_needed(version))
+
     delete("SDKROOT")
     remove_from_cflags "-isysroot #{sdk}"
     remove "CPPFLAGS", "-isysroot #{sdk}"
@@ -116,6 +118,7 @@ module Stdenv
     prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
 
     return unless (sdk = MacOS.sdk_path_if_needed(version))
+
     # Extra setup to support Xcode 4.3+ without CLT.
     self["SDKROOT"] = sdk
     # Tell clang/gcc where system include's are: