Use separate `.rubocop.yml` in `Library/Taps` and `Library/Homebrew`.

6 files changed, 222 insertions, 234 deletions

diff --git a/Library/.rubocop_common.yml b/Library/.rubocop.yml
index 3563acf1f..3563acf1f 100644
--- a/Library/.rubocop_common.yml
+++ b/Library/.rubocop.yml
diff --git a/Library/.rubocop_formula.yml b/Library/.rubocop_formula.yml
deleted file mode 100644
index d763bb460..000000000
--- a/Library/.rubocop_formula.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit_from:
-  - .rubocop_common.yml
-
-# counterproductive in formulas, notably within the install method
-Style/GuardClause:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false
-
-# depends_on foo: :bar looks rubbish
-Style/HashSyntax:
-  Enabled: false
diff --git a/Library/.rubocop_todo.yml b/Library/.rubocop_todo.yml
deleted file mode 100644
index b4ed8bb46..000000000
--- a/Library/.rubocop_todo.yml
+++ /dev/null
@@ -1,211 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config --exclude-limit 100`
-# on 2016-09-27 18:48:13 +0200 using RuboCop version 0.43.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 16
-Lint/HandleExceptions:
-  Exclude:
-    - 'Homebrew/cmd/install.rb'
-    - 'Homebrew/cmd/reinstall.rb'
-    - 'Homebrew/cmd/tap.rb'
-    - 'Homebrew/cmd/update-report.rb'
-    - 'Homebrew/cmd/upgrade.rb'
-    - 'Homebrew/cmd/uses.rb'
-    - 'Homebrew/descriptions.rb'
-    - 'Homebrew/diagnostic.rb'
-    - 'Homebrew/extend/ENV/super.rb'
-    - 'Homebrew/extend/pathname.rb'
-    - 'Homebrew/formula.rb'
-    - 'Homebrew/formula_versions.rb'
-    - 'Homebrew/test/test_ENV.rb'
-
-# Offense count: 3
-Lint/IneffectiveAccessModifier:
-  Exclude:
-    - 'Homebrew/formula.rb'
-    - 'Homebrew/version.rb'
-
-# Offense count: 1
-Lint/Loop:
-  Exclude:
-    - 'Homebrew/patch.rb'
-
-# Offense count: 28
-Lint/RescueException:
-  Exclude:
-    - 'Homebrew/brew.rb'
-    - 'Homebrew/build.rb'
-    - 'Homebrew/cmd/fetch.rb'
-    - 'Homebrew/cmd/reinstall.rb'
-    - 'Homebrew/cmd/update-report.rb'
-    - 'Homebrew/debrew.rb'
-    - 'Homebrew/dev-cmd/pull.rb'
-    - 'Homebrew/dev-cmd/test.rb'
-    - 'Homebrew/formula.rb'
-    - 'Homebrew/formula_installer.rb'
-    - 'Homebrew/migrator.rb'
-    - 'Homebrew/postinstall.rb'
-    - 'Homebrew/readall.rb'
-    - 'Homebrew/test.rb'
-    - 'Homebrew/test/test_ENV.rb'
-    - 'Homebrew/utils/fork.rb'
-
-# Offense count: 1
-Lint/ShadowedException:
-  Exclude:
-    - 'Homebrew/utils/fork.rb'
-
-# Offense count: 14
-Metrics/BlockNesting:
-  Max: 5
-
-# Offense count: 19
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 367
-
-# Offense count: 2
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 6
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: percent_q, bare_percent
-Style/BarePercentLiterals:
-  Exclude:
-    - 'Homebrew/dev-cmd/audit.rb'
-    - 'Homebrew/test/test_diagnostic.rb'
-    - 'Homebrew/test/test_exceptions.rb'
-    - 'Homebrew/test/test_patch.rb'
-    - 'Homebrew/test/test_string.rb'
-
-# Offense count: 134
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'Homebrew/caveats.rb'
-    - 'Homebrew/cleaner.rb'
-    - 'Homebrew/cleanup.rb'
-    - 'Homebrew/cmd/deps.rb'
-    - 'Homebrew/cmd/desc.rb'
-    - 'Homebrew/cmd/fetch.rb'
-    - 'Homebrew/cmd/help.rb'
-    - 'Homebrew/cmd/info.rb'
-    - 'Homebrew/cmd/linkapps.rb'
-    - 'Homebrew/cmd/list.rb'
-    - 'Homebrew/cmd/outdated.rb'
-    - 'Homebrew/cmd/reinstall.rb'
-    - 'Homebrew/cmd/search.rb'
-    - 'Homebrew/cmd/tap-info.rb'
-    - 'Homebrew/cmd/unlinkapps.rb'
-    - 'Homebrew/cmd/update-report.rb'
-    - 'Homebrew/cmd/upgrade.rb'
-    - 'Homebrew/cmd/uses.rb'
-    - 'Homebrew/compilers.rb'
-    - 'Homebrew/debrew.rb'
-    - 'Homebrew/descriptions.rb'
-    - 'Homebrew/dev-cmd/aspell-dictionaries.rb'
-    - 'Homebrew/dev-cmd/audit.rb'
-    - 'Homebrew/dev-cmd/bottle.rb'
-    - 'Homebrew/dev-cmd/edit.rb'
-    - 'Homebrew/dev-cmd/man.rb'
-    - 'Homebrew/diagnostic.rb'
-    - 'Homebrew/exceptions.rb'
-    - 'Homebrew/extend/ARGV.rb'
-    - 'Homebrew/extend/ENV/shared.rb'
-    - 'Homebrew/extend/ENV/std.rb'
-    - 'Homebrew/extend/fileutils.rb'
-    - 'Homebrew/extend/os/mac/formula_cellar_checks.rb'
-    - 'Homebrew/extend/pathname.rb'
-    - 'Homebrew/formula.rb'
-    - 'Homebrew/formula_assertions.rb'
-    - 'Homebrew/formula_cellar_checks.rb'
-    - 'Homebrew/formula_installer.rb'
-    - 'Homebrew/formulary.rb'
-    - 'Homebrew/global.rb'
-    - 'Homebrew/keg.rb'
-    - 'Homebrew/language/haskell.rb'
-    - 'Homebrew/language/node.rb'
-    - 'Homebrew/language/python.rb'
-    - 'Homebrew/migrator.rb'
-    - 'Homebrew/os/mac/linkage_checker.rb'
-    - 'Homebrew/os/mac/xquartz.rb'
-    - 'Homebrew/patch.rb'
-    - 'Homebrew/readall.rb'
-    - 'Homebrew/software_spec.rb'
-    - 'Homebrew/tap.rb'
-    - 'Homebrew/test/lib/config.rb'
-    - 'Homebrew/test/test_ARGV.rb'
-    - 'Homebrew/test/test_cleanup.rb'
-    - 'Homebrew/test/test_dependency_collector.rb'
-    - 'Homebrew/test/test_formula_installer.rb'
-    - 'Homebrew/test/test_formula_installer_bottle.rb'
-    - 'Homebrew/test/test_formulary.rb'
-    - 'Homebrew/test/test_gpg.rb'
-    - 'Homebrew/test/test_migrator.rb'
-    - 'Homebrew/test/test_pathname.rb'
-    - 'Homebrew/test/test_tap.rb'
-    - 'Homebrew/test/test_utils.rb'
-    - 'Homebrew/test/testing_env.rb'
-    - 'Homebrew/utils.rb'
-    - 'Homebrew/utils/github.rb'
-
-# Offense count: 7
-Style/ClassVars:
-  Exclude:
-    - 'Homebrew/dev-cmd/audit.rb'
-    - 'Homebrew/formula_installer.rb'
-    - 'Homebrew/test/testing_env.rb'
-    - 'Homebrew/utils.rb'
-
-# Offense count: 13
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'Homebrew/diagnostic.rb'
-    - 'Homebrew/utils.rb'
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: module_function, extend_self
-Style/ModuleFunction:
-  Exclude:
-    - 'Homebrew/global.rb'
-    - 'Homebrew/os/mac/xcode.rb'
-
-# Offense count: 8
-Style/MultilineBlockChain:
-  Exclude:
-    - 'Homebrew/cmd/search.rb'
-    - 'Homebrew/dev-cmd/aspell-dictionaries.rb'
-    - 'Homebrew/dev-cmd/audit.rb'
-    - 'Homebrew/dev-cmd/man.rb'
-    - 'Homebrew/diagnostic.rb'
-    - 'Homebrew/test/test_patching.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/MutableConstant:
-  Exclude:
-    - 'Homebrew/dependency_collector.rb'
-    - 'Homebrew/formulary.rb'
-    - 'Homebrew/tab.rb'
-    - 'Homebrew/tap.rb'
-
-# Offense count: 8
-Style/OpMethod:
-  Exclude:
-    - 'Homebrew/dependencies.rb'
-    - 'Homebrew/install_renamed.rb'
-    - 'Homebrew/options.rb'
diff --git a/Library/.rubocop_core.yml b/Library/Homebrew/.rubocop.yml
index c4dd9c597..f4f80800a 100644
--- a/Library/.rubocop_core.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -1,25 +1,25 @@
 inherit_from:
-  - .rubocop_common.yml
+  - ../.rubocop.yml
   - .rubocop_todo.yml
 
 AllCops:
   Include:
     - '**/.simplecov'
   Exclude:
-    - 'Homebrew/cask/**/*'
-    - 'Homebrew/**/vendor/**/*'
+    - 'cask/**/*'
+    - '**/vendor/**/*'
 
 # `formula do` uses nested method definitions
 Lint/NestedMethodDefinition:
   Exclude:
-    - 'Homebrew/test/**/*'
+    - 'test/**/*'
 
 Metrics/ModuleLength:
   CountComments: false
   Exclude:
-    - 'Homebrew/cask/lib/hbc/locations.rb'
-    - 'Homebrew/cask/lib/hbc/macos.rb'
-    - 'Homebrew/cask/lib/hbc/utils.rb'
+    - 'cask/lib/hbc/locations.rb'
+    - 'cask/lib/hbc/macos.rb'
+    - 'cask/lib/hbc/utils.rb'
 
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
@@ -102,11 +102,11 @@ Style/HashSyntax:
 # we won't change backward compatible method names
 Style/MethodName:
   Exclude:
-    - 'Homebrew/compat/**/*'
+    - 'compat/**/*'
 
 # we won't change backward compatible predicate names
 Style/PredicateName:
   Exclude:
-    - 'Homebrew/compat/**/*'
+    - 'compat/**/*'
   NameWhitelist: is_32_bit?, is_64_bit?
 
diff --git a/Library/Homebrew/.rubocop_todo.yml b/Library/Homebrew/.rubocop_todo.yml
new file mode 100644
index 000000000..4c6a4bbc5
--- /dev/null
+++ b/Library/Homebrew/.rubocop_todo.yml
@@ -0,0 +1,211 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 100`
+# on 2016-09-28 22:26:33 +0200 using RuboCop version 0.43.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 16
+Lint/HandleExceptions:
+  Exclude:
+    - 'cmd/install.rb'
+    - 'cmd/reinstall.rb'
+    - 'cmd/tap.rb'
+    - 'cmd/update-report.rb'
+    - 'cmd/upgrade.rb'
+    - 'cmd/uses.rb'
+    - 'descriptions.rb'
+    - 'diagnostic.rb'
+    - 'extend/ENV/super.rb'
+    - 'extend/pathname.rb'
+    - 'formula.rb'
+    - 'formula_versions.rb'
+    - 'test/test_ENV.rb'
+
+# Offense count: 3
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'formula.rb'
+    - 'version.rb'
+
+# Offense count: 1
+Lint/Loop:
+  Exclude:
+    - 'patch.rb'
+
+# Offense count: 28
+Lint/RescueException:
+  Exclude:
+    - 'brew.rb'
+    - 'build.rb'
+    - 'cmd/fetch.rb'
+    - 'cmd/reinstall.rb'
+    - 'cmd/update-report.rb'
+    - 'debrew.rb'
+    - 'dev-cmd/pull.rb'
+    - 'dev-cmd/test.rb'
+    - 'formula.rb'
+    - 'formula_installer.rb'
+    - 'migrator.rb'
+    - 'postinstall.rb'
+    - 'readall.rb'
+    - 'test.rb'
+    - 'test/test_ENV.rb'
+    - 'utils/fork.rb'
+
+# Offense count: 1
+Lint/ShadowedException:
+  Exclude:
+    - 'utils/fork.rb'
+
+# Offense count: 14
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 19
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 366
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: percent_q, bare_percent
+Style/BarePercentLiterals:
+  Exclude:
+    - 'dev-cmd/audit.rb'
+    - 'test/test_diagnostic.rb'
+    - 'test/test_exceptions.rb'
+    - 'test/test_patch.rb'
+    - 'test/test_string.rb'
+
+# Offense count: 134
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'caveats.rb'
+    - 'cleaner.rb'
+    - 'cleanup.rb'
+    - 'cmd/deps.rb'
+    - 'cmd/desc.rb'
+    - 'cmd/fetch.rb'
+    - 'cmd/help.rb'
+    - 'cmd/info.rb'
+    - 'cmd/linkapps.rb'
+    - 'cmd/list.rb'
+    - 'cmd/outdated.rb'
+    - 'cmd/reinstall.rb'
+    - 'cmd/search.rb'
+    - 'cmd/tap-info.rb'
+    - 'cmd/unlinkapps.rb'
+    - 'cmd/update-report.rb'
+    - 'cmd/upgrade.rb'
+    - 'cmd/uses.rb'
+    - 'compilers.rb'
+    - 'debrew.rb'
+    - 'descriptions.rb'
+    - 'dev-cmd/aspell-dictionaries.rb'
+    - 'dev-cmd/audit.rb'
+    - 'dev-cmd/bottle.rb'
+    - 'dev-cmd/edit.rb'
+    - 'dev-cmd/man.rb'
+    - 'diagnostic.rb'
+    - 'exceptions.rb'
+    - 'extend/ARGV.rb'
+    - 'extend/ENV/shared.rb'
+    - 'extend/ENV/std.rb'
+    - 'extend/fileutils.rb'
+    - 'extend/os/mac/formula_cellar_checks.rb'
+    - 'extend/pathname.rb'
+    - 'formula.rb'
+    - 'formula_assertions.rb'
+    - 'formula_cellar_checks.rb'
+    - 'formula_installer.rb'
+    - 'formulary.rb'
+    - 'global.rb'
+    - 'keg.rb'
+    - 'language/haskell.rb'
+    - 'language/node.rb'
+    - 'language/python.rb'
+    - 'migrator.rb'
+    - 'os/mac/linkage_checker.rb'
+    - 'os/mac/xquartz.rb'
+    - 'patch.rb'
+    - 'readall.rb'
+    - 'software_spec.rb'
+    - 'tap.rb'
+    - 'test/lib/config.rb'
+    - 'test/test_ARGV.rb'
+    - 'test/test_cleanup.rb'
+    - 'test/test_dependency_collector.rb'
+    - 'test/test_formula_installer.rb'
+    - 'test/test_formula_installer_bottle.rb'
+    - 'test/test_formulary.rb'
+    - 'test/test_gpg.rb'
+    - 'test/test_migrator.rb'
+    - 'test/test_pathname.rb'
+    - 'test/test_tap.rb'
+    - 'test/test_utils.rb'
+    - 'test/testing_env.rb'
+    - 'utils.rb'
+    - 'utils/github.rb'
+
+# Offense count: 7
+Style/ClassVars:
+  Exclude:
+    - 'dev-cmd/audit.rb'
+    - 'formula_installer.rb'
+    - 'test/testing_env.rb'
+    - 'utils.rb'
+
+# Offense count: 13
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'diagnostic.rb'
+    - 'utils.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: module_function, extend_self
+Style/ModuleFunction:
+  Exclude:
+    - 'global.rb'
+    - 'os/mac/xcode.rb'
+
+# Offense count: 8
+Style/MultilineBlockChain:
+  Exclude:
+    - 'cmd/search.rb'
+    - 'dev-cmd/aspell-dictionaries.rb'
+    - 'dev-cmd/audit.rb'
+    - 'dev-cmd/man.rb'
+    - 'diagnostic.rb'
+    - 'test/test_patching.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'dependency_collector.rb'
+    - 'formulary.rb'
+    - 'tab.rb'
+    - 'tap.rb'
+
+# Offense count: 8
+Style/OpMethod:
+  Exclude:
+    - 'dependencies.rb'
+    - 'install_renamed.rb'
+    - 'options.rb'
diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
index 1a4b02277..d396f81ee 100644
--- a/Library/Homebrew/cmd/style.rb
+++ b/Library/Homebrew/cmd/style.rb
@@ -53,10 +53,10 @@ module Homebrew
     args << "--auto-correct" if fix
 
     if files.nil?
-      args << "--config" << HOMEBREW_LIBRARY/".rubocop_core.yml"
+      args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml"
       args += [HOMEBREW_LIBRARY_PATH]
     else
-      args << "--config" << HOMEBREW_LIBRARY/".rubocop_formula.yml"
+      args << "--config" << HOMEBREW_LIBRARY/"Taps/.rubocop.yml"
       args += files
     end