Merge pull request #2679 from MikeMcQuaid/parallel-rubocop

Use parallel RuboCop

.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 cache:
   directories:
     - $HOME/.gem/ruby
+    - $HOME/Library/Caches/Homebrew/style
+    - $HOME/Library/Caches/Homebrew/tests
     - Library/Homebrew/vendor/bundle
-    # For parallel_rspec
-    - Library/Homebrew/tmp
 
 matrix:
   include:

Library/.rubocop.yml

@@ -23,70 +23,94 @@ FormulaAuditStrict/ComponentsRedundancy:
 FormulaAudit/Homepage:
   Enabled: true
 
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Metrics/ClassLength:
+# `system` is a special case and aligns on second argument
+Layout/AlignParameters:
   Enabled: false
 
-Metrics/CyclomaticComplexity:
-  Enabled: false
+Layout/CaseIndentation:
+  EnforcedStyle: end
 
-Metrics/LineLength:
-  Enabled: false
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
 
-Metrics/MethodLength:
-  Enabled: false
+Layout/IndentArray:
+  EnforcedStyle: special_inside_parentheses
 
-Metrics/ModuleLength:
-  CountComments: false
-  Exclude:
-    - '**/bin/**/*'
-    - '**/cmd/**/*'
-    - '**/lib/**/*'
-    - '**/spec/**/*'
+Layout/IndentHeredoc:
+  EnforcedStyle: unindent
 
-Metrics/PerceivedComplexity:
+# conflicts with DSL-style path concatenation with `/`
+Layout/SpaceAroundOperators:
   Enabled: false
 
 # favor parens-less DSL-style arguments
 Lint/AmbiguousOperator:
   Enabled: false
 
+# so many of these in formulae and can't be autocorrected
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
+# favor parens-less DSL-style arguments
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+# assignment in conditions are useful sometimes
 Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
+# so many of these in formulae and can't be autocorrected
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 
-Style/Alias:
-  EnforcedStyle: prefer_alias
+# TODO: try to bring down all metrics maximums
+Metrics/AbcSize:
+  Max: 250
 
-Style/AlignHash:
-  Enabled: false
+Metrics/BlockLength:
+  Max: 1250
 
-# `system` is a special case and aligns on second argument
-Style/AlignParameters:
+Metrics/ClassLength:
+  Max: 1500
+
+Metrics/CyclomaticComplexity:
+  Max: 75
+
+Metrics/LineLength:
+  Max: 400
+
+Metrics/MethodLength:
+  Max: 250
+
+Metrics/ModuleLength:
+  CountComments: false
+  Exclude:
+    - '**/bin/**/*'
+    - '**/cmd/**/*'
+    - '**/lib/**/*'
+
+Metrics/PerceivedComplexity:
+  Max: 80
+
+# makes code less readable for minor performance increases
+Performance/Caller:
   Enabled: false
 
+Style/Alias:
+  EnforcedStyle: prefer_alias
+
+Style/AutoResourceCleanup:
+  Enabled: true
+
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
 
 Style/BlockDelimiters:
   EnforcedStyle: line_count_based
 
-Style/CaseIndentation:
-  EnforcedStyle: end
-
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
 
@@ -99,16 +123,22 @@ Style/CommandLiteral:
 Style/ConditionalAssignment:
   Enabled: false
 
+# most of our APIs are internal so don't require docs
 Style/Documentation:
  Enabled: false
 
-Style/EmptyLineBetweenDefs:
-  AllowAdjacentOneLineDefs: true
+Style/Encoding:
+  Enabled: true
 
 # dashes in filenames are typical
 Style/FileName:
   Regex: !ruby/regexp /^[\w\@\-\+\.]+(\.rb)?$/
 
+# falsely flags e.g. curl formatting arguments as format strings
+Style/FormatStringToken:
+  Enabled: false
+
+# so many of these in formulae and can't be autocorrected
 Style/GuardClause:
   Enabled: false
 
@@ -121,13 +151,6 @@ Style/HashSyntax:
     - '**/lib/**/*'
     - '**/spec/**/*'
 
-# disabled until it respects line length
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/IndentArray:
-  EnforcedStyle: special_inside_parentheses
-
 # only for numbers >= 1_000_000
 Style/NumericLiterals:
   MinDigits: 7
@@ -160,13 +183,6 @@ Style/RaiseArgs:
 Style/RegexpLiteral:
   EnforcedStyle: slashes
 
-# conflicts with DSL-style path concatenation with `/`
-Style/SpaceAroundOperators:
-  Enabled: false
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
 # not a problem for typical shell users
 Style/SpecialGlobalVars:
   Enabled: false
@@ -179,17 +195,22 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
 Style/TernaryParentheses:
-  Enabled: false
+  EnforcedStyle: require_parentheses_when_complex
 
 # makes diffs nicer
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
+
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
+# we have too many variables like sha256 where this harms readability
 Style/VariableNumber:
   Enabled: false
 
 Style/WordArray:
-  Enabled: false
+  MinSize: 4

Library/Homebrew/.rubocop.yml

@@ -9,9 +9,8 @@ AllCops:
     - '**/Casks/**/*'
     - '**/vendor/**/*'
 
-Style/BlockDelimiters:
+Layout/MultilineMethodCallIndentation:
   Exclude:
-    - '**/cask/spec/**/*'
     - '**/*_spec.rb'
 
 # so many of these in formulae but none in here
@@ -27,16 +26,13 @@ Lint/NestedMethodDefinition:
 Lint/ParenthesesAsGroupedExpression:
   Enabled: true
 
-Metrics/ModuleLength:
-  CountComments: false
-  Exclude:
-    - 'cask/lib/hbc/locations.rb'
-    - 'cask/lib/hbc/macos.rb'
-    - 'cask/lib/hbc/utils.rb'
-
 Metrics/ParameterLists:
   CountKeywordArgs: false
 
+Style/BlockDelimiters:
+  Exclude:
+    - '**/*_spec.rb'
+
 # so many of these in formulae but none in here
 Style/GuardClause:
   Enabled: true

Library/Homebrew/brew.rb

@@ -116,7 +116,6 @@ begin
       odie "Unknown command: #{cmd}"
     end
   end
-
 rescue UsageError => e
   require "cmd/help"
   Homebrew.help cmd, usage_error: e.message

Library/Homebrew/cask/lib/hbc/artifact/base.rb

@@ -10,7 +10,7 @@ module Hbc
       end
 
       def self.artifact_english_article
-        @artifact_english_article ||= artifact_english_name =~ /^[aeiou]/i ? "an" : "a"
+        @artifact_english_article ||= (artifact_english_name =~ /^[aeiou]/i) ? "an" : "a"
       end
 
       def self.artifact_dsl_key
@@ -43,7 +43,7 @@ module Hbc
         unless unknown_keys.empty?
           opoo %Q{Unknown arguments to #{description} -- #{unknown_keys.inspect} (ignored). Running "brew update; brew cleanup; brew cask cleanup" will likely fix it.}
         end
-        arguments.reject! { |k| !permitted_keys.include?(k) }
+        arguments.select! { |k| permitted_keys.include?(k) }
 
         # key warnings
         override_keys = override_arguments.keys

Library/Homebrew/cask/lib/hbc/artifact/uninstall_base.rb

@@ -197,9 +197,7 @@ module Hbc
         paths.each do |path|
           resolved_path = Pathname.new(path)
 
-          if path.start_with?("~")
-            resolved_path = resolved_path.expand_path
-          end
+          resolved_path = resolved_path.expand_path if path.start_with?("~")
 
           if resolved_path.relative? || resolved_path.split.any? { |part| part.to_s == ".." }
             opoo "Skipping #{Formatter.identifier(action)} for relative path '#{path}'."

Library/Homebrew/cask/lib/hbc/cask.rb

@@ -66,7 +66,7 @@ module Hbc
       return [] if current == version
 
       # collect all installed versions that are different than tap version and return them
-      installed.select { |v| v != version }
+      installed.reject { |v| v == version }
     end
 
     def to_s

Library/Homebrew/cask/lib/hbc/cask_loader.rb

@@ -54,7 +54,7 @@ module Hbc
 
     class FromURILoader < FromPathLoader
       def self.can_load?(ref)
-        !(ref.to_s !~ ::URI.regexp)
+        ref.to_s =~ ::URI.regexp
       end
 
       def initialize(url)
@@ -80,7 +80,7 @@ module Hbc
 
     class FromTapLoader < FromPathLoader
       def self.can_load?(ref)
-        !(ref.to_s !~ HOMEBREW_TAP_CASK_REGEX)
+        ref.to_s =~ HOMEBREW_TAP_CASK_REGEX
       end
 
       def initialize(tapped_name)

Library/Homebrew/cask/lib/hbc/cli.rb

@@ -140,9 +140,7 @@ module Hbc
       command_name, *args = *@args
       command = help? ? "help" : self.class.lookup_command(command_name)
 
-      unless ENV["MACOS_VERSION"].nil?
-        MacOS.full_version = ENV["MACOS_VERSION"]
-      end
+      MacOS.full_version = ENV["MACOS_VERSION"] unless ENV["MACOS_VERSION"].nil?
 
       Hbc.default_tap.install unless Hbc.default_tap.installed?
       Hbc.init if self.class.should_init?(command)

Library/Homebrew/cask/lib/hbc/cli/abstract_command.rb

@@ -15,7 +15,7 @@ module Hbc
       end
 
       def self.abstract?
-        !(name.split("::").last !~ /^Abstract[^a-z]/)
+        name.split("::").last =~ /^Abstract[^a-z]/
       end
 
       def self.visible

Library/Homebrew/cask/lib/hbc/cli/doctor.rb

@@ -17,17 +17,17 @@ module Hbc
         ohai "Contents of $LOAD_PATH", self.class.render_load_path($LOAD_PATH)
         ohai "Environment Variables"
 
-        environment_variables = [
-          "RUBYLIB",
-          "RUBYOPT",
-          "RUBYPATH",
-          "RBENV_VERSION",
-          "CHRUBY_VERSION",
-          "GEM_HOME",
-          "GEM_PATH",
-          "BUNDLE_PATH",
-          "PATH",
-          "SHELL",
+        environment_variables = %w[
+          RUBYLIB
+          RUBYOPT
+          RUBYPATH
+          RBENV_VERSION
+          CHRUBY_VERSION
+          GEM_HOME
+          GEM_PATH
+          BUNDLE_PATH
+          PATH
+          SHELL
         ]
 
         (self.class.locale_variables + environment_variables).sort.each(&self.class.method(:render_env_var))

Library/Homebrew/cask/lib/hbc/cli/info.rb

@@ -41,7 +41,7 @@ module Hbc
             puts versioned_staged_path.to_s
               .concat(" (")
               .concat(versioned_staged_path.exist? ? versioned_staged_path.abv : Formatter.error("does not exist"))
-              .concat(")")
+                                      .concat(")")
           end
         else
           puts "Not installed"
@@ -49,7 +49,7 @@ module Hbc
       end
 
       def self.name_info(cask)
-        ohai cask.name.size > 1 ? "Names" : "Name"
+        ohai((cask.name.size > 1) ? "Names" : "Name")
         puts cask.name.empty? ? Formatter.error("None") : cask.name
       end
 
@@ -69,7 +69,7 @@ module Hbc
         DSL::ORDINARY_ARTIFACT_TYPES.each do |type|
           next if cask.artifacts[type].empty?
           cask.artifacts[type].each do |artifact|
-            activatable_item = type == :stage_only ? "<none>" : artifact.first
+            activatable_item = (type == :stage_only) ? "<none>" : artifact.first
             puts "#{activatable_item} (#{type})"
           end
         end

Library/Homebrew/cask/lib/hbc/cli/install.rb

@@ -24,7 +24,7 @@ module Hbc
           begin
             cask = CaskLoader.load(cask_token)
             Installer.new(cask, binaries:       binaries?,
-            verbose: verbose?,
+                                verbose: verbose?,
                                 force:          force?,
                                 skip_cask_deps: skip_cask_deps?,
                                 require_sha:    require_sha?).install

Library/Homebrew/cask/lib/hbc/cli/internal_appcast_checkpoint.rb

@@ -43,7 +43,7 @@ module Hbc
             if checkpoint.nil?
               onoe "Could not retrieve `appcast` checkpoint for cask '#{cask}': #{result[:command_result].stderr}"
             else
-              puts cask_tokens.count > 1 ? "#{checkpoint}  #{cask}": checkpoint
+              puts((cask_tokens.count > 1) ? "#{checkpoint}  #{cask}": checkpoint)
               count += 1
             end
           end

Library/Homebrew/cask/lib/hbc/cli/list.rb

@@ -12,7 +12,7 @@ module Hbc
       def run
         retval = args.any? ? list : list_installed
         # retval is ternary: true/false/nil
-        if retval.nil? && !args.any?
+        if retval.nil? && args.none?
           opoo "nothing to list" # special case: avoid exit code
         elsif retval.nil?
           raise CaskError, "nothing to list"

Library/Homebrew/cask/lib/hbc/cli/style.rb

@@ -11,7 +11,8 @@ module Hbc
 
       def run
         install_rubocop
-        system({ "XDG_CACHE_HOME" => HOMEBREW_CACHE }, "rubocop", *rubocop_args, "--", *cask_paths)
+        cache_env = { "XDG_CACHE_HOME" => "#{HOMEBREW_CACHE}/style" }
+        system(cache_env, "rubocop", *rubocop_args, "--", *cask_paths)
         raise CaskError, "style check failed" unless $CHILD_STATUS.success?
         true
       end

Library/Homebrew/cask/lib/hbc/container/dmg.rb

@@ -86,7 +86,7 @@ module Hbc
         Dir.chdir(mount) do
           Dir.glob("**/*", File::FNM_DOTMATCH).map do |path|
             next if skip_path?(Pathname(path))
-            path == "." ? path : path.prepend("./")
+            (path == ".") ? path : path.prepend("./")
           end.compact.join("\n").concat("\n")
         end
       end

Library/Homebrew/cask/lib/hbc/download_strategy.rb

@@ -212,7 +212,7 @@ module Hbc
   class SubversionDownloadStrategy < HbVCSDownloadStrategy
     def cache_tag
       # TODO: pass versions as symbols, support :head here
-      version == "head" ? "svn-HEAD" : "svn"
+      (version == "head") ? "svn-HEAD" : "svn"
     end
 
     def repo_valid?

Library/Homebrew/cask/lib/hbc/dsl.rb

@@ -119,9 +119,7 @@ module Hbc
     def language_eval
       return @language if instance_variable_defined?(:@language)
 
-      if @language_blocks.nil? || @language_blocks.empty?
-        return @language = nil
-      end
+      return @language = nil if @language_blocks.nil? || @language_blocks.empty?
 
       MacOS.languages.map(&Locale.method(:parse)).each do |locale|
         key = @language_blocks.keys.detect do |strings|

Library/Homebrew/cask/lib/hbc/exceptions.rb

@@ -113,7 +113,7 @@ module Hbc
     end
 
     def to_s
-      "Cask '#{token}' definition is invalid" + (!submsg.empty? ? ": #{submsg}" : "")
+      "Cask '#{token}' definition is invalid#{": #{submsg}" unless submsg.empty?}"
     end
   end