rubocop-i18n 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23a0dde90c58003d524a1baeca709a66c900822
-  data.tar.gz: 1ddec0669b48c044937bcc2b9c52eeb551eb3651
+  metadata.gz: 1519b7393133fbbd4edcc8aa1fdeaa46bd93155b
+  data.tar.gz: 2e16dc911733af1dc139d31b69c383b226c3db51
 SHA512:
-  metadata.gz: 855e9c7119359d442e3fc9b0833afaaa0adcb6f72de12403d4b4b3cab1e0cc3dea733b82cd001ca7c8bb9728302d3417fa8deae0056f0f56686e62b24737422f
-  data.tar.gz: 26b98a062a7634ca03c17037f46c7864cdc9bd31e95b2f9a6fd85ed9f8ed381053f36c6449fa95130da881f9afcebe7334c9dc6ead5ee20f2e3c566d362d3d21
+  metadata.gz: 9f2110409579d9d8eae8d3d5501a841d6b75dae69b66048563808bb4ed40391256360d48c8700851979d32bf171757469429f5d3a98c7f0a26c4b879ac71ff7d
+  data.tar.gz: 8b1fde24e8b0368d2e7139369e3a94e799266f3be6bbb7b79c4bd3a887118adc5c6023ade4413183791856b0dc473e305258e772a1445acb71d3438e32abfd6d

data/.rubocop.yml

@@ -1 +1,3 @@
 inherit_from: .rubocop_todo.yml
+require:
+  - rubocop/cop/internal_affairs

data/.rubocop_todo.yml

@@ -1,18 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-10-13 16:58:50 -0700 using RuboCop version 0.49.1.
+# on 2018-06-12 15:16:26 -0700 using RuboCop version 0.57.2.
 # 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: 6
+Lint/InterpolationCheck:
+  Exclude:
+    - 'spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation_spec.rb'
+    - 'spec/rubocop/cop/i18n/gettext/decorate_string_spec.rb'
+
 # Offense count: 4
 Metrics/AbcSize:
-  Max: 31
+  Max: 29
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 68
+  Max: 61
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -23,16 +30,10 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 86
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 174
-
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 26
+  Max: 25
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
@@ -46,24 +47,35 @@ Style/Documentation:
     - 'lib/rubocop/cop/i18n/gettext.rb'
     - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
 
-# Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# 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
-Style/FileName:
-  Exclude:
-    - 'lib/rubocop-i18n.rb'
-
-# Offense count: 7
-# Configuration parameters: SupportedStyles.
-# SupportedStyles: annotated, template
+# Offense count: 11
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
-  EnforcedStyle: template
+  Exclude:
+    - 'spec/rubocop/cop/i18n/gettext/decorate_function_message_spec.rb'
+    - 'spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation_spec.rb'
+    - 'spec/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent_spec.rb'
+    - 'spec/rubocop/cop/i18n/gettext/decorate_string_spec.rb'
 
-# Offense count: 4
+# Offense count: 3
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'lib/rubocop/cop/i18n/gettext/decorate_function_message.rb'
-    - 'lib/rubocop/cop/i18n/gettext/decorate_string.rb'
     - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_interpolation.rb'
     - 'lib/rubocop/cop/i18n/gettext/decorate_string_formatting_using_percent.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - '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/rspec/cop_helper.rb'
+
+# Offense count: 93
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 174

data/README.md

@@ -256,5 +256,5 @@ 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/highb/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/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.
 

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

@@ -18,6 +18,14 @@ 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)
@@ -33,7 +41,7 @@ module RuboCop
           end
 
           def string_constant?(nodes)
-            nodes[0].type == :const && nodes[1]
+            nodes[0].const_type? && nodes[1]
           end
 
           def contains_string?(nodes)
@@ -51,7 +59,7 @@ module RuboCop
               error_message << 'message should use correctly formatted interpolation. ' if error == :interpolation
               error_message << 'message should be decorated. ' if error == :no_decoration
             end
-            add_offense(message_section, :expression, error_message)
+            add_offense(message_section, message: error_message)
           end
 
           def how_bad_is_it(message_section)
@@ -85,21 +93,13 @@ module RuboCop
           def interpolation_offense?(node, parent = nil)
             parent ||= node
 
-            return true if node.class == RuboCop::AST::Node && node.dstr_type?
+            return true if node.respond_to?(:dstr_type?) && node.dstr_type?
 
             return false unless node.respond_to?(:children)
 
             node.children.any? { |child| interpolation_offense?(child, parent) }
           end
 
-          def autocorrect(node)
-            if node.str_type?
-              single_string_correct(node)
-            elsif interpolation_offense?(node)
-              #              interpolation_correct(node)
-            end
-          end
-
           def single_string_correct(node)
             lambda { |corrector|
               corrector.insert_before(node.source_range, '_(')
@@ -114,10 +114,10 @@ module RuboCop
               node.children.each do |child|
                 # dstrs are split into "str" segments and other segments.
                 # The "other" segments are the interpolated values.
-                next unless child.type == :begin
+                next unless child.begin_type?
                 value = child.children[0]
                 hash_key = 'value'
-                if value.type == :lvar
+                if value.lvar_type?
                   # Use the variable's name as the format key
                   hash_key = value.loc.name.source
                 else

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

@@ -31,7 +31,7 @@ module RuboCop
 
             parent = node.parent
             if parent.respond_to?(:type)
-              return if parent.type == :regexp || parent.type == :dstr
+              return if parent.regexp_type? || parent.dstr_type?
             end
 
             check_for_parent_decorator(node)
@@ -47,7 +47,7 @@ module RuboCop
               else
                 false
               end
-            elsif child.respond_to?(:type) && child.type == :str
+            elsif child.respond_to?(:type) && child.str_type?
               sentence?(child)
             else
               false
@@ -60,13 +60,13 @@ module RuboCop
 
           def check_for_parent_decorator(node)
             parent = node.parent
-            if parent.respond_to?(:type) && parent.type == :send
+            if parent.respond_to?(:type) && parent.send_type?
               method_name = parent.loc.selector.source
               return if GetText.supported_decorator?(method_name)
             elsif parent.respond_to?(:method_name) && parent.method_name == :[]
               return
             end
-            add_offense(node, :expression, 'decorator is missing around sentence')
+            add_offense(node, message: 'decorator is missing around sentence')
           end
         end
       end

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

@@ -27,7 +27,7 @@ module RuboCop
             _, method_name, *arg_nodes = *node
             if !arg_nodes.empty? && contains_string_formatting_with_interpolation?(arg_nodes)
               message_section = arg_nodes[0]
-              add_offense(message_section, :expression, "'#{method_name}' function, message string should not contain \#{} formatting")
+              add_offense(message_section, message: "'#{method_name}' function, message string should not contain \#{} formatting")
             end
           end
 
@@ -43,7 +43,7 @@ module RuboCop
             end
 
             if node.respond_to?(:type)
-              if node.type == :str || node.type == :dstr
+              if node.str_type? || node.dstr_type?
                 return string_contains_interpolation_format?(node.source)
               end
             end

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

@@ -30,7 +30,7 @@ module RuboCop
             _, method_name, *arg_nodes = *node
             if !arg_nodes.empty? && contains_string_with_percent_format?(arg_nodes)
               message_section = arg_nodes[0]
-              add_offense(message_section, :expression, "'#{method_name}' function, message string should not contain sprintf style formatting (ie %s)")
+              add_offense(message_section, message: "'#{method_name}' function, message string should not contain sprintf style formatting (ie %s)")
             end
           end
 
@@ -46,7 +46,7 @@ module RuboCop
             end
 
             if node.respond_to?(:type)
-              if node.type == :str || node.type == :dstr
+              if node.str_type? || node.dstr_type?
                 return string_contains_percent_format?(node.source)
               end
             end

data/rubocop-i18n.gemspec

@@ -1,12 +1,10 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-rubocop_version = '~> 0.49.0'
+rubocop_version = '~> 0.51'
 
 Gem::Specification.new do |spec|
   spec.name          = 'rubocop-i18n'
-  spec.version       = '1.2.0'
+  spec.version       = '1.3.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']
 
@@ -23,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rb-readline'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', rubocop_version
   spec.add_runtime_dependency 'rubocop', rubocop_version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-i18n
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Puppet
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,33 +28,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   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: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
@@ -70,47 +70,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: '0.51'
 description: RuboCop rules for detecting and autocorrecting undecorated strings for
   i18n
 email:
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: RuboCop rules for i18n