rubocop-i18n 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900bad082ace7d17bf13e8a01691f33c021fb683f5bf4963b1a4f217d98720c8
-  data.tar.gz: df4f70a869ae98441bb1d98b8b9365a8a06368ffeb6b63c16138291ff241fb32
+  metadata.gz: 40440c74a9f3245bc18bc95f36f3fddc4512249611f680ba0a8a8ee3027411a0
+  data.tar.gz: f4c16aa614332d0f7938deaee0feedfc6d13bbca695f54a42147aa6911d5226b
 SHA512:
-  metadata.gz: 666a5de6a09a035d64937dcdf1441faaef249ebc6df44572f37d858ffdf00f2509abc56581900fb839d857e2e4da2c7a9e71f0d20476ab67c8d83022670052b7
-  data.tar.gz: 9c5cc9f02c4408c8f3a2667125b65bb1a6385bf7d885b38787521961646240d4684d81988592298009ec54660f3533f8722b8c1118809528f2d6641f0ac808b2
+  metadata.gz: 06b836f7100a74801a7d3f3c46e2df2a9d620fad44bc5279b92ec3e1748daa1d7b938cdbf496b00f4b8edd541c0d44e3c704720990ebf746f031fc8707b69d94
+  data.tar.gz: 0cc9e35e18192a913138a20f442e5f8bbb927aab67caa6a1b381df27e2b126792db86cd21e6842ce76dac165a526416aa27fca447b91d507eb5b722df2c735b4

data/.github/workflows/rubocop.yml

@@ -0,0 +1,21 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.7.7' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run rake default task
+      run: |
+        bundle install --jobs=3 --retry=3
+        bundle exec rake

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.ruby-version
 /.config
 /coverage/
 /InstalledFiles
@@ -10,6 +11,7 @@
 /test/version_tmp/
 /tmp/
 /.idea/
+Gemfile.lock
 
 # Used by dotenv library to load environment variables.
 # .env

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -1,9 +1,18 @@
 inherit_from: .rubocop_todo.yml
-require:
-  - rubocop/cop/internal_affairs
+
+plugins:
+  - rubocop-internal_affairs
+  - rubocop-rake
+  - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
+  NewCops: enable
+
+# rubocop-i18n does not have config/default.
+InternalAffairs/UndefinedConfig:
+  Enabled: false
 
 Metrics/BlockLength:
   Exclude:

data/.rubocop_todo.yml

@@ -1,28 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-10-25 09:49:30 UTC using RuboCop version 1.0.0.
+# on 2025-01-23 02:17:39 UTC using RuboCop version 1.71.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
+# Offense count: 4
+InternalAffairs/OnSendWithoutOnCSend:
   Exclude:
-    - 'rubocop-i18n.gemspec'
+    - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
+    - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation.rb'
+    - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb'
+    - 'lib/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/InterpolationCheck:
   Exclude:
-    - 'spec/rubocop/cop/i18n/gettext/decorate_string_spec.rb'
+    - 'spec/rubocop/cop/i18n/get_text/decorate_string_spec.rb'
 
-# Offense count: 2
-# Configuration parameters: IgnoredMethods.
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 29
+  Max: 24
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
@@ -30,23 +31,49 @@ Metrics/ClassLength:
   Max: 108
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 8
 
 # Offense count: 7
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 25
 
 # Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/rubocop-i18n.rb'
 
+# Offense count: 47
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/rubocop/cop/i18n/get_text/decorate_function_message_spec.rb'
+    - 'spec/rubocop/cop/i18n/get_text/decorate_string_formatting_using_interpolation_spec.rb'
+    - 'spec/rubocop/cop/i18n/get_text/decorate_string_formatting_using_percent_spec.rb'
+    - 'spec/rubocop/cop/i18n/get_text/decorate_string_spec.rb'
+    - 'spec/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation_spec.rb'
+    - 'spec/rubocop/cop/i18n/rails_i18n/decorate_string_spec.rb'
+
+# Offense count: 7
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/rubocop/cop/i18n/get_text/decorate_function_message_spec.rb'
+    - 'spec/shared_examples.rb'
+
+# Offense count: 2
+RSpec/MultipleExpectations:
+  Max: 3
+
 # Offense count: 2
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -55,26 +82,29 @@ Style/Documentation:
     - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
 
 # Offense count: 12
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   EnforcedStyle: template
 
 # Offense count: 2
-# Configuration parameters: MinBodyLength.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
     - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
     - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb'
 
 # Offense count: 6
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
     - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb'
 
 # Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
@@ -83,9 +113,9 @@ Style/SoleNestedConditional:
     - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb'
     - 'lib/rubocop/cop/i18n/rails_i18n/decorate_string.rb'
 
-# Offense count: 50
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 47
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 174

data/CHANGELOG.md

@@ -1,14 +1,24 @@
 # Change Log
 
-### [master (Unreleased)](https://github.com/puppetlabs/rubocop-i18n/compare/v3.0.0...master)
-### [3.0.0](https://github.com/puppetlabs/rubocop-i18n/compare/v2.0.2...v3.0.0)
+### [master (Unreleased)](https://github.com/rubocop/rubocop-i18n/compare/v3.1.0...master)
+
+### [3.2.0](https://github.com/rubocop/rubocop-i18n/compare/v3.1.0...v3.2.0)
+
+* Pluginfy rubocop-i18n (#65)
+
+### [3.1.0](https://github.com/rubocop/rubocop-i18n/compare/v3.0.0...v3.1.0)
+
+* Transfer ownership of rubocop-i18n from puppetlabs org to rubocop org (#62)
+* Suppress RuboCop warnings (#59)
+
+### [3.0.0](https://github.com/rubocop/rubocop-i18n/compare/v2.0.2...v3.0.0)
 
 * Update Rubocop version to 1.0! Thank you @mvz!
 * Cop namespace fixes, documentation updates, loading issues. Thank you again @mvz !
 * Gem maintainership has been passed to @highb. Thank you @binford2k and @lucywyman!
 * Update Ruby versions in gemspec, Travis, .ruby-version. Thank you @sfeuga!
 
-### [2.0.2](https://github.com/puppetlabs/rubocop-i18n/compare/v2.0.1...v2.0.2)
+### [2.0.2](https://github.com/rubocop/rubocop-i18n/compare/v2.0.1...v2.0.2)
 
 * Add auto-correct for `DecorateString` (#40) Thanks @mvz!
 * Update rake and bundler requirements to be more permissive of newer versions (#43)

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,14 @@
-# Contributor Covenant Code of Conduct
+# The RuboCop Community Code of Conduct
 
-## Our Pledge
+**Note:** We have picked the following code of conduct based on [Ruby's own code of conduct](https://www.ruby-lang.org/en/conduct/).
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+This document provides a few simple community guidelines for a safe, respectful,
+productive, and collaborative place for any person who is willing to contribute
+to the RuboCop community. It applies to all "collaborative spaces", which are
+defined as community communications channels (such as mailing lists, submitted
+patches, commit comments, etc.).
 
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at brandon.high@puppet.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+* Participants will be tolerant of opposing views.
+* Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
+* When interpreting the words and actions of others, participants should always assume good intentions.
+* Behavior which can be reasonably considered harassment will not be tolerated.

data/Gemfile

@@ -4,3 +4,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rubocop-i18n.gemspec
 gemspec
+
+gem 'bundler', '>= 1.17.3'
+gem 'pry', '~> 0.13.1'
+gem 'rake', '>= 12.3.3'
+gem 'rb-readline', '~> 0.5.5'
+gem 'rspec', '~> 3.0'
+gem 'rubocop-performance'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/README.md

@@ -1,6 +1,6 @@
 # Rubocop::I18n
 
-[![Build Status](https://travis-ci.org/puppetlabs/rubocop-i18n.svg?branch=master)](https://travis-ci.org/puppetlabs/rubocop-i18n)
+[![CI](https://github.com/rubocop/rubocop-i18n/actions/workflows/rubocop.yml/badge.svg)](https://github.com/rubocop/rubocop-i18n/actions/workflows/rubocop.yml)
 
 A set of cops for detecting strings that need i18n decoration in your project.
 
@@ -28,8 +28,9 @@ Or install it yourself as:
 ## Usage
 
 In your `rubocop.yml`:
-```
-require:
+
+```yaml
+plugins:
  - rubocop-i18n
 ...
 # You *must* choose GetText or Rails-i18n style checking
@@ -58,11 +59,14 @@ I18n/RailsI18n/DecorateString:
   Enabled: false
 ```
 
+> [!NOTE]
+> The plugin system is supported in RuboCop 1.72+. In earlier versions, use `require` instead of `plugins`.
+
 ## Cops
 
 ### I18n/GetText/DecorateString
 
-This cop is looks for strings that appear to be sentences but are not decorated. 
+This cop is looks for strings that appear to be sentences but are not decorated.
 Sentences are determined by the STRING_REGEXP.
 
 ##### Error message thrown
@@ -203,7 +207,7 @@ raise(someOtherFuntioncall(foo, "bar"))
 
 ##### Good
 
-In this raise or fail function, the message does not contain any decoration at all and the message is not a simple string. It may make sense to convert the message to a simple string. eg [Simple decoration of a message](#Simple-decoration-of-a-message). 
+In this raise or fail function, the message does not contain any decoration at all and the message is not a simple string. It may make sense to convert the message to a simple string. eg [Simple decoration of a message](#Simple-decoration-of-a-message).
 Or ignore this raise or fail function following this [How to ignore rules in code](#How-to-ignore-rules-in-code) section.
 
 ### I18n/GetText/DecorateStringFormattingUsingInterpolation
@@ -331,5 +335,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/puppetlabs/rubocop-i18n. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/rubocop/rubocop-i18n. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [RuboCop Community Code of Conduct](CODE_OF_CONDUCT.md).

data/Rakefile

@@ -9,6 +9,7 @@ task default: :test
 
 task test: %i[rubocop spec]
 
+desc 'Run RuboCop'
 task :rubocop do
   sh 'rubocop -P'
 end

data/config/default.yml

@@ -0,0 +1,25 @@
+---
+I18n:
+  Enabled: true
+
+I18n/GetText:
+  Enabled: false
+
+I18n/GetText/DecorateString:
+  Enabled: true
+  AutoCorrect: false
+
+I18n/GetText/DecorateFunctionMessage:
+  Enabled: true
+
+I18n/GetText/DecorateStringFormattingUsingInterpolation:
+  Enabled: true
+
+I18n/GetText/DecorateStringFormattingUsingPercent:
+  Enabled: true
+
+I18n/RailsI18n:
+  Enabled: false
+
+I18n/RailsI18n/DecorateString:
+  Enabled: true

data/lib/rubocop/cop/i18n/gettext/decorate_function_message.rb

@@ -4,7 +4,9 @@ module RuboCop
   module Cop
     module I18n
       module GetText
-        class DecorateFunctionMessage < Cop
+        class DecorateFunctionMessage < Base
+          extend AutoCorrector
+
           def on_send(node)
             method_name = node.loc.selector.source
             return unless GetText.supported_method?(method_name)
@@ -22,14 +24,6 @@ module RuboCop
             end
           end
 
-          def autocorrect(node)
-            if node.str_type?
-              single_string_correct(node)
-            elsif interpolation_offense?(node)
-              #              interpolation_correct(node)
-            end
-          end
-
           private
 
           def already_decorated?(node, parent = nil)
@@ -65,7 +59,17 @@ module RuboCop
               error_message << 'message should be decorated. ' if error == :no_decoration
             end
             error_message = error_message.join('\n')
-            add_offense(message_section, message: error_message)
+            add_offense(message_section, message: error_message) do |corrector|
+              autocorrect(corrector, message_section)
+            end
+          end
+
+          def autocorrect(corrector, node)
+            if node.str_type?
+              single_string_correct(corrector, node)
+            elsif interpolation_offense?(node)
+              #              interpolation_correct(node)
+            end
           end
 
           def how_bad_is_it(message_section)
@@ -106,11 +110,8 @@ module RuboCop
             node.children.any? { |child| interpolation_offense?(child, parent) }
           end
 
-          def single_string_correct(node)
-            lambda { |corrector|
-              corrector.insert_before(node.source_range, '_(')
-              corrector.insert_after(node.source_range, ')')
-            }
+          def single_string_correct(corrector, node)
+            corrector.wrap(node.source_range, '_(', ')')
           end
 
           def interpolation_correct(node)
@@ -136,16 +137,16 @@ module RuboCop
                 if interpolated_values_string.empty?
                   interpolated_values_string << '{ '
                 end
-                interpolated_values_string << "#{hash_key}: #{value.loc.expression.source}, "
+                interpolated_values_string << "#{hash_key}: #{value.source}, "
 
                 # Replace interpolation with format string
-                corrector.replace(child.loc.expression, "%{#{hash_key}}")
+                corrector.replace(child, "%{#{hash_key}}")
               end
               unless interpolated_values_string.empty?
                 interpolated_values_string << '}'
               end
-              corrector.insert_before(node.source_range, '_(')
-              corrector.insert_after(node.source_range, ") % #{interpolated_values_string}")
+              corrector.insert_before(node, '_(')
+              corrector.insert_after(node, ") % #{interpolated_values_string}")
             }
           end
         end

data/lib/rubocop/cop/i18n/gettext/decorate_string.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module I18n
       module GetText
-        # This cop is looks for strings that appear to be sentences but are not decorated.
+        # Looks for strings that appear to be sentences but are not decorated.
         # Sentences are determined by the STRING_REGEXP. (Upper case character, at least one space,
         # and sentence punctuation at the end)
         #
@@ -19,7 +19,9 @@ module RuboCop
         #   # good
         #
         #   _("Result is good.")
-        class DecorateString < Cop
+        class DecorateString < Base
+          extend AutoCorrector
+
           STRING_REGEXP = /^\s*[[:upper:]][[:alpha:]]*[[:blank:]]+.*[.!?]$/.freeze
 
           def on_dstr(node)
@@ -31,16 +33,12 @@ module RuboCop
 
             parent = node.parent
             if parent.respond_to?(:type)
-              return if parent.regexp_type? || parent.dstr_type?
+              return if parent.type?(:regexp, :dstr)
             end
 
             check_for_parent_decorator(node)
           end
 
-          def autocorrect(node)
-            single_string_correct(node) if node.str_type?
-          end
-
           private
 
           def sentence?(node)
@@ -70,14 +68,13 @@ module RuboCop
             elsif parent.respond_to?(:method_name) && parent.method?(:[])
               return
             end
-            add_offense(node, message: 'decorator is missing around sentence')
+            add_offense(node, message: 'decorator is missing around sentence') do |corrector|
+              single_string_correct(corrector, node) if node.str_type?
+            end
           end
 
-          def single_string_correct(node)
-            lambda { |corrector|
-              corrector.insert_before(node.source_range, '_(')
-              corrector.insert_after(node.source_range, ')')
-            }
+          def single_string_correct(corrector, node)
+            corrector.wrap(node.source_range, '_(', ')')
           end
         end
       end

data/lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation.rb

@@ -22,7 +22,7 @@ module RuboCop
         #
         #   _("result is %{detail}" % {detail: message})
         #
-        class DecorateStringFormattingUsingInterpolation < Cop
+        class DecorateStringFormattingUsingInterpolation < Base
           def on_send(node)
             decorator_name = node.loc.selector.source
             return unless GetText.supported_decorator?(decorator_name)
@@ -44,7 +44,7 @@ module RuboCop
           def contains_string_formatting_with_interpolation?(node)
             return node.any? { |n| contains_string_formatting_with_interpolation?(n) } if node.is_a?(Array)
 
-            return string_contains_interpolation_format?(node.source) if node.respond_to?(:type) && (node.str_type? || node.dstr_type?)
+            return string_contains_interpolation_format?(node.source) if node.respond_to?(:type) && node.type?(:str, :dstr)
 
             return node.children.any? { |child| contains_string_formatting_with_interpolation?(child) } if node.respond_to?(:children)
 

data/lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb

@@ -23,7 +23,7 @@ module RuboCop
         #
         #   _("result is %{detail}" % {detail: message})
         #
-        class DecorateStringFormattingUsingPercent < Cop
+        class DecorateStringFormattingUsingPercent < Base
           SUPPORTED_FORMATS = %w[b B d i o u x X e E f g G a A c p s].freeze
 
           def on_send(node)
@@ -50,7 +50,7 @@ module RuboCop
             end
 
             if node.respond_to?(:type)
-              if node.str_type? || node.dstr_type?
+              if node.type?(:str, :dstr)
                 return string_contains_percent_format?(node.source)
               end
             end

data/lib/rubocop/cop/i18n/rails_i18n/decorate_string.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module I18n
       module RailsI18n
-        # This cop is looks for strings that appear to be sentences but are not decorated.
+        # Looks for strings that appear to be sentences but are not decorated.
         # Sentences are determined by the SENTENCE_REGEXP. (Upper case character, at least one space,
         # and sentence punctuation at the end)
         #
@@ -70,7 +70,7 @@ module RuboCop
         #   "Any other string is fine now"
         #   t("only_this_text")
         #
-        class DecorateString < Cop
+        class DecorateString < Base
           SENTENCE_REGEXP = /^\s*[[:upper:]][[:alpha:]]*[[:blank:]]+.*[.!?]$/.freeze
           FRAGMENTED_SENTENCE_REGEXP = /^\s*([[:upper:]][[:alpha:]]*[[:blank:]]+.*)|([[:alpha:]]*[[:blank:]]+.*[.!?])$/.freeze
           FRAGMENT_REGEXP = /^\s*[[:alpha:]]*[[:blank:]]+.*$/.freeze
@@ -90,7 +90,7 @@ module RuboCop
 
             parent = node.parent
             if parent.respond_to?(:type)
-              return if parent.regexp_type? || parent.dstr_type?
+              return if parent.type?(:regexp, :dstr)
             end
 
             check_for_parent_decorator(node)
@@ -122,7 +122,7 @@ module RuboCop
             when 'sentence'            then SENTENCE_REGEXP
             when 'fragmented_sentence' then FRAGMENTED_SENTENCE_REGEXP
             when 'fragment'            then FRAGMENT_REGEXP
-            else
+            else # rubocop:disable Lint/DuplicateBranch
               SENTENCE_REGEXP
             end
           end

data/lib/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation.rb

@@ -20,7 +20,7 @@ module RuboCop
         #
         #   t("status.accepted")
         #
-        class DecorateStringFormattingUsingInterpolation < Cop
+        class DecorateStringFormattingUsingInterpolation < Base
           def on_send(node)
             return unless node&.loc&.selector
 
@@ -48,7 +48,7 @@ module RuboCop
           def contains_string_formatting_with_interpolation?(node)
             return node.any? { |n| contains_string_formatting_with_interpolation?(n) } if node.is_a?(Array)
 
-            return string_contains_interpolation_format?(node.source) if node.respond_to?(:type) && (node.str_type? || node.dstr_type?)
+            return string_contains_interpolation_format?(node.source) if node.respond_to?(:type) && node.type?(:str, :dstr)
 
             return node.children.any? { |child| contains_string_formatting_with_interpolation?(child) } if node.respond_to?(:children)
 

data/lib/rubocop/cop/i18n_cops.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'i18n/gettext'
+require_relative 'i18n/gettext/decorate_string'
+require_relative 'i18n/gettext/decorate_function_message'
+require_relative 'i18n/gettext/decorate_string_formatting_using_interpolation'
+require_relative 'i18n/gettext/decorate_string_formatting_using_percent'
+
+require_relative 'i18n/rails_i18n'
+require_relative 'i18n/rails_i18n/decorate_string'
+require_relative 'i18n/rails_i18n/decorate_string_formatting_using_interpolation'

data/lib/rubocop/i18n/plugin.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'lint_roller'
+
+module RuboCop
+  module I18n
+    # A plugin that integrates rubocop-i18n with RuboCop's plugin system.
+    class Plugin < LintRoller::Plugin
+      def about
+        LintRoller::About.new(
+          name: 'rubocop-i18n',
+          version: Version::STRING,
+          homepage: 'https://github.com/rubocop/rubocop-i18n',
+          description: 'RuboCop rules for i18n.'
+        )
+      end
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: Pathname.new(__dir__).join('../../../config/default.yml')
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/i18n.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # RuboCop I18n project namespace
+  module I18n
+  end
+end

data/lib/rubocop-i18n.rb

@@ -1,3 +1,7 @@
 # frozen_string_literal: true
 
-require 'rubocop/cop/i18n'
+require 'rubocop'
+
+require_relative 'rubocop/i18n'
+require_relative 'rubocop/i18n/plugin'
+require_relative 'rubocop/cop/i18n_cops'

data/rubocop-i18n.gemspec

@@ -5,13 +5,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'rubocop-i18n'
-  spec.version       = '3.0.0'
+  spec.version       = '3.2.0'
   spec.authors       = ['Puppet', 'Brandon High', 'TP Honey', 'Helen Campbell']
-  spec.email         = ['team-modules@puppet.com', 'brandon.high@puppet.com', 'tp@puppet.com', 'helen@puppet.com']
 
   spec.summary       = 'RuboCop rules for i18n'
   spec.description   = 'RuboCop rules for detecting and autocorrecting undecorated strings for i18n (gettext and rails-i18n)'
-  spec.homepage      = 'https://github.com/puppetlabs/rubocop-i18n'
+  spec.homepage      = 'https://github.com/rubocop/rubocop-i18n'
   spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -21,12 +20,13 @@ 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.5.8'
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_development_dependency 'bundler', '>= 1.17.3'
-  spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'rake', '>= 12.3.3'
-  spec.add_development_dependency 'rb-readline', '~> 0.5.5'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_runtime_dependency 'rubocop', '~> 1.0'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+    'default_lint_roller_plugin' => 'RuboCop::I18n::Plugin'
+  }
+
+  spec.add_dependency 'lint_roller', '~> 1.1'
+  spec.add_dependency 'rubocop', '~> 1.72.1'
 end

metadata

@@ -1,122 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-i18n
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Puppet
 - Brandon High
 - TP Honey
 - Helen Campbell
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: lint_roller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '1.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.72.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.72.1
 description: RuboCop rules for detecting and autocorrecting undecorated strings for
   i18n (gettext and rails-i18n)
-email:
-- team-modules@puppet.com
-- brandon.high@puppet.com
-- tp@puppet.com
-- helen@puppet.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/rubocop.yml"
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
-- CODEOWNERS
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -124,8 +61,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/default.yml
 - lib/rubocop-i18n.rb
-- lib/rubocop/cop/i18n.rb
 - lib/rubocop/cop/i18n/gettext.rb
 - lib/rubocop/cop/i18n/gettext/decorate_function_message.rb
 - lib/rubocop/cop/i18n/gettext/decorate_string.rb
@@ -134,12 +71,16 @@ files:
 - lib/rubocop/cop/i18n/rails_i18n.rb
 - lib/rubocop/cop/i18n/rails_i18n/decorate_string.rb
 - lib/rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation.rb
+- lib/rubocop/cop/i18n_cops.rb
+- lib/rubocop/i18n.rb
+- lib/rubocop/i18n/plugin.rb
 - rubocop-i18n.gemspec
-homepage: https://github.com/puppetlabs/rubocop-i18n
+homepage: https://github.com/rubocop/rubocop-i18n
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+  default_lint_roller_plugin: RuboCop::I18n::Plugin
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +88,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.8
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: RuboCop rules for i18n
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.7.2

data/.travis.yml

@@ -1,12 +0,0 @@
----
-os: linux
-dist: xenial
-language: ruby
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-jobs:
-  fast_finish: true
-notifications:
-  email: true

data/CODEOWNERS

@@ -1,5 +0,0 @@
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*       @highb @puppetlabs/open-source-stewards

data/lib/rubocop/cop/i18n.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-require 'rubocop/cop/i18n/gettext'
-require 'rubocop/cop/i18n/gettext/decorate_string'
-require 'rubocop/cop/i18n/gettext/decorate_function_message'
-require 'rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation'
-require 'rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent'
-
-require 'rubocop/cop/i18n/rails_i18n'
-require 'rubocop/cop/i18n/rails_i18n/decorate_string'
-require 'rubocop/cop/i18n/rails_i18n/decorate_string_formatting_using_interpolation'