salsify_rubocop 0.42.0 → 0.43.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d574fdef745a9e334e55b58c449deb2cb1807cc9
-  data.tar.gz: dffcaa9c8811f95ee57d170e5724cdbf8543ee46
+  metadata.gz: 3d35dc150ae60c726f5588216b66206d7b7e6225
+  data.tar.gz: 808d7b6d4fa1b82feb8d756acf7a960e209ea088
 SHA512:
-  metadata.gz: 159db8ad25a634d544070cac994477049711ac2409dbd339b04b8cf86942976df9892a2785bf8ef0a6a0bd13777ab386c6422e0cdbee23fe81f7ae7bc76fb6f3
-  data.tar.gz: 4cab967d8390bb8bced638ea4e9b9e7b42ef6ddc6532e48555fb14d067b04a59d7e4b15c58fd09202968f29c0e6b902a2035d77b4157c82108c20af16bf965e7
+  metadata.gz: e17e1aa6e2acdb63655bf248229b9d17a92802727c9ca98af3f10403bd42fce70dc67411e97e9fa5e85f6f2973da6b2c37b599c443853995cd207e3e8b6fa456
+  data.tar.gz: f5477389cbff844b981692f63835db07b71dca7bb0d5681abf0dfbbc876cfea3886c6530f9a4854c14797d172442dbd620b7fb40908ea803f0a622639872ff9e

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # salsify_rubocop
 
+## v0.43.0
+- Update to `rubocop` v0.43.0.
+- Update to `rubocop-rspec` v1.7.0.
+- Disable new RSpec cops: `LeadingSubject`, `LetSetup`, `MultipleExpectations`,
+  and `NestedGroups`.
+- Disable new cop `RSpec/ExpectActual` for routing specs.
+- Disable problematic cops `Style/NumericPredicate`, `Style/SafeNavigation`,
+  and `Style/VariableNumber`.
+- Disable `Style/IndentHash`, which applies to the first line, since we are not
+  using `Style/AlignHash`.
+- Add `Salsify/RspecStringLiterals` cop to check non-doc string quotes for
+  examples/example groups.
+- Modify `Salsify/RspecDocString` to treat names for shared groups and shared
+  example as doc strings.
+
 ## v0.42.0
 - Update to RuboCop v0.42.
 - Add `Salsify/RspecDocString` cop to check quoting for examples/example groups.

data/conf/rubocop.yml

@@ -3,11 +3,6 @@ inherit_from:
 
 require: salsify_rubocop
 
-# See https://github.com/bbatsov/rubocop/pull/3343
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-
 RSpec/DescribeClass:
   Enabled: false
 
@@ -20,5 +15,22 @@ RSpec/DescribeMethod:
 RSpec/ExampleLength:
   Enabled: false
 
+# See https://github.com/backus/rubocop-rspec/issues/198
+RSpec/ExpectActual:
+  Exclude:
+  - 'spec/routing/**/*'
+
 RSpec/InstanceVariable:
   Enabled: false
+
+RSpec/LeadingSubject:
+  Enabled: false
+
+RSpec/LetSetup:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false

data/conf/rubocop_without_rspec.yml

@@ -58,6 +58,10 @@ Style/FrozenStringLiteralComment:
 Style/GuardClause:
   Enabled: false
 
+# does not make sense to enable this without AlignHash
+Style/IndentHash:
+  Enabled: false
+
 Style/Lambda:
   Enabled: false
 
@@ -77,6 +81,10 @@ Style/MultilineBlockLayout:
 Style/NumericLiteralPrefix:
   Enabled: false
 
+# This cop is problematic when nil may be compared with 0.
+Style/NumericPredicate:
+  Enabled: false
+
 Style/Proc:
   Enabled: false
 
@@ -86,6 +94,9 @@ Style/RaiseArgs:
 Style/RegexpLiteral:
   Enabled: false
 
+Style/SafeNavigation:
+  Enabled: false
+
 # This cop doesn't work properly if you a have a block with
 # arguments split across multiple lines
 Style/SpaceAroundBlockParameters:
@@ -99,6 +110,9 @@ Style/StringLiterals:
   Exclude:
     - 'spec/**/*'
 
+Style/VariableNumber:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 

data/config/default.yml

@@ -7,3 +7,14 @@ Salsify/RspecDocString:
     - double_quotes
   Include:
     - 'spec/**/*'
+
+Salsify/RspecStringLiterals:
+  Description: 'Enforce consistent quote style for non-doc strings in RSpec tests.'
+  Enabled: true
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+#  Include:
+#    - 'spec/**/*'
+

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

@@ -30,13 +30,14 @@ module RuboCop
         DOUBLE_QUOTE_MSG =
           'Example Group/Example doc strings must be double-quoted.'.freeze
 
-        DOCUMENTED_METHODS = [
-          :example_group, :describe, :context, :xdescribe, :xcontext,
-          :it, :example, :specify, :xit, :xexample, :xspecify,
-          :feature, :scenario, :xfeature, :xscenario,
-          :fdescribe, :fcontext, :focus, :fexample, :fit, :fspecify,
-          :ffeature, :fscenario
-        ].to_set.freeze
+        SHARED_EXAMPLES = RuboCop::RSpec::Language::SelectorSet.new(
+          %i(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
 
         def on_send(node)
           _receiver, method_name, *args = *node

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Salsify
+
+      # This cop checks if quotes match the configured preference. It is
+      # intended to be use specifically for specs and in combination with
+      # Salsify/RspecDocString.
+      #
+      # 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
+        include ConfigurableEnforcedStyle
+        include StringLiteralsHelp
+
+        DOCUMENTED_METHODS = RuboCop::Cop::Salsify::RspecDocString::DOCUMENTED_METHODS
+
+        SINGLE_QUOTE_MSG = 'Prefer single-quoted strings unless you need ' \
+          'interpolation or special symbols.'.freeze
+        DOUBLE_QUOTE_MSG = 'Prefer double-quoted strings unless you need ' \
+          'single quotes to avoid extra backslashes for escaping.'.freeze
+
+        private
+
+        def message(*)
+          style == :single_quotes ? SINGLE_QUOTE_MSG : DOUBLE_QUOTE_MSG
+        end
+
+        # Share implementation with Style/StringLiterals from rubocop
+        def offense?(node)
+          return false if documented_parent?(node)
+          return false if inside_interpolation?(node)
+
+          wrong_quotes?(node)
+        end
+
+        def documented_parent?(node)
+          parent = node.parent
+          parent && parent.send_type? &&
+            DOCUMENTED_METHODS.include?(parent.children[1])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# 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

data/lib/salsify_rubocop/version.rb

@@ -1,3 +1,3 @@
 module SalsifyRubocop
-  VERSION = '0.42.0'.freeze
+  VERSION = '0.43.0.rc0'.freeze
 end

data/lib/salsify_rubocop.rb

@@ -14,3 +14,4 @@ RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
 
 # cops
 require 'rubocop/cop/salsify/rspec_doc_string'
+require 'rubocop/cop/salsify/rspec_string_literals'

data/salsify_rubocop.gemspec

@@ -33,6 +33,6 @@ 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.42.0'
-  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.5.1'
+  spec.add_runtime_dependency 'rubocop', '~> 0.43.0'
+  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0.rc0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.43.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.43.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.7.0
 description: Shared shared RuboCop configuration
 email:
 - engineering@salsify.com
@@ -103,6 +103,8 @@ files:
 - conf/rubocop_without_rspec.yml
 - config/default.yml
 - lib/rubocop/cop/salsify/rspec_doc_string.rb
+- lib/rubocop/cop/salsify/rspec_string_literals.rb
+- lib/rubocop/rspec/language/each_selector.rb
 - lib/salsify_rubocop.rb
 - lib/salsify_rubocop/version.rb
 - salsify_rubocop.gemspec
@@ -122,12 +124,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Shared shared RuboCop configuration