i18n-tasks 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1868afde19604950a807791f25669ec0faffda4c510cf80157ba457509396d
-  data.tar.gz: 83c7d124be22ace376b06ce11afb4e38db5eb3abbb395e688696bc04984e54c4
+  metadata.gz: c1ae937151395c0958e2cab91b89bca5b4b97fb12d307940a9e75bb005f41e2e
+  data.tar.gz: 7dd9cbac5bc49401c15df858adae478c63d49f69e91c3a34b8ee7732793efb4c
 SHA512:
-  metadata.gz: b62fa2e8af521bf6e17e1d5e2fefbfbf928549d36176ced92f0d6e2692bb940b9f24900a95301ad8a51efc20fd917d049eafb52cec62b4fe1bfcd62bdfb53b10
-  data.tar.gz: 1c817158eb91249bc9c19adae843a020fc89f886258b46656e76b973c4e249c449e7a19452c9f5ece011982a959dccef2238714f4b995db93a1a6b21d5fe5a22
+  metadata.gz: 3b918580b7971a2843bf170277195e9bb59019b2040d2a8403f400ef41e718b25d5545b29a2b8b34f050db753d2f9067bc9a8b892c3b2c491403d80ecf0dfab6
+  data.tar.gz: 254c3e547b8d06b684900f1dc3551ed1f52079a6623e5f572fb9bf9ec31c4eaa30b43eb9b2e0aeecd5287b69643a0ed23976bdd8886b42c5b7625bf879fb62ab

data/README.md

@@ -24,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 1.0.9'
+gem 'i18n-tasks', '~> 1.0.10'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -436,6 +436,18 @@ See [i18n-tasks wiki: CSV import and export tasks](https://github.com/glebm/i18n
 Tasks that come with the gem are defined in [lib/i18n/tasks/command/commands](lib/i18n/tasks/command/commands).
 Custom tasks can be added easily, see the examples [on the wiki](https://github.com/glebm/i18n-tasks/wiki#custom-tasks).
 
+# Development
+
+- Install dependencies using `bundle install`
+- Run tests using `bundle exec rspec`
+- Install [Overcommit](overcommit) by running `overcommit --install`
+
+## Skip Overcommit-hooks
+
+- `SKIP=RuboCop git commit`
+- `OVERCOMMIT_DISABLE=1 git commit`
+
+
 [MIT license]: /LICENSE.txt
 [ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml
 [badge-ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml/badge.svg
@@ -448,3 +460,4 @@ Custom tasks can be added easily, see the examples [on the wiki](https://github.
 [screenshot-find]: https://i.imgur.com/VxBrSfY.png "i18n-tasks find output screenshot"
 [adapter-example]: https://github.com/glebm/i18n-tasks/blob/main/lib/i18n/tasks/data/file_system_base.rb
 [custom-scanner-docs]: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+[overcommit]: https://github.com/sds/overcommit#installation

data/i18n-tasks.gemspec

@@ -24,8 +24,11 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
     cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
   TEXT
   s.homepage = 'https://github.com/glebm/i18n-tasks'
-  s.metadata = { 'issue_tracker' => 'https://github.com/glebm/i18n-tasks' } if s.respond_to?(:metadata=)
-  s.required_ruby_version = '>= 2.6', '< 4.0' if s.respond_to?(:required_ruby_version=)
+  s.metadata = {
+    'issue_tracker' => 'https://github.com/glebm/i18n-tasks',
+    'rubygems_mfa_required' => 'true'
+  }
+  s.required_ruby_version = '>= 2.6', '< 4.0'
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
@@ -43,11 +46,11 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.add_dependency 'rails-i18n'
   s.add_dependency 'rainbow', '>= 2.2.2', '< 4.0'
   s.add_dependency 'terminal-table', '>= 1.5.1'
-  s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
+  s.add_development_dependency 'overcommit', '~> 0.58.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
-  s.add_development_dependency 'rubocop', '~> 1.6.1'
+  s.add_development_dependency 'rubocop', '~> 1.27.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
 

data/lib/i18n/tasks/cli.rb

@@ -35,12 +35,12 @@ class I18n::Tasks::CLI
 
   def run(argv)
     argv.each_with_index do |arg, i|
-      if ["--config", "-c"].include?(arg)
-        if File.exist?(argv[i+1])
-          @config_file = argv[i+1]
+      if ['--config', '-c'].include?(arg)
+        if File.exist?(argv[i + 1])
+          @config_file = argv[i + 1]
           break
         else
-          error "Config file doesn't exist: #{argv[i+1]}", 128
+          error "Config file doesn't exist: #{argv[i + 1]}", 128
         end
       end
     end

data/lib/i18n/tasks/command/options/common.rb

@@ -33,7 +33,6 @@ module I18n::Tasks
             '--config FILE',
             t('i18n_tasks.cmd.args.desc.config')
 
-
         def arg_or_pos!(key, opts)
           opts[key] ||= opts[:arguments].try(:shift)
         end

data/lib/i18n/tasks/command/options/data.rb

@@ -86,7 +86,7 @@ module I18n::Tasks
           when 'keys'
             puts forest.key_names(root: true)
           when 'key-values'
-            puts forest.key_values(root: true).map { |kv| kv.join("\t") }
+            puts(forest.key_values(root: true).map { |kv| kv.join("\t") })
           when *DATA_FORMATS
             puts i18n.data.adapter_dump forest.to_hash(true), format
           end

data/lib/i18n/tasks/configuration.rb

@@ -30,6 +30,13 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
           warn_deprecated 'Please move relative_roots under search in config/i18n-tasks.yml.'
           c[:search][:relative_roots] = c.delete(:relative_roots)
         end
+
+        if c.dig(:search, :exclude_method_name_paths)
+          warn_deprecated(
+            'Please rename exclude_method_name_paths to relative_exclude_method_name_paths in config/i18n-tasks.yml.'
+          )
+          c[:search][:relative_exclude_method_name_paths] = c[:search].delete(:exclude_method_name_paths)
+        end
       end
     else
       {}.with_indifferent_access
@@ -44,12 +51,10 @@ module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   # data config
   #  @return [Hash<adapter: String, options: Hash>]
   def data_config
-    @config_sections[:data] ||= begin
-      {
-        adapter: data.class.name,
-        config: data.config
-      }
-    end
+    @config_sections[:data] ||= {
+      adapter: data.class.name,
+      config: data.config
+    }
   end
 
   # translation config

data/lib/i18n/tasks/data/adapter/yaml_adapter.rb

@@ -5,7 +5,7 @@ module I18n::Tasks
   module Data
     module Adapter
       module YamlAdapter
-        EMOJI_REGEX = /\\u[\da-f]{8}/i
+        EMOJI_REGEX = /\\u[\da-f]{8}/i.freeze
 
         class << self
           # @return [Hash] locale tree
@@ -25,7 +25,7 @@ module I18n::Tasks
 
           # @return [String]
           def restore_emojis(yaml)
-            yaml.gsub(EMOJI_REGEX) { |m| [m[-8..].to_i(16)].pack("U") }
+            yaml.gsub(EMOJI_REGEX) { |m| [m[-8..].to_i(16)].pack('U') }
           end
         end
       end

data/lib/i18n/tasks/data/file_formats.rb

@@ -55,7 +55,7 @@ module I18n
           return if File.file?(path) && content == read_file(path)
 
           ::FileUtils.mkpath(File.dirname(path))
-          ::File.open(path, 'w') { |f| f.write content }
+          ::File.write(path, content)
         end
 
         def normalized?(path, tree)

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -38,7 +38,7 @@ module I18n::Tasks
           if pattern
             key_match = $~
             path      = format(path, locale: locale)
-            path.gsub!(/\\\d+/) { |m| key_match[m[1..-1].to_i] }
+            path.gsub!(/\\\d+/) { |m| key_match[m[1..].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else
             fail CommandError, "Cannot route key #{key}. Routes are #{@routes_config.inspect}"

data/lib/i18n/tasks/data/tree/node.rb

@@ -168,7 +168,7 @@ module I18n::Tasks::Data::Tree
       label = if key.nil?
                 Rainbow('∅').faint
               else
-                [Rainbow(key).color(1 + level % 15),
+                [Rainbow(key).color(1 + (level % 15)),
                  (": #{format_value_for_inspect(value)}" if leaf?),
                  (" #{data}" if data?)].compact.join
               end

data/lib/i18n/tasks/data/tree/nodes.rb

@@ -31,13 +31,11 @@ module I18n::Tasks::Data::Tree
     end
 
     def to_hash(sort = false)
-      (@hash ||= {})[sort] ||= begin
-        if sort
-          sort_by(&:key)
-        else
-          self
-        end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
-      end
+      (@hash ||= {})[sort] ||= if sort
+                                 sort_by(&:key)
+                               else
+                                 self
+                               end.map { |node| node.to_hash(sort) }.reduce({}, :deep_merge!)
     end
 
     delegate :to_json, to: :to_hash

data/lib/i18n/tasks/data/tree/siblings.rb

@@ -50,7 +50,7 @@ module I18n::Tasks::Data::Tree
             next
           end
           match = $~
-          new_key = to_pattern.gsub(/\\\d+/) { |m| match[m[1..-1].to_i] }
+          new_key = to_pattern.gsub(/\\\d+/) { |m| match[m[1..].to_i] }
           old_key_to_new_key[full_key] = new_key
           moved_forest.merge!(Siblings.new.tap do |forest|
             forest[[(node.root.try(:key) unless root), new_key].compact.join('.')] =

data/lib/i18n/tasks/html_keys.rb

@@ -7,8 +7,8 @@ module I18n::Tasks
 
     def html_key?(full_key, locale)
       !!(full_key =~ HTML_KEY_PATTERN ||
-          full_key =~ MAYBE_PLURAL_HTML_KEY_PATTERN &&
-              depluralize_key(split_key(full_key, 2)[1], locale) =~ HTML_KEY_PATTERN)
+          (full_key =~ MAYBE_PLURAL_HTML_KEY_PATTERN &&
+              depluralize_key(split_key(full_key, 2)[1], locale) =~ HTML_KEY_PATTERN))
     end
   end
 end

data/lib/i18n/tasks/references.rb

@@ -91,8 +91,8 @@ module I18n::Tasks
             if node.value != other.value
               log_warn(
                 'Conflicting references: '\
-            "#{node.full_key(root: false)} ⮕ #{node.value} in #{node.data[:locale]},"\
-            " but ⮕ #{other.value} in #{other.data[:locale]}"
+                "#{node.full_key(root: false)} ⮕ #{node.value} in #{node.data[:locale]},"\
+                " but ⮕ #{other.value} in #{other.data[:locale]}"
               )
             end
           end

data/lib/i18n/tasks/reports/base.rb

@@ -37,7 +37,7 @@ module I18n::Tasks::Reports
     def used_title(keys_nodes, filter)
       used_n = keys_nodes.map { |_k, node| node.data[:occurrences].size }.reduce(:+).to_i
       "#{keys_nodes.size} key#{'s' if keys_nodes.size != 1}#{" matching '#{filter}'" if filter}"\
-      "#{" (#{used_n} usage#{'s' if used_n != 1})" if used_n.positive?}"
+        "#{" (#{used_n} usage#{'s' if used_n != 1})" if used_n.positive?}"
     end
 
     # Sort keys by their attributes in order

data/lib/i18n/tasks/reports/terminal.rb

@@ -121,9 +121,9 @@ module I18n
           if data[:ref_info]
             from, to = data[:ref_info]
             resolved = key[0...to.length]
-            after    = key[to.length..-1]
+            after    = key[to.length..]
             "  #{Rainbow(from).yellow}#{Rainbow(after).cyan}\n" \
-            "#{Rainbow('⮕').yellow.bright} #{Rainbow(resolved).yellow.bright}"
+              "#{Rainbow('⮕').yellow.bright} #{Rainbow(resolved).yellow.bright}"
           else
             Rainbow(key).cyan
           end

data/lib/i18n/tasks/scanners/ast_matchers/base_matcher.rb

@@ -6,8 +6,8 @@ module I18n::Tasks::Scanners::AstMatchers
       @scanner = scanner
     end
 
-    def convert_to_key_occurrences(send_node, method_name, location: send_node.loc)
-      raise("Not implemented")
+    def convert_to_key_occurrences(send_node, _method_name, location: send_node.loc)
+      fail('Not implemented')
     end
 
     protected
@@ -24,7 +24,7 @@ module I18n::Tasks::Scanners::AstMatchers
     #      No effect unless `array_join_with` is set.
     # @return [String, nil] `nil` is returned only when a dynamic value is encountered in strict mode
     #     or the node type is not supported.
-    def extract_string(node, array_join_with: nil, array_flatten: false, array_reject_blank: false)
+    def extract_string(node, array_join_with: nil, array_flatten: false, array_reject_blank: false) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       return if node.nil?
 
       if %i[sym str int].include?(node.type)

data/lib/i18n/tasks/scanners/pattern_mapper.rb

@@ -35,7 +35,7 @@ module I18n::Tasks::Scanners
         result = []
         text.scan(pattern) do |_|
           match    = Regexp.last_match
-          matches  = Hash[match.names.map(&:to_sym).zip(match.captures)]
+          matches  = match.names.map(&:to_sym).zip(match.captures).to_h
           if matches.key?(:key)
             matches[:key] = strip_literal(matches[:key])
             next unless valid_key?(matches[:key])

data/lib/i18n/tasks/scanners/pattern_scanner.rb

@@ -66,7 +66,7 @@ module I18n::Tasks::Scanners
     end
 
     def exclude_line?(line, path)
-      re = @ignore_lines_res[File.extname(path)[1..-1]]
+      re = @ignore_lines_res[File.extname(path)[1..]]
       re && re =~ line
     end
 

data/lib/i18n/tasks/scanners/relative_keys.rb

@@ -10,7 +10,7 @@ module I18n
         # @param calling_method [#call, Symbol, String, false, nil]
         # @return [String] absolute version of the key
         def absolute_key(key, path, roots: config[:relative_roots],
-                         exclude_method_name_paths: config[:exclude_method_name_paths],
+                         exclude_method_name_paths: config[:relative_exclude_method_name_paths],
                          calling_method: nil)
           return key unless key.start_with?(DOT)
           fail 'roots argument is required' unless roots.present?
@@ -18,7 +18,7 @@ module I18n
           normalized_path = File.expand_path(path)
           (root = path_root(normalized_path, roots)) ||
             fail(CommandError, "Cannot resolve relative key \"#{key}\".\n" \
-                                "Set search.relative_roots in config/i18n-tasks.yml (currently #{roots.inspect})")
+                               "Set search.relative_roots in config/i18n-tasks.yml (currently #{roots.inspect})")
           normalized_path.sub!(root, '')
 
           if (exclude_method_name_paths || []).map { |p| expand_path(p) }.include?(root)

data/lib/i18n/tasks/scanners/results/occurrence.rb

@@ -48,7 +48,7 @@ module I18n::Tasks
         # rubocop:enable Metrics/ParameterLists
 
         def inspect
-          "Occurrence(#{@path}:#{@line_num}, line_pos: #{@line_pos}, pos: #{@pos}, raw_key: #{@raw_key}, default_arg: #{@default_arg}, line: #{@line})"
+          "Occurrence(#{@path}:#{@line_num}, line_pos: #{@line_pos}, pos: #{@pos}, raw_key: #{@raw_key}, default_arg: #{@default_arg}, line: #{@line})" # rubocop:disable Layout/LineLength
         end
 
         def ==(other)

data/lib/i18n/tasks/scanners/ruby_ast_scanner.rb

@@ -68,8 +68,7 @@ module I18n::Tasks::Scanners
     def comments_to_occurences(path, ast, comments)
       magic_comments = comments.select { |comment| comment.text =~ MAGIC_COMMENT_PREFIX }
       comment_to_node = Parser::Source::Comment.associate_locations(ast, magic_comments).tap do |h|
-        # transform_values is only available in ActiveSupport 4.2+
-        h.each { |k, v| h[k] = v.first }
+        h.transform_values!(&:first)
       end.invert
 
       magic_comments.flat_map do |comment|

data/lib/i18n/tasks/scanners/ruby_key_literals.rb

@@ -15,12 +15,12 @@ module I18n::Tasks::Scanners
     # @param literal [String] e.g: "key", 'key', or :key.
     # @return [String] key
     def strip_literal(literal)
-      literal = literal[1..-1] if literal[0] == ':'
+      literal = literal[1..] if literal[0] == ':'
       literal = literal[1..-2] if literal[0] == "'" || literal[0] == '"'
       literal
     end
 
-    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž\/])/.freeze
+    VALID_KEY_CHARS = %r{(?:[[:word:]]|[-.?!:;À-ž/])}.freeze
     VALID_KEY_RE    = /^#{VALID_KEY_CHARS}+$/.freeze
 
     def valid_key?(key)

data/lib/i18n/tasks/split_key.rb

@@ -20,7 +20,7 @@ module I18n
           parts << part
           pos += part.length + 1
           if parts.length + 1 >= max
-            parts << key[pos..-1] unless pos == key.length
+            parts << key[pos..] unless pos == key.length
             break
           end
         end

data/lib/i18n/tasks/translators/base_translator.rb

@@ -114,7 +114,7 @@ module I18n::Tasks
 
         values = untranslated.scan(INTERPOLATION_KEY_RE)
         translated.gsub(/#{Regexp.escape(UNTRANSLATABLE_STRING)}\d+/i) do |m|
-          values[m[UNTRANSLATABLE_STRING.length..-1].to_i]
+          values[m[UNTRANSLATABLE_STRING.length..].to_i]
         end
       rescue StandardError => e
         raise_interpolation_error(untranslated, translated, e)

data/lib/i18n/tasks/translators/deepl_translator.rb

@@ -71,11 +71,11 @@ module I18n::Tasks::Translators
       version = @i18n_tasks.translation_config[:deepl_version]
       fail ::I18n::Tasks::CommandError, I18n.t('i18n_tasks.deepl_translate.errors.no_api_key') if api_key.blank?
 
-      DeepL.configure { |config|
+      DeepL.configure do |config|
         config.auth_key = api_key
         config.host = host unless host.blank?
         config.version = version unless version.blank?
-      }
+      end
     end
   end
 end

data/lib/i18n/tasks/used_keys.rb

@@ -178,7 +178,7 @@ module I18n::Tasks
           braces << '{'
         end
       end
-      result << key[scanner.pos..-1] unless scanner.eos?
+      result << key[scanner.pos..] unless scanner.eos?
       result.join
     end
   end

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '1.0.9'
+    VERSION = '1.0.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - glebm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,12 +157,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,26 +173,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 0.58.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -224,14 +224,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -414,6 +414,7 @@ licenses:
 - MIT
 metadata:
   issue_tracker: https://github.com/glebm/i18n-tasks
+  rubygems_mfa_required: 'true'
 post_install_message: |
   # Install default configuration:
   cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/