salsify_rubocop 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4488cacf9244dcc1eef749f7e8be0aec426462bbdd97bba63f2585d9e341fa
-  data.tar.gz: 7c804cbcb3576fd3ba2852a667f0db842eb5b2393a7e775101930488eb2b97d4
+  metadata.gz: 1a27b274167c99b0c602b8179de3b2cc833019ebcdb893278604a5259dc6b011
+  data.tar.gz: b15ac3e56b5ea6095f0dac07858e00aa55a22239dd86611ab97775cbee047d86
 SHA512:
-  metadata.gz: a19b74a0b2600a044f45ae9203a4115cf8dc66b8422c7cf3424d9028d81e273e9cd474dc2f518c5d1f6b39c48b8b95ffb28ec534f56ce14f5bf1ac8f4973689a
-  data.tar.gz: 30b89b5377a2a32895e26947cee22985a17221334519e26bf7e0e3b63e37becd2616c1856626350a5123d51958254beebb5fdde7e1fd1bb16f4d67d8c1bffef5
+  metadata.gz: c3709691e18170f955bc6825637234031dde141fa27a402ac4e3e64c904ee9a063c631587fd3b163a21e94a08a971e36be7d98600baebae8fd894e337c3de03e
+  data.tar.gz: 8adc382c5cb2ba0b196c12452591e5f42af2f7f687c1f2c71b43d62fdf9c47523572c3a535acb4fa7f42ee44af830c941b0bdeee34a82ce47cb8bae350ef0586

data/.circleci/config.yml

@@ -1,17 +1,15 @@
-version: 2
+version: 2.1
 jobs:
-  build:
+  lint:
     docker:
-      - image: salsify/ruby_ci:2.5.8
-    environment:
-      CIRCLE_TEST_REPORTS: "test-results"
+      - image: salsify/ruby_ci:2.6.6
     working_directory: ~/salsify_rubocop
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-2.5.8-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-2.5.8-
+            - v1-gems-ruby-2.6.6-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-2.6.6-
       - run:
           name: Install Gems
           command: |
@@ -20,15 +18,54 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-2.5.8-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-2.6.6-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
       - run:
           name: Run Rubocop
-          command: bundle exec rubocop
+          command: bundle exec rubocop --config .rubocop.yml
+  test:
+    parameters:
+      ruby_version:
+        type: string
+    docker:
+      - image: salsify/ruby_ci:<< parameters.ruby_version >>
+    environment:
+      CIRCLE_TEST_REPORTS: "test-results"
+    working_directory: ~/salsify_rubocop
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-<< parameters.ruby_version >>-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v1-gems-ruby-<< parameters.ruby_version >>-{{ checksum "salsify_rubocop.gemspec" }}-{{ checksum "Gemfile" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
       - run:
           name: Run Tests
           command: |
             bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
       - store_test_results:
           path: "test-results"
+workflows:
+  build:
+    jobs:
+      - lint
+      - test:
+          matrix:
+            parameters:
+              ruby_version:
+                - "2.6.6"
+                - "2.7.2"
+                - "3.0.0"

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jturkel @erikkessler1 @skarger

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from:
   - conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout/LineLength:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # salsify_rubocop
 
+## 1.2.0
+- Disable Style/ExplicitBlockArgument for performance reasons, https://github.com/JuanitoFatas/fast-ruby/blob/master/code/proc-and-block/proc-call-vs-yield.rb.
+
+## 1.1.0
+- Re-enable version specifier checks for the `Bundler/GemComment` cop, for limiting version specifiers only.
+- Upgrade to `rubocop` v1.13.0
+- Drop support for Ruby 2.5 now that's in EOL
+
+## 1.0.2
+- Disable version specifier checks for the `Bundler/GemComment` cop until https://github.com/rubocop/rubocop/pull/9358
+  is merged.
+
 ## 1.0.1
 - Configure file exclusions for `Rails/RakeEnvironment` and `Gemspec/RequiredRubyVersion`
 

data/conf/rubocop_without_rspec.yml

@@ -1,3 +1,7 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 AllCops:
   NewCops: disable
   DisplayCopNames: true
@@ -13,7 +17,7 @@ AllCops:
 Bundler/GemComment:
   Enabled: true
   OnlyFor:
-    - 'version_specifiers'
+    - 'restrictive_version_specificiers'
     - 'source'
     - 'git'
     - 'github'
@@ -74,6 +78,11 @@ Style/EmptyLiteral:
 Style/EmptyMethod:
   Enabled: false
 
+# Disabling due to performance implications.
+# https://github.com/JuanitoFatas/fast-ruby/blob/master/code/proc-and-block/proc-call-vs-yield.rb
+Style/ExplicitBlockArgument:
+  Enabled: false
+
 # The Exclude list is not additive. Projects that exclude file names will
 # need to re-add Appraisals.
 Naming/FileName:

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

@@ -57,9 +57,9 @@ module RuboCop
         def check_quotes(doc_node)
           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))
+          add_offense(doc_node, message: style == :single_quotes ? SINGLE_QUOTE_MSG : DOUBLE_QUOTE_MSG) do |corrector|
+            StringLiteralCorrector.correct(corrector, doc_node, style)
+          end
         end
 
         def wrong_quotes?(node)

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

@@ -11,7 +11,8 @@ module RuboCop
       # Used together with Salsify/RspecDocString it allows one quote style to
       # be used for doc strings (`describe "foobar"`) and another style to be
       # used for all other strings in specs.
-      class RspecStringLiterals < Cop
+      class RspecStringLiterals < RuboCop::Cop::RSpec::Base
+        extend RuboCop::Cop::AutoCorrector
         include ConfigurableEnforcedStyle
         include StringLiteralsHelp
 
@@ -22,8 +23,8 @@ module RuboCop
         DOUBLE_QUOTE_MSG = 'Prefer double-quoted strings unless you need ' \
           'single quotes to avoid extra backslashes for escaping.'
 
-        def autocorrect(node)
-          StringLiteralCorrector.correct(node, style)
+        def autocorrect(corrector, node)
+          StringLiteralCorrector.correct(corrector, node, style)
         end
 
         private

data/lib/salsify_rubocop/version.rb

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

data/salsify_rubocop.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Salsify, Inc']
   spec.email         = ['engineering@salsify.com']
 
-  spec.summary       = 'Shared shared RuboCop configuration'
+  spec.summary       = 'Shared RuboCop configuration'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/salsify/salsify_rubocop'
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-
+    spec.metadata['rubygems_mfa_required'] = 'true'
   else
     raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
@@ -30,14 +30,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
 
-  spec.add_runtime_dependency 'rubocop', '~> 1.0.0'
+  spec.add_runtime_dependency 'rubocop', '~> 1.13.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', '~> 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Salsify, Inc
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-description: Shared shared RuboCop configuration
+description: Shared RuboCop configuration
 email:
 - engineering@salsify.com
 executables: []
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -160,7 +161,8 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -168,15 +170,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
-summary: Shared shared RuboCop configuration
+summary: Shared RuboCop configuration
 test_files: []