i18n-tasks 0.9.28 → 0.9.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf654e97c52cba1413c10e69c12510ed9ce438e2fabf089bdb05b38ac944c5c
-  data.tar.gz: 7d3d264ca3a630497da4c7c5fc48907cf22c55bd0f16ac51bffed22febb540f4
+  metadata.gz: 955b0b27ee0885fa2860b00848054c1367098e38905fce60ece6f67f35051f78
+  data.tar.gz: f2e2cd7f950bad6420f831e598a2004f280cf214caf8eab4f046963df47a1ab0
 SHA512:
-  metadata.gz: 2fd90385cd85755fcb9ef3f53a1a21f09a6ac217d8f9153871ade1cd38a155dbd2eb585a2ac0b059938b07b50578949c2291012fb97b4c1169a470b1ee59d84c
-  data.tar.gz: de5ee6c4256599189f4934b97595364d39b242e4645ac017c59ea2f2a172296628340b53bbcd2b54df0657bbddd92fe0e8bee69f980e915b1a286a025eff8b78
+  metadata.gz: 71b276f4b5f20d6c111d1a3078d793d61a22bb4695362c1efbda80c4cb92f93fc59a221e6d5ee6fe48d1601b9eebbf74bc94e66bc8f84dd0549dc92af37ac16e
+  data.tar.gz: 5a17f8014105c81d9dfe858c5d7f64735e00617455d339cccfbd9fe3a28eca71c2fb527c9117794563be89252260d365b9e4bb09a1f1dde591b00cefca60d849

data/README.md

@@ -22,7 +22,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', '~> 0.9.28'
+gem 'i18n-tasks', '~> 0.9.29'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -45,7 +45,7 @@ $ cp $(i18n-tasks gem-path)/templates/minitest/i18n_test.rb test/
 
 ## Usage
 
-Run `i18n-tasks` to get the list of all the tasks with short descriptions.
+Run `bundle exec i18n-tasks` to get the list of all the tasks with short descriptions.
 
 ### Check health
 
@@ -324,6 +324,16 @@ A special syntax similar to file glob patterns is used throughout i18n-tasks to
 |      `:`     | matches a single key                                      |
 |   `{a, b.c}` | match any in set, can use `:` and `*`, match is captured  |
 
+Example of usage:
+
+```sh
+$ bundle exec i18n-tasks mv "{:}.contents.{*}_body" "\1.attributes.\2.body"
+
+car.contents.name_body ⮕ car.attributes.name.body
+car.contents.description_body ⮕ car.attributes.description.body
+truck.contents.name_body ⮕ truck.attributes.name.body
+truck.contents.description_body ⮕ truck.attributes.description.body
+```
 
 #### Custom adapters
 

data/i18n-tasks.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
 TEXT
   s.post_install_message = <<~TEXT
     # Install default configuration:
-    cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
+    cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
     # Add an RSpec for missing and unused keys:
-    cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
+    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=)
@@ -43,7 +43,7 @@ TEXT
   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', '~> 1.3'
+  s.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
   s.add_development_dependency 'deepl-rb', '>= 2.1.0'
   s.add_development_dependency 'easy_translate', '>= 0.5.1'
   s.add_development_dependency 'rake'

data/lib/i18n/tasks.rb

@@ -68,8 +68,3 @@ require 'i18n'
 Dir[File.join(I18n::Tasks.gem_path, 'config', 'locales', '*.yml')].each do |locale_file|
   I18n.config.load_path << locale_file
 end
-
-# Load pluralization data
-require 'rails-i18n'
-I18n.enforce_available_locales = false
-RailsI18n::Railtie.add('rails/pluralization/*.rb')

data/lib/i18n/tasks/command/commands/usages.rb

@@ -40,10 +40,16 @@ module I18n::Tasks
         cmd :remove_unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.remove_unused'),
-            args: %i[locales out_format strict keep_order confirm]
+            args: %i[locales out_format strict keep_order confirm pattern]
 
-        def remove_unused(opt = {})
+        def remove_unused(opt = {}) # rubocop:disable Metrics/AbcSize
           unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))
+
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            unused_keys = unused_keys.select_keys { |full_key, _node| full_key =~ pattern_re }
+          end
+
           if unused_keys.present?
             terminal_report.unused_keys(unused_keys)
             confirm_remove_unused!(unused_keys, opt)

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

@@ -11,6 +11,7 @@ module I18n::Tasks::Data::Tree
   # siblings' keys are unique
   class Siblings < Nodes # rubocop:disable Metrics/ClassLength
     include ::I18n::Tasks::SplitKey
+    include ::I18n::Tasks::PluralKeys
 
     attr_reader :parent, :key_to_node
 
@@ -100,12 +101,12 @@ module I18n::Tasks::Data::Tree
             key: key_part,
             parent: parent,
             children: [],
-            warn_about_add_children_to_leaf: @warn_add_children_to_leaf
+            warn_about_add_children_to_leaf: @warn_about_add_children_to_leaf
           )
           append! child
         end
         unless child.children
-          warn_add_children_to_leaf child if @warn_about_add_children_to_leaf
+          conditionally_warn_add_children_to_leaf(child, [])
           child.children = []
         end
         child.children.set rest, node
@@ -187,7 +188,7 @@ module I18n::Tasks::Data::Tree
           if our.children
             our.children.merge!(node.children)
           else
-            warn_add_children_to_leaf our
+            conditionally_warn_add_children_to_leaf(our, node.children)
             our.children = node.children
           end
         elsif on_leaves_merge
@@ -228,6 +229,13 @@ module I18n::Tasks::Data::Tree
       end
     end
 
+    def conditionally_warn_add_children_to_leaf(node, children)
+      return unless @warn_about_add_children_to_leaf
+      return if plural_forms?(children)
+
+      warn_add_children_to_leaf(node)
+    end
+
     def warn_add_children_to_leaf(node)
       ::I18n::Tasks::Logging.log_warn "'#{node.full_key}' was a leaf, now has children (value <- scope conflict)"
     end

data/lib/i18n/tasks/missing_keys.rb

@@ -58,8 +58,8 @@ module I18n::Tasks
 
     def missing_plural_forest(locales, _base = base_locale)
       locales.each_with_object(empty_forest) do |locale, forest|
-        next unless I18n.exists?(:'i18n.plural.keys', locale)
-        required_keys = Set.new(I18n.t(:'i18n.plural.keys', locale: locale, resolve: false))
+        required_keys = required_plural_keys_for_locale(locale)
+        next if required_keys.empty?
         tree = empty_forest
         plural_nodes data[locale] do |node|
           children = node.children
@@ -76,6 +76,23 @@ module I18n::Tasks
       end
     end
 
+    def required_plural_keys_for_locale(locale)
+      @plural_keys_for_locale ||= {}
+      return @plural_keys_for_locale[locale] if @plural_keys_for_locale.key?(locale)
+      @plural_keys_for_locale[locale] =
+        begin
+          Set.new(load_rails_i18n_pluralization!(locale)[locale.to_sym][:i18n][:plural][:keys])
+        rescue SystemCallError, IOError
+          Set.new
+        end
+    end
+
+    # Loads rails-i18n pluralization config for the given locale.
+    def load_rails_i18n_pluralization!(locale)
+      path = File.join(Gem::Specification.find_by_name('rails-i18n').gem_dir, 'rails', 'pluralization', "#{locale}.rb")
+      eval(File.read(path), binding, path) # rubocop:disable Security/Eval
+    end
+
     # keys present in compared_to, but not in locale
     def missing_diff_tree(locale, compared_to = base_locale)
       data[compared_to].select_keys do |key, _node|

data/lib/i18n/tasks/plural_keys.rb

@@ -2,8 +2,10 @@
 
 require 'set'
 module I18n::Tasks::PluralKeys
-  PLURAL_KEY_SUFFIXES = Set.new %w[zero one two few many other]
-  PLURAL_KEY_RE = /\.(?:#{PLURAL_KEY_SUFFIXES.to_a * '|'})$/
+  # Ref: http://cldr.unicode.org/index/cldr-spec/plural-rules
+  CLDR_CATEGORY_KEYS = %w[zero one two few many other].freeze
+  PLURAL_KEY_SUFFIXES = Set.new CLDR_CATEGORY_KEYS
+  PLURAL_KEY_RE = /\.(?:#{CLDR_CATEGORY_KEYS * '|'})$/
 
   def collapse_plural_nodes!(tree)
     tree.leaves.map(&:parent).compact.uniq.each do |node|

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

@@ -14,11 +14,13 @@ module I18n::Tasks::Scanners
 
     TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:ranslate)?/
     IGNORE_LINES = {
-      'opal' => /^\s*#(?!\si18n-tasks-use)/,
-      'haml' => /^\s*-\s*#(?!\si18n-tasks-use)/,
-      'slim' => %r{^\s*(?:-#|/)(?!\si18n-tasks-use)},
       'coffee' => /^\s*#(?!\si18n-tasks-use)/,
-      'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/
+      'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/,
+      'es6' => %r{^\s*//(?!\si18n-tasks-use)},
+      'haml' => /^\s*-\s*#(?!\si18n-tasks-use)/,
+      'js' => %r{^\s*//(?!\si18n-tasks-use)},
+      'opal' => /^\s*#(?!\si18n-tasks-use)/,
+      'slim' => %r{^\s*(?:-#|/)(?!\si18n-tasks-use)}
     }.freeze
 
     def initialize(**args)

data/lib/i18n/tasks/used_keys.rb

@@ -25,7 +25,7 @@ module I18n::Tasks
     }.freeze
 
     ALWAYS_EXCLUDE = %w[*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
-                        *.yml *.json *.zip *.tar.gz *.swf *.flv].freeze
+                        *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus].freeze
 
     # Find all keys in the source and return a forest with the keys in absolute form and their occurrences.
     #

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.28'
+    VERSION = '0.9.29'
   end
 end

data/templates/minitest/i18n_test.rb

@@ -23,7 +23,14 @@ class I18nTest < ActiveSupport::TestCase
     non_normalized = @i18n.non_normalized_paths
     error_message = "The following files need to be normalized:\n" \
                     "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
-                    'Please run `i18n-tasks normalize` to fix'
+                    "Please run `i18n-tasks normalize' to fix"
     assert_empty non_normalized, error_message
   end
+
+  def test_no_inconsistent_interpolations
+    inconsistent_interpolations = @i18n.inconsistent_interpolations
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Please run `i18n-tasks check-consistent-interpolations' to show them"
+    assert_empty inconsistent_interpolations, error_message
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.28
+  version: 0.9.29
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,14 +162,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: deepl-rb
   requirement: !ruby/object:Gem::Requirement
@@ -376,9 +382,9 @@ metadata:
   issue_tracker: https://github.com/glebm/i18n-tasks
 post_install_message: |
   # Install default configuration:
-  cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
+  cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
   # Add an RSpec for missing and unused keys:
-  cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
+  cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
 rdoc_options: []
 require_paths:
 - lib
@@ -393,8 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis