rubocop-fluentd 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56610f49bc89a80c7cfc74091dbf9e0e5af8a2c7de39698bcf0b9464357d4682
-  data.tar.gz: b6fa1274a3afda983e6e5f3c7552476f664521a2e163343b0299178e46ab487d
+  metadata.gz: 36fbca65669f2ece9eebbf4b11704127822b9fe495cdd613eaabb1bd54a0ed34
+  data.tar.gz: 26785e17f1b748804fec642f24746cbdd880542eb2e73e6c1f0fa7fe68d69831
 SHA512:
-  metadata.gz: 9f938ec1fec15a0c9d0f7aac29857a76853831f6b6bc19b1c2bf73846fbe6ade79ca003797b34a0d9538831f1cf2764d235036dd4d33e562dbfcc63a76b40240
-  data.tar.gz: f1131bc32c16d6ccaa783b8d40641735bcd7ce7ec3462a2e111212a4783afe02624e0ebfcb599b907d8a9ade2bfe4cf2a9d4ea9ed5d82b29f226d26853c5afeb
+  metadata.gz: 3e7dea98385b42b570a66f60358813f02bd1dad063c001aedd7bf53fd782c47e2a5be199dcec79c9c79fb2dc8383fcb69e695d4746c22c99ad64e18825a4cab0
+  data.tar.gz: 5cc4b01eff6ec31f8f1a623c1331956b65f72aa17ae2fc4d6d311f2e2971af35da027f0fe27edafa1cda9339d0cd1809ace43afc6435854e80dc90728436b028

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## 0.2.0 - 2025-07-10
+
+* Support autocorrect for the following custom cop
+  - Lint/FluentdPluginConfigParamDefaultTime
+  - Lint/FluentdPluginLogScope
+
 ## 0.1.1 - 2025-07-09
 
 * Add Lint/FluentdPluginConfigParamDefaultTime

data/lib/rubocop/cop/lint/plugin_config_param_time.rb

@@ -16,6 +16,7 @@ module RuboCop
       #
       class FluentdPluginConfigParamDefaultTime < Base
         include IgnoredNode
+        extend AutoCorrector
 
         RESTRICT_ON_SEND = %i[config_param].freeze
 
@@ -27,13 +28,44 @@ module RuboCop
         def on_send(node)
           return unless config_param_default_string_time?(node)
 
-          symbol = node.children[2]
-          parameter = symbol.value
+          parameter = config_param_variable(node)
+          default = config_param_default(node)
           message = "The value of :#{parameter} must be `integer` or `float` for default time value."
-          add_offense(node, message: message)
+
+          expression = config_param_default_string_time?(node)
+          add_offense(node, message: message) do |corrector|
+            seconds = timestr_to_seconds(default)
+            source_code = "config_param :#{parameter}, :time, :default => #{seconds}"
+            corrector.replace(node, source_code)
+          end
           ignore_node(node)
         end
-        alias on_csend on_send
+
+        def config_param_variable(node)
+          symbol = node.children[2]
+          symbol.value
+        end
+
+        def config_param_default(node)
+          pair = node.children[4].children.first
+          str = pair.children.last
+          str.value
+        end
+
+        def timestr_to_seconds(literal)
+          value = if literal.end_with?("d")
+                    literal.delete("d").to_i * 60 * 60 * 24
+                  elsif literal.end_with?("h")
+                    literal.delete("h").to_i * 60 * 60
+                  elsif literal.end_with?("m")
+                    literal.delete("m").to_i * 60
+                  elsif literal.end_with?("s")
+                    literal.delete("s").to_i
+                  else
+                    literal.to_i
+                  end
+          value
+        end
       end
     end
   end

data/lib/rubocop/cop/lint/plugin_log_scope.rb

@@ -34,6 +34,7 @@ module RuboCop
       #
       class FluentdPluginLogScope < Base
         include IgnoredNode
+        extend AutoCorrector
 
         MSG = 'Use plugin scope `log` instead of global scope `$log`.'
 
@@ -43,36 +44,57 @@ module RuboCop
 
         # @!method global_log_method?(node)
         def_node_matcher :global_reciever_method?, <<~PATTERN
-          (send gvar ...)
+          (send gvar $_ $(...))
         PATTERN
 
         # @!method global_reciever_block_method?(node)
         def_node_matcher :global_reciever_block_method?, <<~PATTERN
-          (block (send gvar ...) ...)
+          (block (send gvar $_) _ $(...))
         PATTERN
 
         def on_send(node)
           return if part_of_ignored_node?(node)
-          return unless global_reciever_method?(node)
+          expression = global_reciever_method?(node)
+          return unless expression
 
           # $log.method(...)
           if send_global_log_node?(node)
-            add_offense(node)
+            add_offense(node) do |corrector|
+              method = expression.first
+              literal = expression.last
+              source_code = "log.#{method} { #{literal.source} }"
+              # $log.xxx => log.xxx
+              corrector.replace(node, source_code)
+            end
           end
         end
 
         def on_block(node)
-          return unless global_reciever_block_method?(node)
+          expression = global_reciever_block_method?(node)
+          return unless expression
 
           # $log.method { ... }
           send_node = node.children.first
           if send_global_log_node?(send_node)
-            add_offense(node)
+            add_offense(node) do |corrector|
+              source_code = "log.#{block_log_level_method(node)}"
+              # $log.xxx => log.xxx
+              corrector.replace(node.children.first, source_code)
+            end
             # mark do not match on_send further more
             ignore_node(node)
           end
         end
 
+        def log_level_method(node)
+          node.children[1]
+        end
+
+        def block_log_level_method(node)
+          send_node = node.children.first
+          send_node.children.last
+        end
+
         def send_global_log_node?(node)
           node.class == RuboCop::AST::SendNode and
             global_log_reciever?(node.children.first)
@@ -81,9 +103,6 @@ module RuboCop
         def global_log_reciever?(node)
           node.name == :$log
         end
-
-        alias on_csend on_send
-        alias on_cblock on_block
       end
     end
   end

data/lib/rubocop/fluentd/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Fluentd
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-fluentd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kentaro Hayashi
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: lint_roller
   requirement: !ruby/object:Gem::Requirement