rubocop-itamae 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e536a274f4c88ae9d0b18095a4e82f3d899943a505527471e6ac609b993a88
-  data.tar.gz: 4813442b27ccc9cd5f038db98ba50b5d59687cfc44df720d648b6466efce9ac0
+  metadata.gz: cb63640ad762db35c994b12f23659776f327c7438ce5b54cc256ca7610b785f2
+  data.tar.gz: 33a51ae10a510c3bc23c7c7398b8b679bf0ae9afd08ee8e58d1a25a2cba011b4
 SHA512:
-  metadata.gz: a62bc0ec04985dabe2a245c7fef5af0b94856d2461c51fc63bb4e50bf1ddf3be4620dc72867fb3170ae90108bc50ac7a011f8606d266c3b499cc401c697e90ea
-  data.tar.gz: 6307e1794b5a6c48008a7b8d554bd1020d770c91757518d0be4b71ebe196efb295aa5113431773c3fc1a87f333b8cc2f30fc379cd9584462fb788c07b8fe0dff
+  metadata.gz: f54fbdd0c2d8853dcc261aba5e6dc5082cfff91d87d4d51764c5030aa521692885f36ce01f25b2c2778afb59ded3d22c4cbe5df8c03afc6f3209baf10e62d2ee
+  data.tar.gz: 24bef86116fb59ab749e567ac3cb103369d37ebea55d508043c6dc35c43a81df3a6b1fdc646e39b0dcd32af5bfb4ed711697a9cd030887d3dda78511ba6dd66f

data/.rubocop.yml

@@ -1,4 +1,6 @@
 AllCops:
+  NewCops: enable
+
   # rubocop 0.82.0+ requires ruby 2.4+
   TargetRubyVersion: 2.4
 

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## master
-[full changelog](http://github.com/sue445/rubocop-itamae/compare/v0.1.2...master)
+[full changelog](http://github.com/sue445/rubocop-itamae/compare/v0.1.3...master)
+
+## v0.1.3
+[full changelog](http://github.com/sue445/rubocop-itamae/compare/v0.1.2...v0.1.3)
+
+* Fixed. failed spec since rubocop v0.87.0
+  * https://github.com/sue445/rubocop-itamae/pull/47
+* Migrate to rubocop v1 syntax
+  * https://github.com/sue445/rubocop-itamae/pull/46
 
 ## v0.1.2
 [full changelog](http://github.com/sue445/rubocop-itamae/compare/v0.1.1...v0.1.2)

data/lib/rubocop/cop/itamae/cd_in_execute.rb

@@ -13,7 +13,7 @@ module RuboCop
       #   execute 'rm -rf /tmp/*' do
       #     cwd '/tmp'
       #   end
-      class CdInExecute < Cop
+      class CdInExecute < Base
         MSG = "Insert `cwd '%<dir>s'` and remove this."
 
         def_node_search :find_execute_with_block, <<-PATTERN
@@ -58,7 +58,6 @@ module RuboCop
           end
         end
 
-        # rubocop:disable Layout/LineLength
         # def autocorrect(node)
         #   if node.block_type?
         #     lambda do |corrector|
@@ -103,7 +102,6 @@ module RuboCop
         #     end
         #   end
         # end
-        # rubocop:enable Layout/LineLength
 
         private
 
@@ -112,7 +110,7 @@ module RuboCop
           return unless dir
 
           loc = cd_location(node.child_nodes.first, name)
-          add_offense(node, message: format(MSG, dir: dir), location: loc)
+          add_offense(loc, message: format(MSG, dir: dir))
         end
 
         def add_offence_for_execute_block_name(node, name)
@@ -120,7 +118,7 @@ module RuboCop
           return unless dir
 
           loc = cd_location(node.child_nodes.first.child_nodes.first, name)
-          add_offense(node, message: format(MSG, dir: dir), location: loc)
+          add_offense(loc, message: format(MSG, dir: dir))
         end
 
         def add_offense_for_command_param(param_node, command)
@@ -135,7 +133,7 @@ module RuboCop
             end
 
           loc = cd_location(command_node, command)
-          add_offense(param_node, message: format(MSG, dir: dir), location: loc)
+          add_offense(loc, message: format(MSG, dir: dir))
         end
 
         def cd_dir_in_command(command)

data/lib/rubocop/cop/itamae/command_equals_to_name.rb

@@ -17,8 +17,9 @@ module RuboCop
       #   execute 'Remove temporary files' do
       #     command 'rm -rf /tmp/*'
       #   end
-      class CommandEqualsToName < Cop
+      class CommandEqualsToName < Base
         include RangeHelp
+        extend AutoCorrector
 
         MSG = 'Prefer to omit `command` if `command` equals to ' \
               'name of `execute`'
@@ -45,27 +46,27 @@ module RuboCop
               find_command(param_node) do |command|
                 next unless name == command
 
-                add_offense(param_node, location: :expression)
+                add_param_node_offense(param_node)
               end
             end
           end
         end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            if node.begin_type?
-              node.each_child_node do |param_node|
-                remove_command_param(corrector, node.parent, param_node)
+        private
+
+        def add_param_node_offense(param_node)
+          add_offense(param_node.loc.expression) do |corrector|
+            if param_node.begin_type?
+              param_node.each_child_node do |child_param_node|
+                remove_command_param(corrector, param_node.parent, child_param_node)
               end
 
-            elsif node.send_type?
-              remove_command_param(corrector, node.parent, node)
+            elsif param_node.send_type?
+              remove_command_param(corrector, param_node.parent, param_node)
             end
           end
         end
 
-        private
-
         def remove_command_param(corrector, parent_node, param_node)
           find_execute(parent_node) do |name|
             find_command(param_node) do |command|

data/lib/rubocop/cop/itamae/needless_default_action.rb

@@ -17,8 +17,9 @@ module RuboCop
       #
       #   package 'git'
       #
-      class NeedlessDefaultAction < Cop
+      class NeedlessDefaultAction < Base
         include RangeHelp
+        extend AutoCorrector
 
         MSG = 'Prefer to omit the default action.'
 
@@ -62,18 +63,14 @@ module RuboCop
               find_action(param_node) do |action|
                 next unless action == RESOURCE_DEFAULT_ACTIONS[resource]
 
-                add_offense(param_node, location: :expression)
+                add_offense(param_node.loc.expression) do |corrector|
+                  remove_action_param(corrector, param_node.parent, param_node) if param_node.send_type?
+                end
               end
             end
           end
         end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            remove_action_param(corrector, node.parent, node) if node.send_type?
-          end
-        end
-
         private
 
         def remove_action_param(corrector, parent_node, param_node)

data/lib/rubocop/cop/itamae/recipe_path.rb

@@ -17,28 +17,25 @@ module RuboCop
       #   cookbooks/nginx/default.rb
       #   roles/web.rb
       #
-      class RecipePath < Cop
+      class RecipePath < Base
         include RangeHelp
 
         MSG = 'Prefer recipe to placed under `cookbooks` dir' \
               ' or `roles` dir.'
 
-        def investigate(processed_source)
+        def on_new_investigation
           file_path = processed_source.file_path
           return if config.file_to_include?(file_path)
 
-          for_bad_filename(file_path) do |range, msg|
-            add_offense(nil, location: range, message: msg)
-          end
+          add_global_offense if bad_filename?(file_path)
         end
 
         private
 
-        def for_bad_filename(file_path)
+        def bad_filename?(file_path)
           return unless File.extname(file_path) == '.rb'
-          return if file_path =~ %r{/(cookbooks|roles)/}
 
-          yield source_range(processed_source.buffer, 1, 0), MSG
+          !file_path.match?(%r{/(cookbooks|roles)/})
         end
       end
     end

data/lib/rubocop/itamae/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Itamae
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/rubocop-itamae.gemspec

@@ -24,12 +24,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_dependency 'rubocop', '>= 0.82.0'
+  spec.add_dependency 'rubocop', '>= 0.87.0'
 
   spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rake', '>= 11.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '>= 0.84.0'
   spec.add_development_dependency 'rubocop_auto_corrector'
   spec.add_development_dependency 'simplecov', '< 0.18.0'
   spec.add_development_dependency 'yard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.87.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.87.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.84.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.84.0
 - !ruby/object:Gem::Dependency
   name: rubocop_auto_corrector
   requirement: !ruby/object:Gem::Requirement