i18n-tasks 0.9.6 → 0.9.7

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

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

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

@@ -13,8 +13,8 @@ module I18n::Tasks
           cfg = i18n.config_for_inspect
           cfg = cfg.slice(*opts[:arguments]) if opts[:arguments].present?
           cfg = cfg.to_yaml
-          cfg.sub! /\A---\n/, ''
-          cfg.gsub! /^([^\s-].+?:)/, Term::ANSIColor.cyan(Term::ANSIColor.bold('\1'))
+          cfg.sub!(/\A---\n/, '')
+          cfg.gsub!(/^([^\s-].+?:)/, Term::ANSIColor.cyan(Term::ANSIColor.bold('\1')))
           puts cfg
         end
 

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

@@ -14,9 +14,12 @@ module I18n::Tasks
             Array,
             t('i18n_tasks.cmd.args.desc.missing_types', valid: missing_types * ', '),
             parser: OptionParsers::Enum::ListParser.new(
-                missing_types,
-                proc { |invalid, valid| I18n.t('i18n_tasks.cmd.errors.invalid_missing_type',
-                                               invalid: invalid * ', ', valid: valid * ', ', count: invalid.length) })
+              missing_types,
+              proc do |invalid, valid|
+                I18n.t('i18n_tasks.cmd.errors.invalid_missing_type',
+                       invalid: invalid * ', ', valid: valid * ', ', count: invalid.length)
+              end
+            )
 
         cmd :missing,
             pos:  '[locale ...]',
@@ -45,27 +48,22 @@ module I18n::Tasks
         cmd :add_missing,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.add_missing'),
-            args: [:locales, :out_format, arg(:value) + [{default: '%{value_or_default_or_human_key}'}],
+            args: [:locales, :out_format, arg(:value) + [{ default: '%{value_or_default_or_human_key}' }],
                    ['--nil-value', 'Set value to nil. Takes precedence over the value argument.']]
 
-        def add_missing(opt = {})
-          added   = i18n.empty_forest
-          locales = (opt[:locales] || i18n.locales)
-          value   = opt[:'nil-value'] ? nil : opt[:value]
-          if locales[0] == i18n.base_locale
-            # Merge base locale first, as this may affect the value for the other locales
-            forest = i18n.missing_keys({locales: [locales[0]]}.update(opt.slice(:types, :base_locale))).
-                set_each_value!(value)
+        def add_missing(opt = {}) # rubocop:disable Metrics/AbcSize
+          [ # Merge base locale first, as this may affect the value for the other locales
+            [i18n.base_locale] & opt[:locales],
+            opt[:locales] - [i18n.base_locale]
+          ].reject(&:empty?).each_with_object(i18n.empty_forest) do |locales, added|
+            forest = i18n.missing_keys(locales: locales, **opt.slice(:types, :base_locale))
+                         .set_each_value!(opt[:'nil-value'] ? nil : opt[:value])
             i18n.data.merge! forest
             added.merge! forest
-            locales = locales[1..-1]
+          end.tap do |added|
+            log_stderr t('i18n_tasks.add_missing.added', count: added.leaves.count)
+            print_forest added, opt
           end
-          forest = i18n.missing_keys({locales: locales}.update(opt.slice(:types, :base_locale))).
-              set_each_value!(value)
-          i18n.data.merge! forest
-          added.merge! forest
-          log_stderr t('i18n_tasks.add_missing.added', count: added.leaves.count)
-          print_forest added, opt
         end
       end
     end

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

@@ -50,8 +50,8 @@ module I18n::Tasks
           key    = arg_or_pos! :key, opt
           name   = arg_or_pos! :name, opt
           forest = forest_pos_or_stdin! opt
-          raise CommandError.new('pass full key to rename (-k, --key)') if key.blank?
-          raise CommandError.new('pass new name (-n, --name)') if name.blank?
+          fail CommandError, 'pass full key to rename (-k, --key)' if key.blank?
+          fail CommandError, 'pass new name (-n, --name)' if name.blank?
           forest.rename_each_key!(key, name)
           print_forest forest, opt
         end
@@ -76,7 +76,7 @@ module I18n::Tasks
           value       = arg_or_pos! :value, opt
           forest      = forest_pos_or_stdin!(opt)
           key_pattern = opt[:pattern]
-          raise CommandError.new('pass value (-v, --value)') if value.blank?
+          fail CommandError, 'pass value (-v, --value)' if value.blank?
           forest.set_each_value!(value, key_pattern)
           print_forest forest, opt
         end

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

@@ -16,7 +16,8 @@ module I18n::Tasks
 
         def find(opt = {})
           opt[:filter] ||= opt.delete(:pattern) || opt[:arguments].try(:first)
-          print_forest i18n.used_tree(strict: opt[:strict], key_filter: opt[:filter].presence, include_raw_references: true), opt, :used_keys
+          result = i18n.used_tree(strict: opt[:strict], key_filter: opt[:filter].presence, include_raw_references: true)
+          print_forest result, opt, :used_keys
         end
 
         cmd :unused,
@@ -54,10 +55,10 @@ module I18n::Tasks
           return if ENV['CONFIRM'] || opt[:confirm]
           locales = bold(unused_keys.flat_map { |root| root.key.split('+') }.sort.uniq * ', ')
           msg     = [
-              red(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
-              yellow(t('i18n_tasks.common.continue_q')),
-              yellow('(yes/no)')
-          ] * ' '
+            red(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
+            yellow(t('i18n_tasks.common.continue_q')),
+            yellow('(yes/no)')
+          ].join(' ')
           exit 1 unless agree msg
         end
       end

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

@@ -15,7 +15,7 @@ module I18n::Tasks
           begin
             require 'axlsx'
           rescue LoadError
-            message = %Q(For spreadsheet report please add axlsx gem to Gemfile:\ngem 'axlsx', '~> 2.0')
+            message = %(For spreadsheet report please add axlsx gem to Gemfile:\ngem 'axlsx', '~> 2.0')
             log_stderr Term::ANSIColor.red Term::ANSIColor.bold message
             exit 1
           end

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

@@ -17,8 +17,7 @@ module I18n::Tasks
         def cmd(name, conf = nil)
           if conf
             conf        = conf.dup
-            conf[:args] = (args = conf[:args]) ? args.map { |arg| Symbol === arg ? arg(arg) : arg } : []
-
+            conf[:args] = (conf[:args] || []).map { |arg| arg.is_a?(Symbol) ? arg(arg) : arg }
             dsl(:cmds)[name] = conf
           else
             dsl(:cmds)[name]

data/lib/i18n/tasks/command/option_parsers/enum.rb

@@ -4,9 +4,9 @@ module I18n::Tasks
     module OptionParsers
       module Enum
         class Parser
-          DEFAULT_ERROR = proc { |invalid, valid|
+          DEFAULT_ERROR = proc do |invalid, valid|
             I18n.t('i18n_tasks.cmd.enum_opt.invalid', invalid: invalid, valid: valid * ', ')
-          }
+          end
 
           def initialize(valid, error_message = DEFAULT_ERROR)
             @valid         = valid.map(&:to_s)
@@ -18,15 +18,15 @@ module I18n::Tasks
             if @valid.include?(value)
               value
             else
-              raise CommandError.new @error_message.call(value, @valid)
+              fail CommandError, @error_message.call(value, @valid)
             end
           end
         end
 
         class ListParser
-          DEFAULT_ERROR = proc { |invalid, valid|
+          DEFAULT_ERROR = proc do |invalid, valid|
             I18n.t('i18n_tasks.cmd.enum_list_opt.invalid', invalid: invalid * ', ', valid: valid * ', ')
-          }
+          end
 
           def initialize(valid, error_message = DEFAULT_ERROR)
             @valid         = valid.map(&:to_s)
@@ -44,7 +44,7 @@ module I18n::Tasks
                 values
               end
             else
-              raise CommandError.new @error_message.call(invalid, @valid)
+              fail CommandError, @error_message.call(invalid, @valid)
             end
           end
         end

data/lib/i18n/tasks/command/option_parsers/locale.rb

@@ -8,7 +8,7 @@ module I18n::Tasks
 
           def validate!(locale)
             if VALID_LOCALE_RE !~ locale
-              raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale))
+              fail CommandError, I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale)
             end
             locale
           end
@@ -16,6 +16,7 @@ module I18n::Tasks
 
         module Parser
           module_function
+
           extend Validator
 
           # @param [#base_locale, #locales] context
@@ -30,6 +31,7 @@ module I18n::Tasks
 
         module ListParser
           module_function
+
           extend Validator
 
           # @param [#base_locale,#locales] context

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

@@ -7,22 +7,23 @@ module I18n::Tasks
       module Data
         include Command::DSL
 
-        DATA_FORMATS = %w(yaml json keys)
-        OUT_FORMATS  = ['terminal-table', *DATA_FORMATS, 'inspect']
+        DATA_FORMATS = %w(yaml json keys).freeze
+        OUT_FORMATS  = ['terminal-table', *DATA_FORMATS, 'inspect'].freeze
 
-        format_arg = proc { |type, values|
+        format_arg = proc do |type, values|
           default = values.first
           arg type,
               '-f',
               '--format FORMAT',
               values,
-              {'yml' => 'yaml'},
+              { 'yml' => 'yaml' },
               t("i18n_tasks.cmd.args.desc.#{type}", valid_text: values * ', ', default_text: default),
               parser: OptionParsers::Enum::Parser.new(values,
-                                                     proc { |value, valid|
-                                                       I18n.t('i18n_tasks.cmd.errors.invalid_format',
-                                                              invalid: value, valid: valid * ', ') })
-        }
+                                                      proc do |value, valid|
+                                                        I18n.t('i18n_tasks.cmd.errors.invalid_format',
+                                                               invalid: value, valid: valid * ', ')
+                                                      end)
+        end
 
         # i18n-tasks-use t('i18n_tasks.cmd.args.desc.data_format')
         format_arg.call(:data_format, DATA_FORMATS)
@@ -41,7 +42,7 @@ module I18n::Tasks
             sources = []
           else
             sources = [$stdin.read]
-            num     -= 1 if num
+            num -= 1 if num
           end
           if num
             num.times { sources << args.shift }
@@ -53,14 +54,14 @@ module I18n::Tasks
         end
 
         def merge_forests_stdin_and_pos!(opt)
-          forests_stdin_and_pos!(opt).inject(i18n.empty_forest) { |result, forest|
+          forests_stdin_and_pos!(opt).inject(i18n.empty_forest) do |result, forest|
             result.merge! forest
-          }
+          end
         end
 
         def parse_forest(src, format)
-          if !src
-            raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.pass_forest'))
+          unless src
+            fail CommandError, I18n.t('i18n_tasks.cmd.errors.pass_forest')
           end
           if format == 'keys'
             ::I18n::Tasks::Data::Tree::Siblings.from_key_names parse_keys(src)
@@ -76,14 +77,14 @@ module I18n::Tasks
         def print_forest(forest, opts, version = :show_tree)
           format = opts[:format].to_s
           case format
-            when 'terminal-table'
-              terminal_report.send(version, forest)
-            when 'inspect'
-              puts forest.inspect
-            when 'keys'
-              puts forest.key_names(root: true)
-            when *DATA_FORMATS
-              puts i18n.data.adapter_dump forest.to_hash(true), format
+          when 'terminal-table'
+            terminal_report.send(version, forest)
+          when 'inspect'
+            puts forest.inspect
+          when 'keys'
+            puts forest.key_names(root: true)
+          when *DATA_FORMATS
+            puts i18n.data.adapter_dump forest.to_hash(true), format
           end
         end
       end

data/lib/i18n/tasks/command_error.rb

@@ -5,12 +5,10 @@ module I18n
     # 1. show error message of the backtrace
     # 2. exit with non-zero exit code
     class CommandError < StandardError
-
-      def initialize(error = nil, message)
+      def initialize(error = nil, message) # rubocop:disable Style/OptionalArguments
         super(message)
         set_backtrace error.backtrace if error
       end
     end
   end
 end
-

data/lib/i18n/tasks/configuration.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-module I18n::Tasks::Configuration
+module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   DEFAULTS = {
-      base_locale:     'en'.freeze,
-      internal_locale: 'en'.freeze,
-      search:          ::I18n::Tasks::UsedKeys::SEARCH_DEFAULTS,
-      data:            ::I18n::Tasks::Data::DATA_DEFAULTS
-  }
+    base_locale:     'en',
+    internal_locale: 'en',
+    search:          ::I18n::Tasks::UsedKeys::SEARCH_DEFAULTS,
+    data:            ::I18n::Tasks::Data::DATA_DEFAULTS
+  }.freeze
 
   # i18n-tasks config (defaults + config/i18n-tasks.yml)
   # @return [Hash{String => String,Hash,Array}]
@@ -14,9 +14,9 @@ module I18n::Tasks::Configuration
   end
 
   CONFIG_FILES = %w(
-      config/i18n-tasks.yml config/i18n-tasks.yml.erb
-      i18n-tasks.yml i18n-tasks.yml.erb
-  )
+    config/i18n-tasks.yml config/i18n-tasks.yml.erb
+    i18n-tasks.yml i18n-tasks.yml.erb
+  ).freeze
 
   def file_config
     file   = CONFIG_FILES.detect { |f| File.exist?(f) }
@@ -24,7 +24,7 @@ module I18n::Tasks::Configuration
     if config.present?
       config.with_indifferent_access.tap do |c|
         if c[:relative_roots]
-          warn_deprecated 'config/i18n-tasks.yml has relative_roots on top level. Please move relative_roots under search.'
+          warn_deprecated 'Please move relative_roots under search in config/i18n-tasks.yml.'
           c[:search][:relative_roots] = c.delete(:relative_roots)
         end
       end
@@ -44,8 +44,8 @@ module I18n::Tasks::Configuration
   def data_config
     @config_sections[:data] ||= begin
       {
-          adapter: data.class.name,
-          config:  data.config
+        adapter: data.class.name,
+        config:  data.config
       }
     end
   end
@@ -54,7 +54,7 @@ module I18n::Tasks::Configuration
   # @return [Hash{String => String,Hash,Array}]
   def translation_config
     @config_sections[:translation] ||= begin
-      conf           = (config[:translation] || {}).with_indifferent_access
+      conf = (config[:translation] || {}).with_indifferent_access
       conf[:api_key] ||= ENV['GOOGLE_TRANSLATE_API_KEY'] if ENV.key?('GOOGLE_TRANSLATE_API_KEY')
       conf
     end
@@ -71,11 +71,21 @@ module I18n::Tasks::Configuration
   end
 
   def internal_locale
-    @config_sections[:internal_locale] ||= (config[:internal_locale] || DEFAULTS[:internal_locale]).to_s
+    @config_sections[:internal_locale] ||= begin
+      internal_locale = (config[:internal_locale] || DEFAULTS[:internal_locale]).to_s
+      valid_locales = Dir[File.join(I18n::Tasks.gem_path, 'config', 'locales', '*.yml')]
+                      .map { |f| File.basename(f, '.yml') }
+      unless valid_locales.include?(internal_locale)
+        log_warn "invalid internal_locale #{internal_locale.inspect}. "\
+                 "Available internal locales: #{valid_locales * ', '}."
+        internal_locale = DEFAULTS[:internal_locale].to_s
+      end
+      internal_locale
+    end
   end
 
   def ignore_config(type = nil)
-    key                   = type ? "ignore_#{type}" : 'ignore'
+    key = type ? "ignore_#{type}" : 'ignore'
     @config_sections[key] ||= config[key]
   end
 
@@ -96,25 +106,25 @@ module I18n::Tasks::Configuration
   end
 
   def config_for_inspect
-    to_hash_from_indifferent(config_sections.reject { |k, v| v.blank? }).tap do |sections|
+    to_hash_from_indifferent(config_sections.reject { |_k, v| v.blank? }).tap do |sections|
       sections.each do |_k, section|
-        section.merge! section.delete('config') if Hash === section && section.key?('config')
+        section.merge! section.delete('config') if section.is_a?(Hash) && section.key?('config')
       end
     end
   end
 
   private
 
-  def to_hash_from_indifferent(v)
-    case v
-      when Hash
-        v.stringify_keys.to_hash.tap do |h|
-          h.each { |k, v| h[k] = to_hash_from_indifferent(v) if Hash === v || Array === v }
-        end
-      when Array
-        v.map { |e| to_hash_from_indifferent e }
-      else
-        v
+  def to_hash_from_indifferent(value)
+    case value
+    when Hash
+      value.stringify_keys.to_hash.tap do |h|
+        h.each { |k, v| h[k] = to_hash_from_indifferent(v) if v.is_a?(Hash) || v.is_a?(Array) }
+      end
+    when Array
+      value.map { |e| to_hash_from_indifferent e }
+    else
+      value
     end
   end
 end

data/lib/i18n/tasks/console_context.rb

@@ -27,14 +27,15 @@ module I18n::Tasks
 
     module Messages
       include Term::ANSIColor
-      extend self
+
+      module_function
 
       def banner
         bold("i18n-tasks v#{I18n::Tasks::VERSION} IRB") + "\nType #{green 'guide'} to learn more"
       end
 
       def guide
-        green(bold "i18n-tasks IRB Quick Start guide") + "\n" + <<-TEXT
+        green(bold('i18n-tasks IRB Quick Start guide')) + "\n" + <<-TEXT
 #{yellow 'Data as trees'}
   tree(locale)
   used_tree(key_filter: nil, strict: nil)

data/lib/i18n/tasks/data.rb

@@ -4,15 +4,16 @@ require 'i18n/tasks/data/file_system'
 module I18n::Tasks
   module Data
     DATA_DEFAULTS = {
-        adapter: 'I18n::Tasks::Data::FileSystem'
-    }
+      adapter: 'I18n::Tasks::Data::FileSystem'
+    }.freeze
 
     # I18n data provider
     # @see I18n::Tasks::Data::FileSystem
     def data
       @data ||= begin
         data_config = (config[:data] || {}).deep_symbolize_keys
-        data_config.merge!(base_locale: base_locale, locales: config[:locales])
+        data_config[:base_locale] = base_locale
+        data_config[:locales] = config[:locales]
         adapter_class = data_config[:adapter].presence || data_config[:class].presence || DATA_DEFAULTS[:adapter]
         adapter_class = adapter_class.to_s
         adapter_class = 'I18n::Tasks::Data::FileSystem' if adapter_class == 'file_system'
@@ -59,7 +60,7 @@ module I18n::Tasks
 
     # write to store, normalizing all data
     def normalize_store!(from = nil, pattern_router = false)
-      from   = self.locales unless from
+      from   = locales unless from
       router = pattern_router ? ::I18n::Tasks::Data::Router::PatternRouter.new(data, data.config) : data.router
       data.with_router(router) do
         Array(from).each do |target_locale|