From e5b3b7e32639d6629d26235d6bd944d2b22c87e8 Mon Sep 17 00:00:00 2001
From: Jan Viljanen <527069+javian@users.noreply.github.com>
Date: Sun, 30 Sep 2018 15:35:49 +0200
Subject: [PATCH] further updates

---
 Library/Homebrew/.rubocop.yml           |   5 +-
 Library/Homebrew/.rubocop_todo.yml      | 141 ------------------------
 Library/Homebrew/test/.rubocop.yml      |   5 +
 Library/Homebrew/test/.rubocop_todo.yml | 127 +++++++++++++++++++++
 4 files changed, 134 insertions(+), 144 deletions(-)
 delete mode 100644 Library/Homebrew/.rubocop_todo.yml
 create mode 100644 Library/Homebrew/test/.rubocop.yml
 create mode 100644 Library/Homebrew/test/.rubocop_todo.yml

diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index 85e0c1dbb3..5015afdefb 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -1,8 +1,5 @@
-require: rubocop-rspec
-
 inherit_from:
   - ../.rubocop.yml
-  - .rubocop_todo.yml
 
 AllCops:
   Include:
@@ -12,6 +9,8 @@ AllCops:
     - 'bin/*'
     - '**/Casks/**/*'
     - '**/vendor/**/*'
+    - 'extend/**/*_spec.rb'
+    - 'software_spec.rb'
 
 # make rspec formatting more flexible
 Layout/MultilineMethodCallIndentation:
diff --git a/Library/Homebrew/.rubocop_todo.yml b/Library/Homebrew/.rubocop_todo.yml
deleted file mode 100644
index ac9e850a82..0000000000
--- a/Library/Homebrew/.rubocop_todo.yml
+++ /dev/null
@@ -1,141 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-09-20 09:03:52 +0100 using RuboCop version 0.59.1.
-# 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: 1
-# Cop supports --auto-correct.
-Layout/LeadingCommentSpace:
-  Exclude:
-    - 'style.rb'
-
-# Offense count: 27
-RSpec/AnyInstance:
-  Exclude:
-    - 'test/cask/cmd/create_spec.rb'
-    - 'test/cask/cmd/edit_spec.rb'
-    - 'test/cask/cmd/outdated_spec.rb'
-    - 'test/cask/cmd/upgrade_spec.rb'
-    - 'test/caveats_spec.rb'
-    - 'test/cleanup_spec.rb'
-    - 'test/download_strategies_spec.rb'
-    - 'test/formatter_spec.rb'
-    - 'test/os/linux/dependency_collector_spec.rb'
-    - 'test/utils/analytics_spec.rb'
-    - 'test/utils/git_spec.rb'
-
-# Offense count: 139
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Enabled: false
-
-# Offense count: 69
-RSpec/DescribeClass:
-  Enabled: false
-
-# Offense count: 573
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Max: 133
-
-# Offense count: 16
-RSpec/ExpectActual:
-  Exclude:
-    - 'spec/routing/**/*'
-    - 'test/missing_formula_spec.rb'
-
-# Offense count: 21
-RSpec/ExpectInHook:
-  Exclude:
-    - 'test/cache_store_spec.rb'
-    - 'test/cask/audit_spec.rb'
-    - 'test/cmd/reinstall_spec.rb'
-    - 'test/download_strategies_spec.rb'
-    - 'test/linkage_cache_store_spec.rb'
-    - 'test/migrator_spec.rb'
-    - 'test/os/mac/java_requirement_spec.rb'
-
-# Offense count: 32
-# Configuration parameters: CustomTransform, IgnoreMethods.
-RSpec/FilePath:
-  Enabled: false
-
-# Offense count: 6
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
-  Exclude:
-    - 'test/download_strategies_spec.rb'
-    - 'test/support/helper/spec/shared_context/integration_test.rb'
-    - 'test/utils/git_spec.rb'
-    - 'test/version_spec.rb'
-
-# Offense count: 113
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  Enabled: false
-
-# Offense count: 1
-RSpec/MissingExampleGroupArgument:
-  Exclude:
-    - 'test/cask/depends_on_spec.rb'
-
-# Offense count: 23
-RSpec/MultipleDescribes:
-  Enabled: false
-
-# Offense count: 544
-# Configuration parameters: AggregateFailuresByDefault.
-RSpec/MultipleExpectations:
-  Max: 26
-
-# Offense count: 929
-RSpec/NamedSubject:
-  Enabled: false
-
-# Offense count: 99
-RSpec/NestedGroups:
-  Max: 5
-
-# Offense count: 11
-RSpec/RepeatedDescription:
-  Exclude:
-    - 'test/inreplace_spec.rb'
-    - 'test/migrator_spec.rb'
-    - 'test/rubocops/dependency_order_cop_spec.rb'
-    - 'test/rubocops/lines_cop_spec.rb'
-    - 'test/tab_spec.rb'
-
-# Offense count: 10
-RSpec/RepeatedExample:
-  Exclude:
-    - 'test/compiler_selector_spec.rb'
-    - 'test/utils/shell_spec.rb'
-
-# Offense count: 31
-RSpec/SubjectStub:
-  Exclude:
-    - 'test/cache_store_spec.rb'
-    - 'test/cmd/update-report/reporter_spec.rb'
-    - 'test/download_strategies_spec.rb'
-    - 'test/formula_installer_spec.rb'
-    - 'test/java_requirement_spec.rb'
-    - 'test/language/python_spec.rb'
-    - 'test/os/mac/java_requirement_spec.rb'
-
-# Offense count: 64
-# Configuration parameters: IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty, nil, both
-Style/EmptyElse:
-  Exclude:
-    - 'style.rb'
diff --git a/Library/Homebrew/test/.rubocop.yml b/Library/Homebrew/test/.rubocop.yml
new file mode 100644
index 0000000000..5eeb756a13
--- /dev/null
+++ b/Library/Homebrew/test/.rubocop.yml
@@ -0,0 +1,5 @@
+inherit_from: 
+  - ../.rubocop.yml
+  - .rubocop_todo.yml
+
+require: rubocop-rspec
diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml
new file mode 100644
index 0000000000..bd00412da3
--- /dev/null
+++ b/Library/Homebrew/test/.rubocop_todo.yml
@@ -0,0 +1,127 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-09-30 14:57:59 +0200 using RuboCop version 0.59.2.
+# 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: 27
+RSpec/AnyInstance:
+  Exclude:
+    - 'cask/cmd/create_spec.rb'
+    - 'cask/cmd/edit_spec.rb'
+    - 'cask/cmd/outdated_spec.rb'
+    - 'cask/cmd/upgrade_spec.rb'
+    - 'caveats_spec.rb'
+    - 'cleanup_spec.rb'
+    - 'download_strategies_spec.rb'
+    - 'formatter_spec.rb'
+    - 'os/linux/dependency_collector_spec.rb'
+    - 'utils/analytics_spec.rb'
+    - 'utils/git_spec.rb'
+
+# Offense count: 139
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Enabled: false
+
+# Offense count: 69
+RSpec/DescribeClass:
+  Enabled: false
+
+# Offense count: 573
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Enabled: false
+
+# Offense count: 16
+RSpec/ExpectActual:
+  Exclude:
+    - 'spec/routing/**/*'
+    - 'missing_formula_spec.rb'
+
+# Offense count: 21
+RSpec/ExpectInHook:
+  Exclude:
+    - 'cache_store_spec.rb'
+    - 'cask/audit_spec.rb'
+    - 'cmd/reinstall_spec.rb'
+    - 'download_strategies_spec.rb'
+    - 'linkage_cache_store_spec.rb'
+    - 'migrator_spec.rb'
+    - 'os/mac/java_requirement_spec.rb'
+
+# Offense count: 31
+# Configuration parameters: CustomTransform, IgnoreMethods.
+RSpec/FilePath:
+  Enabled: false
+
+# Offense count: 6
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'download_strategies_spec.rb'
+    - 'support/helper/spec/shared_context/integration_test.rb'
+    - 'utils/git_spec.rb'
+    - 'version_spec.rb'
+
+# Offense count: 116
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Enabled: false
+
+# Offense count: 1
+RSpec/MissingExampleGroupArgument:
+  Exclude:
+    - 'cask/depends_on_spec.rb'
+
+# Offense count: 24
+RSpec/MultipleDescribes:
+  Enabled: false
+
+# Offense count: 544
+# Configuration parameters: AggregateFailuresByDefault.
+RSpec/MultipleExpectations:
+  Max: 26
+
+# Offense count: 936
+RSpec/NamedSubject:
+  Enabled: false
+
+# Offense count: 99
+RSpec/NestedGroups:
+  Max: 5
+
+# Offense count: 11
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'inreplace_spec.rb'
+    - 'migrator_spec.rb'
+    - 'rubocops/dependency_order_cop_spec.rb'
+    - 'rubocops/lines_cop_spec.rb'
+    - 'tab_spec.rb'
+
+# Offense count: 10
+RSpec/RepeatedExample:
+  Exclude:
+    - 'compiler_selector_spec.rb'
+    - 'utils/shell_spec.rb'
+
+# Offense count: 31
+RSpec/SubjectStub:
+  Exclude:
+    - 'cache_store_spec.rb'
+    - 'cmd/update-report/reporter_spec.rb'
+    - 'download_strategies_spec.rb'
+    - 'formula_installer_spec.rb'
+    - 'java_requirement_spec.rb'
+    - 'language/python_spec.rb'
+    - 'os/mac/java_requirement_spec.rb'
+
+# Offense count: 64
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Enabled: false