Various cleanups

.rubocop.yml

@@ -16,12 +16,25 @@ Bundler/OrderedGems:
   Exclude:
     - 'gemfiles/*.gemfile'
 
+# Assume the programmer knows how bracketed block syntax works
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+# Assume the programmer knows precendence rules
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+
 # Spec blocks can be any size
 Metrics/BlockLength:
   Exclude:
     - '**/*.gemspec'
     - 'spec/**/*'
 
+# This cop does not work properly with predicates that take arguments.
+# TODO: Re-enable once https://github.com/rubocop/rubocop-rspec/issues/466 is resolved.
+RSpec/PredicateMatcher:
+  Enabled: false
+
 # Use older RuboCop default
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:

.rubocop_todo.yml

@@ -1,38 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.12.1.
+# using RuboCop version 1.21.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.
 
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'fixtures/cli-app/cli-app.gemspec'
-    - 'fixtures/empty-app/cli-app.gemspec'
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'lib/aruba/platforms/announcer.rb'
-
-# Configuration parameters: AllowComments.
-Lint/EmptyClass:
-  Exclude:
-    - 'spec/event_bus_spec.rb'
-
-Lint/MissingSuper:
-  Exclude:
-    - 'lib/aruba/contracts/enum.rb'
-    - 'lib/aruba/matchers/collection/include_an_object.rb'
-
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
-Lint/Void:
-  Exclude:
-    - 'lib/aruba/platforms/announcer.rb'
-    - 'lib/aruba/platforms/unix_environment_variables.rb'
-
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 118
@@ -56,16 +29,12 @@ Metrics/MethodLength:
 
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 198
+  Max: 192
 
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 14
 
-Naming/ConstantName:
-  Exclude:
-    - 'lib/aruba/platform.rb'
-
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -109,32 +78,30 @@ RSpec/ContextWording:
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
     - 'spec/aruba/api/runtime_spec.rb'
     - 'spec/aruba/jruby_spec.rb'
-    - 'spec/aruba/matchers/collection_spec.rb'
     - 'spec/aruba/matchers/command/have_output_size_spec.rb'
     - 'spec/aruba/matchers/command_spec.rb'
     - 'spec/aruba/matchers/directory_spec.rb'
     - 'spec/aruba/matchers/file_spec.rb'
     - 'spec/aruba/matchers/path_spec.rb'
     - 'spec/aruba/platform/simple_table_spec.rb'
 
-# Configuration parameters: Max.
+# Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/aruba/api/core_spec.rb'
-    - 'spec/aruba/api/filesystem_spec.rb'
-    - 'spec/aruba/aruba_path_spec.rb'
-    - 'spec/aruba/matchers/collection_spec.rb'
+  Max: 13
 
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/aruba/platform/windows_environment_variables_spec.rb'
     - 'spec/aruba/platforms/command_monitor_spec.rb'
-    - 'spec/event_bus/name_resolver_spec.rb'
-    - 'spec/event_bus_spec.rb'
 
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -144,6 +111,7 @@ RSpec/InstanceVariable:
     - 'spec/aruba/api/core_spec.rb'
     - 'spec/aruba/api/filesystem_spec.rb'
     - 'spec/aruba/api_spec.rb'
+    - 'spec/aruba/event_bus_spec.rb'
     - 'spec/aruba/matchers/command/have_output_size_spec.rb'
     - 'spec/aruba/matchers/command_spec.rb'
     - 'spec/aruba/matchers/directory_spec.rb'
@@ -152,7 +120,6 @@ RSpec/InstanceVariable:
     - 'spec/aruba/processes/in_process_spec.rb'
     - 'spec/aruba/processes/spawn_process_spec.rb'
     - 'spec/aruba/runtime_spec.rb'
-    - 'spec/event_bus_spec.rb'
     - 'spec/support/shared_contexts/aruba.rb'
 
 RSpec/MultipleExpectations:
@@ -169,12 +136,6 @@ Security/Open:
   Exclude:
     - 'lib/aruba/processes/spawn_process.rb'
 
-# Cop supports --auto-correct.
-# Configuration parameters: AllowOnConstant.
-Style/CaseEquality:
-  Exclude:
-    - 'lib/aruba/matchers/base/object_formatter.rb'
-
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -184,7 +145,6 @@ Style/Documentation:
     - 'fixtures/cli-app/lib/cli/app/suppress_simple_cov_output.rb'
     - 'fixtures/empty-app/lib/cli/app.rb'
     - 'lib/aruba/api/bundler.rb'
-    - 'lib/aruba/matchers/collection/include_an_object.rb'
     - 'lib/aruba/platforms/command_monitor.rb'
     - 'lib/aruba/setup.rb'
 

Manifest.txt

@@ -37,12 +37,7 @@ lib/aruba/generators/script_file.rb
 lib/aruba/hooks.rb
 lib/aruba/in_config_wrapper.rb
 lib/aruba/initializer.rb
-lib/aruba/matchers/base/base_matcher.rb
 lib/aruba/matchers/base/message_indenter.rb
-lib/aruba/matchers/base/object_formatter.rb
-lib/aruba/matchers/collection.rb
-lib/aruba/matchers/collection/all.rb
-lib/aruba/matchers/collection/include_an_object.rb
 lib/aruba/matchers/command.rb
 lib/aruba/matchers/command/be_successfully_executed.rb
 lib/aruba/matchers/command/have_exit_status.rb