i18n-tasks 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a645618f76025d6f6c0e9c1e82d19cf049aa5f7a
-  data.tar.gz: b5d360c72ce14d141757a177c3f4a906ad84588d
+  metadata.gz: 3a681c4a39649fe7ca79db081a601cc2f5bb07bf
+  data.tar.gz: f515693226f21bbf07166f9087dbb5e6f8558eca
 SHA512:
-  metadata.gz: 2ec7dd16adc0fe0aba80ea32f4ba7f60d665646be16f0c58fd7f5b34a6b8e5412a55678068f1e1daf5be5c660e4a2baf9216e80be6a8bef6e8dcc000fd425d6c
-  data.tar.gz: b4f7c9a678a51534a5fdc15c3efc09e8e3ccec18de6b08246b4ae456a412c4190db148a621e6b933b6228db6193146aa9b3bbfd809500e0219c0d81280c26ed2
+  metadata.gz: adf7878cfb47362d5997d34870cb2a66c75e1487074b803ef7655d34d1f01343d4f2567150390d2155f8e061e0e9602ed3cd7778b1cd424138090bb400a24c84
+  data.tar.gz: eac041f710bdff5bd664e880bfed31ded2f6d90db6e2b53c17d3f67f4ae2fa55d40441624039c11e648da0569e8d02f3d008a377f12f7fd3162f5babcb21aa7a

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', '~> 0.9.19'
+gem 'i18n-tasks', '~> 0.9.20'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -189,7 +189,7 @@ $ i18n-tasks unused -f yaml | i18n-tasks data-remove
 
 Remove all keys in `fr` but not `en` from `fr`:
 ```console
-$ i18n-tasks missing -t diff -f yaml en | i18n-tasks tree-rename-key en fr | i18n-tasks data-remove
+$ i18n-tasks missing -t diff -f yaml en | i18n-tasks tree-mv en fr | i18n-tasks data-remove
 ```
 
 See the full list of tasks with `i18n-tasks --help`.

data/bin/i18n-tasks

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if ENV['I18N_TASKS_BIN_SIMPLECOV_COVERAGE']
-  require_relative '../spec/bin_simplecov_helper'
-end
+require_relative '../spec/bin_simplecov_helper' if ENV['I18N_TASKS_BIN_SIMPLECOV_COVERAGE']
 
 # prevent i18n gem warning
 require 'i18n'

data/config/locales/en.yml

@@ -9,6 +9,8 @@ en:
       args:
         default_text: 'Default: %{value}'
         desc:
+          all_locales: Do not expect key patterns to start with a locale, instead apply them to all
+            locales implicitly.
           confirm: Confirm automatically
           data_format: 'Data format: %{valid_text}.'
           key_pattern: Filter by key pattern (e.g. 'common.*')

data/config/locales/ru.yml

@@ -7,6 +7,7 @@ ru:
       args:
         default_text: 'По умолчанию: %{value}'
         desc:
+          all_locales: Не ожидать, что маски ключа начинаются с локали. Применять маски ко всем локалям.
           confirm: Подтвердить автоматом
           data_format: 'Формат данных: %{valid_text}. %{default_text}.'
           key_pattern: Маска ключа (например, common.*)

data/i18n-tasks.gemspec

@@ -24,10 +24,10 @@ cp $(i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
 cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
 TEXT
   s.homepage = 'https://github.com/glebm/i18n-tasks'
-  if s.respond_to?(:metadata=)
-    s.metadata = { 'issue_tracker' => 'https://github.com/glebm/i18n-tasks' }
-  end
+  s.metadata = { 'issue_tracker' => 'https://github.com/glebm/i18n-tasks' } if s.respond_to?(:metadata=)
+  # rubocop:disable Gemspec/RequiredRubyVersion
   s.required_ruby_version = '~> 2.1' if s.respond_to?(:required_ruby_version=)
+  # rubocop:enable Gemspec/RequiredRubyVersion
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
@@ -37,7 +37,7 @@ TEXT
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.1.0'
-  s.add_dependency 'easy_translate', '>= 0.5.0'
+  s.add_dependency 'easy_translate', '>= 0.5.1'
   s.add_dependency 'erubi'
   s.add_dependency 'highline', '>= 1.7.3'
   s.add_dependency 'i18n'

data/lib/i18n/tasks/cli.rb

@@ -101,9 +101,7 @@ class I18n::Tasks::CLI
 
   def allow_help_arg_first!(argv)
     # allow `i18n-tasks --help command` in addition to `i18n-tasks command --help`
-    if %w[-h --help].include?(argv[0]) && argv[1] && !argv[1].start_with?('-')
-      argv[0], argv[1] = argv[1], argv[0]
-    end
+    argv[0], argv[1] = argv[1], argv[0] if %w[-h --help].include?(argv[0]) && argv[1] && !argv[1].start_with?('-')
   end
 
   def parse_command!(argv)

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

@@ -14,9 +14,7 @@ module I18n::Tasks
         def health(opt = {})
           forest = i18n.data_forest(opt[:locales])
           stats  = i18n.forest_stats(forest)
-          if stats[:key_count].zero?
-            fail CommandError, t('i18n_tasks.health.no_keys_detected')
-          end
+          fail CommandError, t('i18n_tasks.health.no_keys_detected') if stats[:key_count].zero?
           terminal_report.forest_stats forest, stats
           [missing(opt), unused(opt), check_normalized(opt)].detect { |result| result == :exit_1 }
         end

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

@@ -28,7 +28,7 @@ module I18n::Tasks
             args: %i[locales out_format missing_types]
 
         def missing(opt = {})
-          forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :missing_types))
+          forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :types))
           print_forest forest, opt, :missing_keys
           :exit_1 unless forest.empty?
         end

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

@@ -59,16 +59,21 @@ module I18n::Tasks
           print_forest forest, opt
         end
 
+        arg :all_locales,
+            '-a',
+            '--all-locales',
+            t('i18n_tasks.cmd.args.desc.all_locales')
+
         cmd :tree_mv,
             pos: 'FROM_KEY_PATTERN TO_KEY_PATTERN [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_mv_key'),
-            args: [:data_format]
+            args: %i[data_format all_locales]
         def tree_mv(opt = {})
           fail CommandError, 'requires FROM_KEY_PATTERN and TO_KEY_PATTERN' if opt[:arguments].size < 2
           from_pattern = opt[:arguments].shift
           to_pattern = opt[:arguments].shift
           forest = forest_pos_or_stdin!(opt)
-          forest.mv_key!(compile_key_pattern(from_pattern), to_pattern, root: false)
+          forest.mv_key!(compile_key_pattern(from_pattern), to_pattern, root: !opt[:'all-locales'])
           print_forest forest, opt
         end
 

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

@@ -63,9 +63,7 @@ module I18n::Tasks
 
         # @return [I18n::Tasks::Data::Tree::Siblings]
         def parse_forest(src, format)
-          unless src
-            fail CommandError, I18n.t('i18n_tasks.cmd.errors.pass_forest')
-          end
+          fail CommandError, I18n.t('i18n_tasks.cmd.errors.pass_forest') unless src
           if format == 'keys'
             ::I18n::Tasks::Data::Tree::Siblings.from_key_names parse_keys(src)
           else

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

@@ -75,8 +75,12 @@ module I18n::Tasks::Data::Tree
       # TODO: support nested references better
       nodes do |node|
         next unless node.reference?
-        new_target = old_key_to_new_key[node.value.to_s]
-        node.value = new_target.to_sym if new_target
+        old_target = [(node.root.key if root), node.value.to_s].compact.join('.')
+        new_target = old_key_to_new_key[old_target]
+        if new_target
+          new_target = new_target.sub(/\A[^.]*\./, '') if root
+          node.value = new_target.to_sym
+        end
       end
       remove_nodes_and_emptied_ancestors! moved_nodes
       merge! moved_forest
@@ -315,12 +319,8 @@ module I18n::Tasks::Data::Tree
       private
 
       def parse_parent_opt!(opts)
-        if opts[:parent_key]
-          opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(key: opts[:parent_key])
-        end
-        if opts[:parent_attr]
-          opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(opts[:parent_attr])
-        end
+        opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(key: opts[:parent_key]) if opts[:parent_key]
+        opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(opts[:parent_attr]) if opts[:parent_attr]
         if opts[:parent_locale]
           opts[:parent] = ::I18n::Tasks::Data::Tree::Node.new(
             key: opts[:parent_locale], data: { locale: opts[:parent_locale] }

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

@@ -178,9 +178,7 @@ module I18n::Tasks
             value_or_default_or_human_key: node_value.presence || default || human_key
           )
         end
-        if key_pattern.present?
-          pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern)
-        end
+        pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(key_pattern) if key_pattern.present?
         keys.each do |key, node| # rubocop:disable Performance/HashEachMethods
           next if pattern_re && key !~ pattern_re
           node.value = value_proc.call(node)

data/lib/i18n/tasks/google_translation.rb

@@ -38,18 +38,14 @@ module I18n::Tasks
     # @return [Array<[String, Object]>] translated list
     def fetch_google_translations(list, opts)
       from_values(list, EasyTranslate.translate(to_values(list), opts)).tap do |result|
-        if result.blank?
-          fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_results')
-        end
+        fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_results') if result.blank?
       end
     end
 
     private
 
     def validate_google_translate_api_key!(key)
-      if key.blank?
-        fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_api_key')
-      end
+      fail CommandError, I18n.t('i18n_tasks.google_translate.errors.no_api_key') if key.blank?
     end
 
     # @param [Array<[String, Object]>] list of key-value pairs

data/lib/i18n/tasks/missing_keys.rb

@@ -16,7 +16,7 @@ module I18n::Tasks
       MissingKeys.missing_keys_types
     end
 
-    # @param types [:missing_used, :missing_diff] all if `nil`.
+    # @param types [:used, :diff] all if `nil`.
     # @return [Siblings]
     def missing_keys(locales: nil, types: nil, base_locale: nil)
       locales ||= self.locales

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

@@ -7,7 +7,7 @@ module I18n
   module Tasks
     module Reports
       class Terminal < Base # rubocop:disable Metrics/ClassLength
-        def missing_keys(forest = task.missing_keys) # rubocop:disable Metrics/AbcSize
+        def missing_keys(forest = task.missing_keys)
           forest = collapse_missing_tree! forest
           if forest.present?
             print_title missing_title(forest)

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

@@ -45,6 +45,7 @@ module I18n::Tasks
           @raw_key     = raw_key
           @default_arg = default_arg
         end
+        # rubocop:enable Metrics/ParameterLists
 
         def inspect
           "Occurrence(#{@path}:#{@line_num}:#{@line_pos}:#{@pos}:#{@raw_key}:#{@default_arg})"

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

@@ -48,9 +48,7 @@ module I18n::Tasks::Scanners
       message  = send_node.children[1]
       valid_receivers = @message_receivers[message]
       # use `any?` because `include?` checks type equality, but the receiver is a Parser::AST::Node != AST::Node.
-      if valid_receivers && valid_receivers.any? { |r| r == receiver }
-        @callback.call(send_node, @method_name)
-      end
+      @callback.call(send_node, @method_name) if valid_receivers && valid_receivers.any? { |r| r == receiver }
       # always invoke handler_missing to get nested translations in children
       handler_missing send_node
       nil

data/lib/i18n/tasks/used_keys.rb

@@ -72,7 +72,6 @@ module I18n::Tasks
             if args && args[:strict]
               fail CommandError, 'the strict option is global and cannot be applied on the scanner level'
             end
-
             ActiveSupport::Inflector.constantize(class_name).new(
               config:               merge_scanner_configs(shared_options, args || {}),
               file_finder_provider: caching_file_finder_provider,

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.19'
+    VERSION = '0.9.20'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement