salsify_rubocop 0.91.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7075a3184d398f5ed45dc726da7a289323eb1839dd7ecb78fe614b242b6798f
-  data.tar.gz: 70c2dfb69a48fa75e58a218e8cea848fc477dfbfd22fc50adefbac86589132f3
+  metadata.gz: 2056598e677c6cf0b213308613d5ab676b7eee1e97dd93534321a75ba341e2b9
+  data.tar.gz: f0053c47716a510ef4ef57c5e90465e2309a0573ab5944d92b23a42cd154ab2c
 SHA512:
-  metadata.gz: ddcd5e8975a9d35a5b5efe66e5e90d1ca4645aebca2d6b70e8084c6dda8fac05b36c27f557aebdc45fabe6458215a6bab4c06dc4acd8935a02017dc22a2131cb
-  data.tar.gz: 33e382909c34f89e5ba8f14ea1a03bb443df82fad6d2e80905d1faf7ef8950692a85e768dfa2a8bcc8bc7ef7ceac21e500c00675939ff481a5ed31dc8751f158
+  metadata.gz: fe21f0ff75e19ef071efe283cce27a01cde095fe4918d3ef7eb10bddff6d9ca476b8b4a4263b92f871c55ec7434283b9a6812400e546012c8c3d11cb0d280b73
+  data.tar.gz: 339fc5ad332c3602d2d73106f76c6d26fc9103c398b6bee9059971b1ac97dcbbe930b7ce731d21cda5794d9fdd53f04454d6c203ba8ffe6e7dc6b67695971062

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # salsify_rubocop
 
+## 1.0.0
+
+- Upgrade to `rubocop` v1.0.0
+- Upgrade to `rubocop-rspec` v2.0.0
+
+## 0.93.1
+
+- Upgrade to `rubocop` v0.93.1
+- Add configuration for pending 1.0 cops
+
 ## 0.91.0
 
 - Upgrade to `rubocop` v0.91.0

data/conf/rubocop.yml

@@ -37,3 +37,6 @@ RSpec/NestedGroups:
 
 RSpec/ContextWording:
   Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/conf/rubocop_without_rspec.yml

@@ -1,4 +1,5 @@
 AllCops:
+  NewCops: disable
   DisplayCopNames: true
   Exclude:
     - 'bin/**/*'
@@ -196,3 +197,33 @@ Style/WordArray:
 
 Style/SymbolArray:
   EnforcedStyle: brackets
+
+Lint/HashCompareByIdentity:
+  Enabled: false
+
+Lint/IdentityComparison:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+
+Style/CombinableLoops:
+  Enabled: false
+
+Style/HashAsLastArrayItem:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Style/RedundantSelfAssignment:
+  Enabled: false
+
+Style/SingleArgumentDig:
+  Enabled: false

data/lib/rubocop/cop/salsify/rspec_doc_string.rb

@@ -19,7 +19,8 @@ module RuboCop
       #   it 'does something' do
       #     ...
       #   end
-      class RspecDocString < Cop
+      class RspecDocString < RuboCop::Cop::RSpec::Base
+        extend RuboCop::Cop::AutoCorrector
         include ConfigurableEnforcedStyle
 
         SINGLE_QUOTE_MSG =
@@ -27,37 +28,38 @@ module RuboCop
         DOUBLE_QUOTE_MSG =
           'Example Group/Example doc strings must be double-quoted.'
 
-        SHARED_EXAMPLES = RuboCop::RSpec::Language::SelectorSet.new(
-          [:include_examples, :it_behaves_like, :it_should_behave_like, :include_context]
-        ).freeze
 
-        DOCUMENTED_METHODS = (RuboCop::RSpec::Language::ExampleGroups::ALL +
-          RuboCop::RSpec::Language::Examples::ALL +
-          RuboCop::RSpec::Language::SharedGroups::ALL +
-          SHARED_EXAMPLES).freeze
+        DOCUMENTED_METHODS = RuboCop::ConfigLoader.default_configuration.for_department('RSpec')
+                               .fetch('Language')
+                               .values_at('ExampleGroups', 'Examples', 'SharedGroups', 'Includes')
+                               .flat_map { |element| element.values.flatten }
+                               .map(&:to_sym)
+
+        def_node_matcher :documented_method?,
+                         send_pattern(<<~PATTERN)
+                           {
+                             #ExampleGroups.all
+                             #Examples.all
+                             #SharedGroups.all
+                             #Includes.all
+                           }
+                         PATTERN
 
         def on_send(node)
-          _receiver, method_name, *args = *node
-          return unless DOCUMENTED_METHODS.include?(method_name) &&
-            !args.empty? && args.first.str_type?
+          _receiver, _method_name, *args = *node
+          return unless documented_method?(node) && args.first&.str_type?
 
           check_quotes(args.first)
         end
 
-        def autocorrect(node)
-          StringLiteralCorrector.correct(node, style)
-        end
-
         private
 
         def check_quotes(doc_node)
-          if wrong_quotes?(doc_node)
-            if style == :single_quotes
-              add_offense(doc_node, message: SINGLE_QUOTE_MSG)
-            else
-              add_offense(doc_node, message: DOUBLE_QUOTE_MSG)
-            end
-          end
+          return unless wrong_quotes?(doc_node)
+
+          add_offense(doc_node,
+                      message: style == :single_quotes ? SINGLE_QUOTE_MSG : DOUBLE_QUOTE_MSG,
+                      &StringLiteralCorrector.correct(doc_node, style))
         end
 
         def wrong_quotes?(node)

data/lib/rubocop/cop/salsify/rspec_dot_not_self_dot.rb

@@ -17,26 +17,25 @@ module RuboCop
       #   describe "self.does_stuff" do
       #     ...
       #   end
-      class RspecDotNotSelfDot < Cop
+      class RspecDotNotSelfDot < RuboCop::Cop::RSpec::Base
+        extend RuboCop::Cop::AutoCorrector
 
         SELF_DOT_REGEXP = /["']self\./.freeze
         MSG = 'Use ".<class method>" instead of "self.<class method>" for example group description.'
 
         def_node_matcher :example_group_match, <<-PATTERN
-          (send _ #{RuboCop::RSpec::Language::ExampleGroups::ALL.node_pattern_union} $_ ...)
+          (send _ #ExampleGroups.all $_ ...)
         PATTERN
 
         def on_send(node)
           example_group_match(node) do |doc|
-            add_offense(doc) if SELF_DOT_REGEXP.match?(doc.source)
-          end
-        end
+            next unless SELF_DOT_REGEXP.match?(doc.source)
 
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.remove(Parser::Source::Range.new(node.source_range.source_buffer,
-                                                       node.source_range.begin_pos + 1,
-                                                       node.source_range.begin_pos + 5))
+            add_offense(doc) do |corrector|
+              corrector.remove(Parser::Source::Range.new(doc.source_range.source_buffer,
+                                                         doc.source_range.begin_pos + 1,
+                                                         doc.source_range.begin_pos + 5))
+            end
           end
         end
       end

data/lib/salsify_rubocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SalsifyRubocop
-  VERSION = '0.91.0'
+  VERSION = '1.0.0'
 end

data/salsify_rubocop.gemspec

@@ -36,8 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_runtime_dependency 'rubocop', '~> 0.91.0'
+  spec.add_runtime_dependency 'rubocop', '~> 1.0.0'
   spec.add_runtime_dependency 'rubocop-performance', '~> 1.5.0'
   spec.add_runtime_dependency 'rubocop-rails', '~> 2.4.0'
-  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.37.0'
+  spec.add_runtime_dependency 'rubocop-rspec', '~> 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: 2.0.0
 description: Shared shared RuboCop configuration
 email:
 - engineering@salsify.com
@@ -138,7 +138,6 @@ files:
 - lib/rubocop/cop/salsify/rspec_dot_not_self_dot.rb
 - lib/rubocop/cop/salsify/rspec_string_literals.rb
 - lib/rubocop/cop/salsify/style_dig.rb
-- lib/rubocop/rspec/language/each_selector.rb
 - lib/salsify_rubocop.rb
 - lib/salsify_rubocop/version.rb
 - salsify_rubocop.gemspec
@@ -162,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Shared shared RuboCop configuration

data/lib/rubocop/rspec/language/each_selector.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey-patch SelectorSet to allow enumeration of selectors.
-
-module RuboCop
-  module RSpec
-    module Language
-      class SelectorSet
-        def each(&blk)
-          selectors.each(&blk)
-        end
-      end
-    end
-  end
-end