i18n-tasks 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1adbf899220bdaffacd8f8b95f74eb2c102268a6
-  data.tar.gz: 028937e7d90a8af43ad66497a0b3f869c52fb599
+  metadata.gz: 1da0127b4f5d5823790e0b3e95609d72bc5d89ce
+  data.tar.gz: 4b3444adf44532e8c4cfa4906658f23f95f385c3
 SHA512:
-  metadata.gz: 16ee9ac1ea60d4ed1d04881d9c40fdc88478c16c9d0471d8b94d31a77a2a44e915b4236ad8d13a7c3517d40e7179ff9909c5215f828b8d193b19b61b59ee0747
-  data.tar.gz: 025e2fee7f5590377e4b8ddfb2cec98256e45ff120ef5219d545064d745a23430b15cd071683edf0aa44618e22cdb3b78073be13c1c64a826e18e958db5cc4b7
+  metadata.gz: 7d914cabb6ace1ccf7f1eebf8dd68cd885a8929713edc095aebb7073e771cf06bb0ddcce78e1ff6df51562bc68ee11d8e6b1110f3120ad6d3093f985ae44fcb2
+  data.tar.gz: 2b8add28adae0c70a297e253dd104bc5877f95a68c4b5d16038f99d313b088b6268da15ca6e052e099be69308cfd2b758428ba276e64d94fdfb6e8cad6fbe2af

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.7.2
+
+* i18n-tasks now analyses itself! `internal_locale` setting has been added, that controls i18n-tasks reporting language.
+English and Russian are available in this release.
+
 ## 0.7.1
 
 * 1.9.3 compatibility

data/README.md

@@ -25,7 +25,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add to Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.1'
+gem 'i18n-tasks', '~> 0.7.2'
 ```
 
 Copy default [configuration file](#configuration) (optional):
@@ -137,12 +137,12 @@ $ i18n-tasks normalize -p
 Relative keys (`t '.title'`) and plural keys (`key.{one,many,other,...}`) are fully supported.
 Scope argument is supported, but only when it is the first keyword argument ([improvements welcome](/lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb)):
 
-    ```ruby
-    # this is supported
-    t :invalid, scope: [:auth, :password], attempts: 5
-    # but not this
-    t :invalid, attempts: 5, scope: [:auth, :password]
-    ```
+```ruby
+# this is supported
+t :invalid, scope: [:auth, :password], attempts: 5
+# but not this
+t :invalid, attempts: 5, scope: [:auth, :password]
+```
 
 Unused report will detect certain dynamic key forms and not report them, e.g.:
 
@@ -175,6 +175,12 @@ base_locale: en
 locales: [es, fr] # This includes base_locale by default
 ```
 
+`internal_locale` controls the language i18n-tasks reports in. Locales available are `en` and `ru` (pull request to add more!).
+
+```yaml
+internal_locale: en
+```
+
 ### Storage
 
 The default data adapter supports YAML and JSON files.

data/bin/i18n-tasks

@@ -22,21 +22,23 @@ err = proc { |message, exit_code|
 }
 
 begin
-  ran = false
+  ran       = false
   commander = ::I18n::Tasks::Commands
+  instance  = commander.new
+  instance.set_internal_locale!
   slop_adapter = ::I18n::Tasks::SlopCommand
-  args = ARGV.dup
-  args = ['--help'] if args.empty?
+  args         = ARGV.dup
+  args         = ['--help'] if args.empty?
   Slop.parse(args, help: true) do
     on('-v', '--version', 'Print the version') {
       puts I18n::Tasks::VERSION
       exit
     }
     commander.cmds.each do |name, attr|
-      slop_dsl = slop_adapter.slop_command(name, attr) { |name, opts, args|
+      slop_dsl = slop_adapter.slop_command(name, attr) { |name, opts|
         begin
           ran = true
-          commander.run_command name, slop_adapter.parse_slop_opts_args(opts, args)
+          instance.safe_run name, opts
         rescue Errno::EPIPE
           # ignore Errno::EPIPE which is throw when pipe breaks, e.g.:
           # i18n-tasks missing | head

data/config/i18n-tasks.yml

@@ -5,6 +5,9 @@ base_locale: en
 ## uncomment to set locales explicitly
 # locales: [en, es, fr]
 
+## i18n-tasks report locale, default: en, available: en, ru
+internal_locale: ru
+
 # Read and write locale data
 data:
   ## by default, translation data are read from the file system, or you can provide a custom data adapter

data/config/locales/en.yml

@@ -66,26 +66,32 @@ en:
         config: display i18n-tasks configuration
         gem_path: show path to the gem
         irb: start REPL session within i18n-tasks context
+        xlsx_report: save missing and unused translations to an Excel file
       args:
         default_text: 'Default: %{value}'
+        default_all: 'Default: all'
         desc:
           out_format: 'Output format: %{valid_text}. %{default_text}.'
           data_format: 'Data format: %{valid_text}. %{default_text}.'
           keys: List of keys separated by commas (,), spaces, or newlines.
           locales_filter: 'Comma-separated list of locale(s) to process. Default: all. Special: base.'
+          locales_to_translate_from: 'Locale to translate from (default: base)'
           locale: 'Locale. Default: base'
           confirm: Confirm automatically
           nostdin: Do not read from stdin
           strict: Do not infer dynamic key usage such as `t("category.\#{category.name}")`
-          missing_types: 'Filter by types: %{valid}.'
+          missing_types: 'Filter by types: %{valid}. Default: all'
           key_pattern: Filter by key pattern (e.g. 'common.*')
+          key_pattern_to_rename: Full key (pattern) to rename. Required
+          new_key_name: New name, interpolates original name as %{key}. Required
           value: 'Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}'
           pattern_router: 'Use pattern router: keys moved per config data.write'
       enum_opt:
-        desc:
-          default: "%{valid_text}. %{default_text}"
-        invalid_one: "%{invalid} is not one of: %{valid}."
-        invalid_list: "%{invalid} is not in: %{valid}."
+        desc: "%{valid_text}. %{default_text}"
+        invalid: "%{invalid} is not one of: %{valid}."
+      enum_list_opt:
+        desc: 'Comma-separated list of: %{valid_text}. %{default_text}'
+        invalid: "%{invalid} is not in: %{valid}."
       errors:
         pass_forest: Pass locale forest
         invalid_locale: Invalid locale %{invalid}

data/config/locales/ru.yml

@@ -0,0 +1,102 @@
+---
+ru:
+  i18n_tasks:
+    common:
+      locale: "Язык"
+      type: "Тип"
+      key: "Ключ"
+      value: "Значение"
+      base_value: "Исходное значение"
+      details: "Детали"
+      continue_q: "Продолжить?"
+      n_more: "ещё %{count}"
+    google_translate:
+      errors:
+        no_results: Google Translate не дал результатов. Убедитесь в том, что платежная информация
+          добавлена в в https://code.google.com/apis/console.
+    remove_unused:
+      confirm:
+        one: "Один перевод будут удалён из %{locales}."
+        other: "Переводы (%{count}) будут удалены из %{locales}."
+      removed: "Удалены ключи (%{count})"
+      noop: "Нет неиспользуемых ключей"
+    translate_missing:
+      translated: "Переведены ключи (%{count})"
+    add_missing:
+      added: "Добавлены ключи (%{count})"
+    unused:
+      none: "Все переводы используются."
+    missing:
+      none: "Всё переведено."
+    usages:
+      none: "Не найдено использований."
+    health:
+      no_keys_detected: "Ключи не обнаружены. Проверьте data.read в config/i18n-tasks.yml."
+    data_stats:
+      title: "Данные (%{locales}):"
+      text: "%{key_count} ключей в %{locale_count} языках. В среднем, длина строки: %{value_chars_avg},
+        сегменты ключей: %{key_segments_avg}, ключей в языке %{per_locale_avg}."
+      text_single_locale: "%{key_count} ключей. В среднем, длина строки: %{value_chars_avg}, сегменты
+        ключей: %{key_segments_avg}."
+    cmd:
+      encourage:
+      - "Хорошая работа!"
+      - "Отлично!"
+      - "Прекрасно!"
+      desc:
+        normalize: "нормализовать файлы переводов (сортировка и распределение)"
+        data: "показать данные переводов"
+        data_merge: "добавить дерево к переводам"
+        data_write: "заменить переводы деревом"
+        data_remove: "удалить ключи, которые есть в дереве, из данных"
+        health: "Всё ОК?"
+        find: "показать, где ключи используются в коде"
+        unused: "показать неиспользуемые переводы"
+        missing: "показать недостающие переводы"
+        translate_missing: "перевести недостающие переводы с Google Translate"
+        add_missing: "добавить недостающие ключи к переводам"
+        remove_unused: "удалить неиспользуемые ключи"
+        eq_base: "показать переводы, равные значениям в основном языке"
+        tree_merge: "объединенить деревья"
+        tree_filter: "фильтровать дерево по ключу"
+        tree_rename_key: "переименовать узел дерева"
+        tree_subtract: "дерево A минус ключи в дереве B"
+        tree_set_value: "заменить значения ключей"
+        tree_convert: "преобразовать дерево между форматами"
+        config: "показать конфигурацию"
+        gem_path: "показать путь к ruby gem"
+        irb: "начать REPL сессию в контексте i18n-tasks"
+        xlsx_report: "сохранить недостающие и неиспользуемые переводы в Excel-файл"
+      args:
+        default_text: "По умолчанию: %{value}"
+        default_all: "По умолчанию: все"
+        desc:
+          out_format: "Формат вывода: %{valid_text}. %{default_text}."
+          data_format: "Формат данных: %{valid_text}. %{default_text}."
+          keys: "Список ключей, разделенных запятыми (,), пробелами или символами новой строки."
+          locales_filter: "Список языков для обработки, разделенный запятыми (,). По умолчанию: все.
+            Специальное значение: base."
+          locales_to_translate_from: "Язык с которого переводить (по умолчанию: base)"
+          locale: "Язык. По умолчанию: base"
+          confirm: "Подтвердить автоматом"
+          nostdin: "Не читать дерево из стандартного ввода"
+          strict: Не угадывать динамические использования ключей, например `t("category.#{category.key}")`
+          missing_types: "Типы недостающих переводов: %{valid}. По умолчанию: все"
+          key_pattern: "Маска ключа (например, common.*)"
+          key_pattern_to_rename: "Полный ключ (шаблон) для переименования. Необходимый параметр."
+          new_key_name: "Новое имя, интерполирует оригинальное название как %{key}. Необходимый параметр."
+          value: "Значение, интерполируется с %{value}, %{human_key}, %{value_or_human_key}"
+          pattern_router: "Использовать pattern_router: ключи распределятся по файлам согласно data.write"
+      enum_opt:
+        desc: "%{valid_text}. %{default_text}"
+        invalid: "%{invalid} не является одним из: %{valid}."
+      enum_list_opt:
+        desc: "Разделенных запятыми список: %{valid_text}. %{default_text}"
+        invalid: "%{invalid} не в: %{valid}."
+      errors:
+        pass_forest: "Передайте дерево"
+        invalid_locale: "Неверный язык %{invalid}"
+        invalid_format: "Неизвестный формат %{invalid}. Форматы: %{valid}."
+        invalid_missing_type:
+          one: "Неизвестный тип %{invalid}. Типы: %{valid}."
+          other: "Неизвестные типы: %{invalid}. Типы: %{valid}."

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

@@ -12,12 +12,6 @@ module I18n::Tasks
         @i18n = i18n
       end
 
-      def args_with_stdin(opt)
-        sources = opt[:arguments] || []
-        sources.unshift $stdin.read unless opt[:nostdin]
-        sources
-      end
-
       def safe_run(name, opts)
         begin
           coloring_was             = Term::ANSIColor.coloring?
@@ -32,16 +26,23 @@ module I18n::Tasks
         end
       end
 
-      def run(name, opts)
+      def run(name, opts = {})
+        name = name.to_sym
+        public_name = name.to_s.tr '_', '-'
+        SlopCommand.parse_opts! opts, self.class.cmds[name][:opt], self
         if opts.empty?
-          log_verbose "run #{name.tr('_', '-')} without arguments"
+          log_verbose "run #{public_name} without arguments"
           send name
         else
-          log_verbose "run #{name.tr('_', '-')} with #{opts.map { |k, v| "#{k}=#{v}" } * ' '}"
+          log_verbose "run #{public_name} with #{opts.map { |k, v| "#{k}=#{v}" } * ' '}"
           send name, opts
         end
       end
 
+      def set_internal_locale!
+        I18n.locale = i18n.internal_locale
+      end
+
       protected
 
       def terminal_report
@@ -52,12 +53,6 @@ module I18n::Tasks
         @spreadsheet_report ||= I18n::Tasks::Reports::Spreadsheet.new(i18n)
       end
 
-      class << self
-        def run_command(name, opts)
-          ::I18n::Tasks::Commands.new.safe_run(name, opts)
-        end
-      end
-
       def desc(name)
         self.class.cmds.try(:[], name).try(:desc)
       end

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

@@ -7,38 +7,34 @@ module I18n::Tasks
         cmd_opt :pattern_router, {
             short: :p,
             long:  :pattern_router,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.pattern_router'),
+            desc: proc { I18n.t('i18n_tasks.cmd.args.desc.pattern_router') },
             conf:  {argument: false, optional: true}
         }
 
         cmd :normalize,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.normalize'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.normalize') },
             opt:  cmd_opts(:locales, :pattern_router)
 
         def normalize(opt = {})
-          opt_locales! opt
           i18n.normalize_store! opt[:locales], opt[:pattern_router]
         end
 
         cmd :data,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.data'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.data') },
             opt:  cmd_opts(:locales, :out_format)
 
         def data(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
           print_forest i18n.data_forest(opt[:locales]), opt
         end
 
         cmd :data_merge,
             args: '[tree ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.data_merge'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_merge') },
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_merge(opt = {})
-          opt_data_format! opt
           forest = opt_forests_merged_stdin_args!(opt)
           merged = i18n.data.merge!(forest)
           print_forest merged, opt
@@ -46,11 +42,10 @@ module I18n::Tasks
 
         cmd :data_write,
             args: '[tree]',
-            desc: I18n.t('i18n_tasks.cmd.desc.data_write'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_write') },
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_write(opt = {})
-          opt_data_format! opt
           forest = opt_forest_arg_or_stdin!(opt)
           i18n.data.write forest
           print_forest forest, opt
@@ -58,11 +53,10 @@ module I18n::Tasks
 
         cmd :data_remove,
             args: '[tree]',
-            desc: I18n.t('i18n_tasks.cmd.desc.data_remove'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_remove') },
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_remove(opt = {})
-          opt_data_format! opt
           removed = i18n.data.remove_by_key!(opt_forest_arg_or_stdin!(opt))
           log_stderr 'Removed:'
           print_forest removed, opt

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

@@ -6,12 +6,10 @@ module I18n::Tasks
 
         cmd :eq_base,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.eq_base'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.eq_base') },
             opt:  cmd_opts(:locales, :out_format)
 
         def eq_base(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
           print_forest i18n.eq_base_keys(opt), opt, :eq_base_keys
         end
       end

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

@@ -6,11 +6,10 @@ module I18n::Tasks
 
         cmd :health,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.health'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.health') },
             opt:  cmd_opts(:locales, :out_format)
 
         def health(opt = {})
-          opt_locales! opt
           forest = i18n.data_forest(opt[:locales])
           stats  = i18n.forest_stats(forest)
           if stats[:key_count].zero?

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :config,
             args: '[section ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.config')
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.config') }
 
         def config(opts = {})
           cfg = i18n.config_for_inspect
@@ -17,7 +17,7 @@ module I18n::Tasks
           puts cfg
         end
 
-        cmd :gem_path, desc: I18n.t('i18n_tasks.cmd.desc.gem_path')
+        cmd :gem_path, desc: proc { I18n.t('i18n_tasks.cmd.desc.gem_path') }
 
         def gem_path
           puts I18n::Tasks.gem_path

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

@@ -4,38 +4,31 @@ module I18n::Tasks
       module Missing
         include Command::Collection
 
-        cmd_opt :missing_types, {
-            short: :t,
-            long:  :types=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.missing_types', valid: I18n::Tasks::MissingKeys.missing_keys_types * ', '),
-            conf:  {as: Array, delimiter: /\s*[+:,]\s*/}
-        }
-
-        DEFAULT_ADD_MISSING_VALUE = '%{value_or_human_key}'
+        enum_opt :missing_types, I18n::Tasks::MissingKeys.missing_keys_types
+        cmd_opt :missing_types, enum_list_opt_attr(
+            :t, :types=, enum_opt(:missing_types),
+            proc { |valid, default| I18n.t('i18n_tasks.cmd.args.desc.missing_types', valid: valid, default: default) },
+            proc { |invalid, valid| I18n.t('i18n_tasks.cmd.errors.invalid_missing_type', invalid: invalid * ', ', valid: valid * ', ', count: invalid.length) })
 
         cmd :missing,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.missing'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.missing') },
             opt:  cmd_opts(:locales, :out_format, :missing_types)
 
         def missing(opt = {})
-          opt_locales!(opt)
-          opt_output_format!(opt)
-          opt_missing_types!(opt)
           print_forest i18n.missing_keys(opt), opt, :missing_keys
         end
 
         cmd :translate_missing,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.translate_missing'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.translate_missing') },
             opt:  [cmd_opt(:locales),
-                   cmd_opt(:locale).merge(short: :f, long: :from=, desc: 'Locale to translate from (default: base)'),
+                   cmd_opt(:locale).merge(short: :f, long: :from=, desc: proc {
+                     I18n.t('i18n_tasks.cmd.args.desc.locales_to_translate_from') }),
                    cmd_opt(:out_format).except(:short)]
 
         def translate_missing(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
-          from       = opt_locale! opt, :from
+          from       = opt[:from]
           translated = (opt[:locales] - [from]).inject i18n.empty_forest do |result, locale|
             result.merge! i18n.google_translate_forest i18n.missing_tree(locale, from), from, locale
           end
@@ -44,29 +37,20 @@ module I18n::Tasks
           print_forest translated, opt
         end
 
+        DEFAULT_ADD_MISSING_VALUE = '%{value_or_human_key}'
+
         cmd :add_missing,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.add_missing'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.add_missing') },
             opt:  cmd_opts(:locales, :out_format) <<
                       cmd_opt(:value).merge(desc: "#{cmd_opt(:value)[:desc]}. #{I18n.t('i18n_tasks.cmd.args.default_text', value: DEFAULT_ADD_MISSING_VALUE)}")
 
         def add_missing(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
           forest = i18n.missing_keys(opt).set_each_value!(opt[:value] || DEFAULT_ADD_MISSING_VALUE)
           i18n.data.merge! forest
           log_stderr I18n.t('i18n_tasks.add_missing.added', count: forest.leaves.count)
           print_forest forest, opt
         end
-
-        private
-
-        def opt_missing_types!(opt)
-          parse_enum_list_opt(opt[:types], I18n::Tasks::MissingKeys.missing_keys_types) do |invalid, valid|
-            I18n.t('i18n_tasks.cmd.errors.invalid_missing_type',
-                   invalid: invalid * ', ', valid: valid * ', ', count: invalid.length)
-          end
-        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :tree_merge,
             args: '[tree ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_merge'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_merge') },
             opt:  cmd_opts(:data_format, :nostdin)
 
         def tree_merge(opts = {})
@@ -15,12 +15,11 @@ module I18n::Tasks
 
         cmd :tree_filter,
             args: '[pattern] [tree]',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_filter'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_filter') },
             opt:  cmd_opts(:data_format, :pattern)
 
         def tree_filter(opt = {})
-          opt_data_format! opt
-          pattern = opt_or_arg!(:pattern, opt)
+          pattern = opt_or_arg! :pattern, opt
           forest  = opt_forest_arg_or_stdin!(opt)
           unless pattern.blank?
             pattern_re = i18n.compile_key_pattern(pattern)
@@ -31,15 +30,17 @@ module I18n::Tasks
 
         cmd :tree_rename_key,
             args: '<key> <name> [tree]',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_rename_key'),
-            opt:  cmd_opts(:data_format) + [
-                cmd_opt(:pattern).merge(short: :k, long: :key=, desc: 'Full key (pattern) to rename. Required'),
-                cmd_opt(:pattern).merge(short: :n, long: :name=, desc: 'New name, interpolates original name as %{key}. Required')]
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_rename_key') },
+            opt:  [
+                      cmd_opt(:pattern).merge(short: :k, long: :key=, desc: proc {
+                        I18n.t('i18n_tasks.cmd.args.desc.key_pattern_to_rename') }),
+                      cmd_opt(:pattern).merge(short: :n, long: :name=, desc: proc {
+                        I18n.t('i18n_tasks.cmd.args.desc.new_key_name') })
+                  ] + cmd_opts(:data_format)
 
         def tree_rename_key(opt = {})
           key    = opt_or_arg! :key, opt
           name   = opt_or_arg! :name, opt
-          opt_data_format! opt
           forest = opt_forest_arg_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?
@@ -49,11 +50,10 @@ module I18n::Tasks
 
         cmd :tree_subtract,
             args: '[tree A] [tree B ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_subtract'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_subtract') },
             opt:  cmd_opts(:data_format, :nostdin)
 
         def tree_subtract(opt = {})
-          opt_data_format! opt
           forests = opt_forests_stdin_args! opt, 2
           forest  = forests.reduce(:subtract_by_key) || empty_forest
           print_forest forest, opt
@@ -61,11 +61,10 @@ module I18n::Tasks
 
         cmd :tree_set_value,
             args: '[value] [tree]',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_set_value'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_set_value') },
             opt:  cmd_opts(:value, :data_format, :nostdin, :pattern)
 
         def tree_set_value(opt = {})
-          opt_data_format! opt
           value       = opt_or_arg! :value, opt
           forest      = opt_forest_arg_or_stdin!(opt)
           key_pattern = opt[:pattern]
@@ -76,13 +75,11 @@ module I18n::Tasks
 
         cmd :tree_convert,
             args: '<tree>',
-            desc: I18n.t('i18n_tasks.cmd.desc.tree_convert'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_convert') },
             opt:  [cmd_opt(:data_format).merge(short: :f, long: :from=),
                    cmd_opt(:out_format).merge(short: :t, long: :to=)]
 
         def tree_convert(opt = {})
-          opt_data_format! opt, :from
-          opt_output_format! opt, :to
           forest = opt_forest_arg_or_stdin! opt.merge(format: opt[:from])
           print_forest forest, opt.merge(format: opt[:to])
         end

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

@@ -7,39 +7,34 @@ module I18n::Tasks
         cmd_opt :strict, {
             short: :s,
             long:  :strict,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.strict')
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.strict') }
         }
 
         cmd :find,
             args: '[pattern]',
-            desc: I18n.t('i18n_tasks.cmd.desc.find'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.find') },
             opt:  cmd_opts(:out_format, :pattern)
 
         def find(opt = {})
-          opt_output_format! opt
           opt[:filter] ||= opt.delete(:pattern) || opt[:arguments].try(:first)
           print_forest i18n.used_tree(key_filter: opt[:filter].presence, source_occurrences: true), opt, :used_keys
         end
 
         cmd :unused,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.unused'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.unused') },
             opt:  cmd_opts(:locales, :out_format, :strict)
 
         def unused(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
           print_forest i18n.unused_keys(opt), opt, :unused_keys
         end
 
         cmd :remove_unused,
             args: '[locale ...]',
-            desc: I18n.t('i18n_tasks.cmd.desc.remove_unused'),
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.remove_unused') },
             opt:  cmd_opts(:locales, :out_format, :strict, :confirm)
 
         def remove_unused(opt = {})
-          opt_locales! opt
-          opt_output_format! opt
           unused_keys = i18n.unused_keys(opt)
           if unused_keys.present?
             terminal_report.unused_keys(unused_keys)

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :xlsx_report,
             args: '[locale...]',
-            desc: 'save missing and unused translations to an Excel file',
+            desc: proc { I18n.t('i18n_tasks.cmd.desc.xlsx_report') },
             opt:  [cmd_opt(:locales),
                    {short: :p, long: :path=, desc: 'Destination path', conf: {default: 'tmp/i18n-report.xlsx'}}]
 
@@ -18,7 +18,6 @@ module I18n::Tasks
             log_stderr Term::ANSIColor.red Term::ANSIColor.bold message
             exit 1
           end
-          opt_locales! opt
           spreadsheet_report.save_report opt[:path], opt.except(:path)
         end
       end

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

@@ -11,14 +11,33 @@ module I18n::Tasks
         end
 
         DEFAULT_ENUM_OPT_DESC = proc { |valid, default|
-          I18n.t('i18n_tasks.cmd.enum_opt.desc.default', valid_text: valid, default_text: default)
+          I18n.t('i18n_tasks.cmd.enum_opt.desc', valid_text: valid, default_text: default)
         }
 
-        def enum_opt_attr(short, long, valid, &desc)
+        def enum_opt_attr(short, long, valid, desc, error_msg)
           desc ||= DEFAULT_ENUM_OPT_DESC
-          {short: short, long: long.to_sym,
-           desc:  desc.call(valid * ', ', I18n.t('i18n_tasks.cmd.args.default_text', value: valid.first)),
-           conf:  {default: valid.first, argument: true, optional: false}}
+          desc_proc = proc { desc.call(valid * ', ', I18n.t('i18n_tasks.cmd.args.default_text', value: valid.first)) }
+          {short: short, long: long, desc: desc_proc,
+           conf:  {default: valid.first, argument: true, optional: false},
+           parse: enum_parse_proc(:parse_enum_opt, valid, &error_msg)}
+        end
+
+        DEFAULT_LIST_OPT_DESC = proc { |valid, default|
+          I18n.t('i18n_tasks.cmd.enum_list_opt.desc', valid_text: valid, default_text: default)
+        }
+
+        def enum_list_opt_attr(short, long, valid, desc, error_msg)
+          desc ||= DEFAULT_LIST_OPT_DESC
+          desc_proc = proc { desc.call(valid * ', ', I18n.t('i18n_tasks.cmd.args.default_all')) }
+          {short: short, long: long, desc: desc_proc,
+           conf:  {as: Array, delimiter: /\s*[+:,]\s*/},
+           parse: enum_parse_proc(:parse_enum_list_opt, valid, &error_msg)}
+        end
+
+        def enum_parse_proc(method, valid, &error)
+          proc { |opt, key|
+            opt[key] = send(method, opt[key], valid, &error)
+          }
         end
       end
     end

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

@@ -14,28 +14,28 @@ module I18n::Tasks
         cmd_opt :nostdin, {
             short: :S,
             long:  :nostdin,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.nostdin'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.nostdin') },
             conf:  {default: false}
         }
 
         cmd_opt :confirm, {
             short: :y,
             long:  :confirm,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.confirm'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.confirm') },
             conf:  {default: false}
         }
 
         cmd_opt :pattern, {
             short: :p,
             long:  :pattern=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.key_pattern'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.key_pattern') },
             conf:  {argument: true, optional: false}
         }
 
         cmd_opt :value, {
             short: :v,
             long:  :value=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.value'),
+            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.value') },
             conf:  {argument: true, optional: false}
         }
 

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

@@ -3,7 +3,7 @@ module I18n::Tasks
     module Options
       module EnumOpt
         DEFAULT_ENUM_OPT_ERROR = proc { |bad, good|
-          I18n.t('i18n_tasks.cmd.enum_opt.invalid_one', invalid: bad, valid: good * ', ')
+          I18n.t('i18n_tasks.cmd.enum_opt.invalid', invalid: bad, valid: good * ', ')
         }
 
         def parse_enum_opt(value, valid, &error_msg)
@@ -23,14 +23,18 @@ module I18n::Tasks
         end
 
         DEFAULT_ENUM_LIST_ERROR = proc { |bad, good|
-          I18n.t('i18n_tasks.cmd.enum_opt.invalid_list', invalid: bad * ', ', valid: good * ', ')
+          I18n.t('i18n_tasks.cmd.enum_list_opt.invalid', invalid: bad * ', ', valid: good * ', ')
         }
 
         def parse_enum_list_opt(values, valid, &error_msg)
           values  = explode_list_opt(values)
           invalid = values - valid.map(&:to_s)
           if invalid.empty?
-            values
+            if values.empty?
+              valid
+            else
+              values
+            end
           else
             error_msg ||= DEFAULT_ENUM_LIST_ERROR
             raise CommandError.new error_msg.call(invalid, valid)

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

@@ -8,17 +8,20 @@ module I18n::Tasks
             short: :l,
             long:  :locales=,
             desc:  I18n.t('i18n_tasks.cmd.args.desc.locales_filter'),
-            conf:  {as: Array, delimiter: /\s*[+:,]\s*/, default: 'all', argument: true, optional: false}
+            conf:  {as: Array, delimiter: /\s*[+:,]\s*/, default: 'all', argument: true, optional: false},
+            parse: :parse_locales
         }
+
         cmd_opt :locale, {
             short: :l,
             long:  :locale=,
             desc:  I18n.t('i18n_tasks.cmd.args.desc.locale'),
-            conf:  {default: 'base', argument: true, optional: false}
+            conf:  {default: 'base', argument: true, optional: false},
+            parse: :parse_locale
         }
 
-        def opt_locales!(opt)
-          argv    = Array(opt[:arguments]) + Array(opt[:locales])
+        def parse_locales(opt, key = :locales)
+          argv    = Array(opt[:arguments]) + Array(opt[key])
           locales = if argv == ['all'] || argv == 'all' || argv.blank?
                       i18n.locales
                     else
@@ -26,16 +29,15 @@ module I18n::Tasks
                     end
           locales.each { |locale| validate_locale!(locale) }
           log_verbose "locales for the command are #{locales.inspect}"
-          opt[:locales] = locales
+          opt[key] = locales
         end
 
-        def opt_locale!(opt, key = :locale)
+        def parse_locale(opt, key = :locale)
           val      = opt[key]
           opt[key] = base_locale if val.blank? || val == 'base'
           opt[key]
         end
 
-
         VALID_LOCALE_RE = /\A\w[\w\-_\.]*\z/i
 
         def validate_locale!(locale)

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

@@ -3,27 +3,24 @@ module I18n::Tasks
     module Options
       module Trees
         extend Command::DSL
+        format_opt = proc { |type|
+          enum_opt_attr :f, :format=, enum_opt(type),
+                        proc { |valid, default|
+                          I18n.t("i18n_tasks.cmd.args.desc.#{type}", valid_text: valid, default_text: default) },
+                        proc { |value, valid|
+                          I18n.t('i18n_tasks.cmd.errors.invalid_format', invalid: value, valid: valid * ', ') }
+        }
 
         enum_opt :data_format, %w(yaml json keys)
-        cmd_opt :data_format, enum_opt_attr(:f, :format=, enum_opt(:data_format)) { |valid_text, default_text|
-          I18n.t('i18n_tasks.cmd.args.desc.data_format', valid_text: valid_text, default_text: default_text)
-        }
+        # i18n-tasks-use t('i18n_tasks.cmd.args.desc.data_format')
+        cmd_opt :data_format, format_opt.call(:data_format)
 
         enum_opt :out_format, ['terminal-table', *enum_opt(:data_format), 'inspect']
-        cmd_opt :out_format, enum_opt_attr(:f, :format=, enum_opt(:out_format)) { |valid_text, default_text|
-          I18n.t('i18n_tasks.cmd.args.desc.out_format', valid_text: valid_text, default_text: default_text)
-        }
-
-        cmd_opt :keys, {
-            short: :k,
-            long:  :keys=,
-            desc:  I18n.t('i18n_tasks.cmd.args.desc.keys'),
-            conf:  {as: Array, delimiter: /[+:,]/, argument: true, optional: false}
-        }
+        # i18n-tasks-use t('i18n_tasks.cmd.args.desc.out_format')
+        cmd_opt :out_format, format_opt.call(:out_format)
 
         def print_forest(forest, opt, version = :show_tree)
           format = opt[:format].to_s
-
           case format
             when 'terminal-table'
               terminal_report.send(version, forest)
@@ -36,34 +33,18 @@ module I18n::Tasks
           end
         end
 
-        INVALID_FORMAT_MSG = proc do |value, valid|
-          I18n.t('i18n_tasks.cmd.errors.invalid_format', invalid: value, valid: valid * ', ')
-        end
-
-        def opt_output_format!(opt = {}, key = :format)
-          opt[key] = parse_enum_opt opt[key], :out_format, &INVALID_FORMAT_MSG
-        end
-
-        def opt_data_format!(opt = {}, key = :format)
-          opt[key] = parse_enum_opt opt[key], :data_format, &INVALID_FORMAT_MSG
-        end
-
-        def opt_args_keys!(opt = {})
-          opt[:keys] = explode_list_opt(opt[:keys]) + Array(opt[:arguments])
-        end
-
-        def opt_forest_arg_or_stdin!(opt)
+        def opt_forest_arg_or_stdin!(opt, format = opt[:format])
           src = opt[:arguments].try(:shift) || $stdin.read
-          parse_forest(src, opt)
+          parse_forest(src, format)
         end
 
-        def opt_forests_stdin_args!(opt, num = false)
+        def opt_forests_stdin_args!(opt, num = false, format = opt[:format])
           args = opt[:arguments] || []
           if opt[:nostdin]
             sources = []
           else
             sources = [$stdin.read]
-            num -= 1 if num
+            num     -= 1 if num
           end
           if num
             num.times { sources << args.shift }
@@ -71,7 +52,7 @@ module I18n::Tasks
             sources += args
             args.clear
           end
-          sources.map { |src| parse_forest(src, opt) }
+          sources.map { |src| parse_forest(src, format) }
         end
 
         def opt_forests_merged_stdin_args!(opt)
@@ -80,11 +61,10 @@ module I18n::Tasks
           }
         end
 
-        def parse_forest(src, opt = {})
+        def parse_forest(src, format)
           if !src
             raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.pass_forest'))
           end
-          format = opt_data_format!(opt)
           if format == 'keys'
             Data::Tree::Siblings.from_key_names parse_keys(src)
           else

data/lib/i18n/tasks/configuration.rb

@@ -70,6 +70,9 @@ module I18n::Tasks::Configuration
     @config_sections[:base_locale] ||= (config[:base_locale] || 'en').to_s
   end
 
+  def internal_locale
+    @config_sections[:internal_locale] ||= (config[:internal_locale] || 'en').to_s
+  end
 
   def ignore_config(type = nil)
     key = type ? "ignore_#{type}" : 'ignore'
@@ -81,6 +84,7 @@ module I18n::Tasks::Configuration
   def config_sections
     # init all sections
     base_locale
+    internal_locale
     locales
     data_config
     search_config

data/lib/i18n/tasks/slop_command.rb

@@ -4,24 +4,37 @@ module I18n::Tasks::SlopCommand
   def slop_command(name, attr, &block)
     proc {
       command name.tr('_', '-') do
-        opts = attr[:opt]
         args = attr[:args]
         banner "Usage: i18n-tasks #{name} [options] #{args}" if args.present?
         desc = attr[:desc]
+        desc = desc.call if desc.respond_to?(:call)
         description desc if desc
-        if opts
-          opts.each do |opt|
-            on *[:short, :long, :desc, :conf].map { |k| opt[k] }.compact
-          end
+        attr[:opt].try :each do |opt|
+          on *opt.values_at(:short, :long, :desc, :conf).compact.map { |v| v.respond_to?(:call) ? v.call : v }
         end
-        run { |opts, args| block.call(name, opts, args) }
+        run { |slop_opts, slop_args|
+          slop_opts = slop_opts.to_hash(true).reject { |k, v| v.nil? }
+          slop_opts.merge!(arguments: slop_args) unless slop_args.empty?
+          block.call name, slop_opts
+        }
       end
     }
   end
 
-  def parse_slop_opts_args(opts, args)
-    opts = opts.to_hash(true).reject { |k, v| v.nil? }
-    opts.merge!(arguments: args) unless args.empty?
-    opts
+  def parse_opts!(opts, opts_conf, context)
+    return if !opts_conf
+    opts_conf.each do |opt_conf|
+      parse = opt_conf[:parse]
+      if parse
+        key = opt_conf[:long].to_s.sub(/=\z/, '').to_sym
+        if parse.respond_to?(:call)
+          context.instance_exec opts, key, &parse
+        elsif Symbol === parse
+          context.instance_exec do
+            send parse, opts, key
+          end
+        end
+      end
+    end
   end
 end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 module I18n
   module Tasks
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 end

data/spec/google_translate_spec.rb

@@ -53,7 +53,7 @@ describe 'Google Translation' do
                 }
             })
 
-            cmd.translate_missing
+            cmd.run :translate_missing
             expect(task.t('common.hello', 'es')).to eq(text_test[2])
             expect(task.t('common.hello_html', 'es')).to eq(html_test[2])
             expect(task.t('common.array_key', 'es')).to eq(array_test[2])

data/spec/support/test_codebase.rb

@@ -24,7 +24,7 @@ module TestCodebase
   def run_cmd(name, *args, &block)
     in_test_app_dir do
       silence_stderr {
-        capture_stdout { i18n_cmd.send(name, *args, &block) }
+        capture_stdout { i18n_cmd.run(name, *args, &block) }
       }
     end
   end

data/templates/config/i18n-tasks.yml

@@ -5,6 +5,9 @@ base_locale: en
 ## uncomment to set locales explicitly
 # locales: [en, es, fr]
 
+## i18n-tasks report locale, default: en, available: en, ru
+# internal_locale: ru
+
 # Read and write locale data
 data:
   ## by default, translation data are read from the file system, or you can provide a custom data adapter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -217,6 +217,7 @@ files:
 - bin/i18n-tasks
 - config/i18n-tasks.yml
 - config/locales/en.yml
+- config/locales/ru.yml
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb