umts-custom-cops 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044fe565baad9c46631ea18dcc645b02246e9ad088cbf3c58f3ca0f9ebee4c3e
-  data.tar.gz: 52956058a332e2fc828f2e87df13b055460a408925aa34cca31e1af705c45764
+  metadata.gz: 0fbb1c2d13025ac5c23b36646f630f2571a66c8b6ba71f6683100d501ab6ca05
+  data.tar.gz: 77b825c0656260d685a9cd10bddd88d87a704c4f474fb33ec1edd8492b6cdf29
 SHA512:
-  metadata.gz: a5c7d94c411fa00072104f71ea830ecc2f07ece44eb0cbadcfc02711fb61a47bc9caad1bdf3adfc211b9bb60535e4efb6529f14b019cc468c7c51769011d16d8
-  data.tar.gz: c85baae025d53d56ac122589898e6d13eb288c4713b6dc0e1bc72734d24bf4c68c128762c863396e2c97a8dd6bfdf03dbca78f40952ea62046a28dc1b26a6855
+  metadata.gz: 90031daef0f9f0caa15e40ff450a3ef997134bca280620448985b00b111e00d16f0f5bd5e379d050984920feac5a8b93d57e17ddef133f75b7c9712dce67e4d8
+  data.tar.gz: 9e5e4e9658d45bb5566fa14592c8dd6c3c8e54d51987a7b857cefae8270e3d25c6f089ef1309db407d9b4acda8e33a9f4c8ea62bba347ead35c1f9b1fafbfe97

data/.rubocop.yml

@@ -1,10 +1,14 @@
 Metrics/LineLength:
   Max: 100
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'lib/umts-custom-cops/version.rb'
 
-Style/FileName:
+Naming/FileName:
   Enabled: false

data/bin/console

@@ -1,14 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'custom/cops'
+require 'umts-custom-cops'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start
+require 'pry'
+Pry.start

data/lib/umts-custom-cops/be_matcher_for_non_duplicable_types.rb

@@ -1,18 +1,23 @@
+require 'rubocop'
+
 module RuboCop
   module Cop
     module UmtsCustomCops
       # Prefer the easier-to-read be matcher for non-duplicable types.
       #
       # See the specs for examples.
-
-      # rubocop:disable Metrics/AbcSize
       class BeMatcherForNonDuplicableTypes < Cop
-        MSG = 'Prefer `be` matcher to `eq` or `eql` for non-duplicable types.'
+        MSG = 'Prefer `be` matcher to `eq` or `eql` for non-duplicable types.'.freeze
 
-        OFFENSE_TYPE_CHECKS = %i(true_type?
-                                 false_type?
-                                 nil_type?
-                                 int_type?)
+        def_node_matcher :eq_on_non_duplicable_type?, <<-PATTERN
+          (send
+            _expectation {:to :not_to}
+            (send
+              _context {:eq :eql}
+              {true false nil int}
+            )
+          )
+        PATTERN
 
         def autocorrect(node)
           lambda do |corrector|
@@ -22,13 +27,8 @@ module RuboCop
         end
 
         def on_send(node)
-          return unless %i(to not_to).include? node.method_name
-          return unless node.child_nodes &&
-                        node.child_nodes.first.method_name == :expect
-          matcher = node.child_nodes[1]
-          return unless %i(eq eql).include? matcher.method_name
-          args = matcher.child_nodes.first
-          return unless OFFENSE_TYPE_CHECKS.find { |check| args.send check }
+          return unless eq_on_non_duplicable_type? node
+
           add_offense node, location: :expression, message: MSG
         end
       end

data/lib/umts-custom-cops/predicate_method_matcher.rb

@@ -1,31 +1,41 @@
-require 'pry-byebug'
+require 'rubocop'
 
 module RuboCop
   module Cop
     module UmtsCustomCops
       # See the specs for examples.
       class PredicateMethodMatcher < Cop
-        MSG = 'Prefer predicate matcher over checking the return value of a predicate method.'
+        MESSAGE =
+          'Prefer predicate matcher over checking the return value of a predicate method.'.freeze
 
-        BOOLEAN_EQUALITY_MATCHERS = %i(be_true be_false)
-        GENERIC_EQUALITY_MATCHERS = %i(be eq eql equal)
+        def_node_matcher :generic_equality_expectation, <<-PATTERN
+        (send
+          (send _context :expect
+            (send ... $_expectation)
+          ) {:to :not_to}
+          (send _context {:be :eq :eql :equal}
+            {true false}
+          )
+        )
+        PATTERN
+
+        def_node_matcher :boolean_equality_expectation, <<-PATTERN
+        (send
+          (send _context :expect
+            (send ... $_expectation)
+          ) {:to :not_to}
+          (send _context {:be_true :be_false})
+        )
+        PATTERN
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
         def on_send(node)
-          return unless %i(to not_to).include? node.method_name
-          return unless node.child_nodes
-          expectation = node.child_nodes.first
-          return unless expectation.method_name == :expect
-          match_value = expectation.child_nodes.first
-          return unless match_value.method_name.to_s.end_with? '?'
-          matcher = node.child_nodes[1]
-          if GENERIC_EQUALITY_MATCHERS.include? matcher.method_name
-            matcher_arg = matcher.child_nodes.first
-            return unless matcher_arg.true_type? || matcher_arg.false_type?
-          else return unless BOOLEAN_EQUALITY_MATCHERS.include? matcher.method_name
+          ends_with_question_mark = ->(method) { method.to_s.end_with? '?' }
+
+          if generic_equality_expectation(node, &ends_with_question_mark) ||
+             boolean_equality_expectation(node, &ends_with_question_mark)
+
+            add_offense node, location: :expression, message: MESSAGE
           end
-          add_offense node, location: :expression, message: MSG
         end
       end
     end

data/lib/umts-custom-cops/version.rb

@@ -1,3 +1,3 @@
 module UmtsCustomCops
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'.freeze
 end

data/umts-custom-cops.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'umts-custom-cops/version'
 
@@ -22,8 +21,6 @@ Gem::Specification.new do |spec|
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rspec', '~> 3.0'
@@ -31,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', File.open('.bundler.version').read.strip
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umts-custom-cops
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - UMass Transit Services
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,35 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="