i18n-tasks 0.8.7 → 0.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7283fc75cd948d4e33223d13c310da41c71249
-  data.tar.gz: a0cbd7255e3306869faec54d994c26659e9c2334
+  metadata.gz: 032b4f63664580dc57f296ae0379fc282bdadf26
+  data.tar.gz: 217065770a8d92a96b8cf9009ddb7d2dc7dfea30
 SHA512:
-  metadata.gz: 50b79a50af3669c354a7c7ebc8acbf6ae6587bb344048b92d89656ab1474b241121ae9794637399ca4a47ec4abe9d383a0b25681aa6c0e26c43e18743c004295
-  data.tar.gz: ec135b8e1b5638443228fe9d0ec4144876b6e3c8e9fc85cffea9b7c38c1cf6e4d8f79d00c8d9cb2ad2123cfb30a3909bf6ddb6bce186c94f1112e341f043c0bc
+  metadata.gz: f20aadc5aa981419c3b6e5641ba3f18c8012d533b54d1e7a7df4490e56b1fe8d60bb2bb8bd7422e61534ac05ec16f3983bd1f360699e1e9dcb4d262ba466b6af
+  data.tar.gz: 34f9ab86382cf2ac7c307d4106c2eb470dc270ad97b72a8d4d462d5f5116a7651aa849624623bcbb0a68d48dd25c4775fe113db560395df7196ca44bcc7a88f3

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 rvm:
-- 2.2.1
-- 1.9.3
-- jruby
+- 2.2.2
+- jruby-9000
 - rbx
-# travis uses old bundler (https://travis-ci.org/glebm/i18n-tasks/jobs/53485782)
-before_install: gem install bundler
+matrix:
+  allow_failures:
+  - rvm: rbx
 cache: bundler
 script: bundle exec rspec
+sudo: false
 env:
   global:
   - TRAVIS=1

data/CHANGES.md

@@ -1,7 +1,7 @@
-## 0.8.7
+## 0.9.0.rc1
 
-* New interpolation value for `add-missing -v`: `%{key}`. [Stijn Mathysen](https://github.com/stijnster) [#164](https://github.com/glebm/i18n-tasks/pull/164)
-* When adding keys from non-default locales, merge base locale first, then the others. [#162](https://github.com/glebm/i18n-tasks/issues/162)
+* Support for multiple scanners.
+* Strict mode enabled by default, can be configured via `search.strict`. New argument: `--no-strict`.
 
 ## 0.8.6
 

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 unless ENV['TRAVIS']
   group :development do
-    gem 'byebug', platforms: [:mri_21, :mri_22], require: false
+    gem 'byebug', platforms: [:mri_21, :mri_22, :mswin, :x64_mingw_21, :x64_mingw_22], require: false
     gem 'rubinius-debugger', platform: :rbx, require: false
   end
 end

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.8.7'
+gem 'i18n-tasks', '~> 0.9.0.rc1'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -72,7 +72,7 @@ $ i18n-tasks add-missing --help
 Usage: i18n-tasks add-missing [options] [locale ...]
     -l, --locales  Comma-separated list of locale(s) to process. Default: all. Special: base.
     -f, --format   Output format: terminal-table, yaml, json, keys, inspect. Default: terminal-table.
-    -v, --value    Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}, %{key}. Default: %{value_or_human_key}.
+    -v, --value    Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}. Default: %{value_or_human_key}.
     -h, --help     Display this help message.
 ```
 
@@ -105,8 +105,8 @@ $ i18n-tasks unused
 $ i18n-tasks remove-unused
 ```
 
-These tasks will infer [dynamic keys](#dynamic-keys) such as `t("category.\#{category.name}")` by default.
-Pass `-s` or `--strict` to disable this feature.
+These tasks can infer [dynamic keys](#dynamic-keys) such as `t("category.\#{category.name}")` if you set
+`search.strict` to false, or pass `--no-strict` on the command line.
 
 ### Normalize data
 

data/bin/i18n-tasks

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# coding: utf-8
 
 # prevent i18n gem warning
 require 'i18n'

data/config/locales/en.yml

@@ -1,102 +1,103 @@
----
-en:
-  i18n_tasks:
-    add_missing:
-      added:
-        one: Added %{count} key
-        other: Added %{count} keys
-    cmd:
-      args:
-        default_text: 'Default: %{value}'
-        desc:
-          confirm: Confirm automatically
-          data_format: 'Data format: %{valid_text}.'
-          key_pattern: Filter by key pattern (e.g. 'common.*')
-          key_pattern_to_rename: Full key (pattern) to rename. Required
-          locale: Locale
-          locale_to_translate_from: Locale to translate from
-          locales_filter: 'Locale(s) to process. Special: base'
-          missing_types: 'Filter by types: %{valid}'
-          new_key_name: New name, interpolates original name as %{key}. Required
-          nostdin: Do not read from stdin
-          out_format: 'Output format: %{valid_text}'
-          pattern_router: 'Use pattern router: keys moved per config data.write'
-          strict: Do not infer dynamic key usage such as `t("category.\#{category.name}")`
-          value: 'Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}, %{key}'
-      desc:
-        add_missing: add missing keys to locale data
-        config: display i18n-tasks configuration
-        data: show locale data
-        data_merge: merge locale data with trees
-        data_remove: remove keys present in tree from data
-        data_write: replace locale data with tree
-        eq_base: show translations equal to base value
-        find: show where keys are used in the code
-        gem_path: show path to the gem
-        health: is everything OK?
-        irb: start REPL session within i18n-tasks context
-        missing: show missing translations
-        normalize: 'normalize translation data: sort and move to the right files'
-        remove_unused: remove unused keys
-        translate_missing: translate missing keys with Google Translate
-        tree_convert: convert tree between formats
-        tree_filter: filter tree by key pattern
-        tree_merge: merge trees
-        tree_rename_key: rename tree node
-        tree_set_value: set values of keys, optionally match a pattern
-        tree_subtract: tree A minus the keys in tree B
-        tree_translate: Google Translate a tree to root locales
-        unused: show unused translations
-        xlsx_report: save missing and unused translations to an Excel file
-      encourage:
-      - Good job!
-      - Well done!
-      - Perfect!
-      enum_list_opt:
-        invalid: "%{invalid} is not in: %{valid}."
-      enum_opt:
-        invalid: "%{invalid} is not one of: %{valid}."
-      errors:
-        invalid_format: 'invalid format: %{invalid}. valid: %{valid}.'
-        invalid_locale: 'invalid locale: %{invalid}'
-        invalid_missing_type:
-          one: 'invalid type: %{invalid}. valid: %{valid}.'
-          other: 'unknown types: %{invalid}. valid: %{valid}.'
-        pass_forest: pass locale forest
-    common:
-      base_value: Base Value
-      continue_q: Continue?
-      key: Key
-      locale: Locale
-      n_more: "%{count} more"
-      type: Type
-      value: Value
-    data_stats:
-      text: has %{key_count} keys across %{locale_count} locales. On average, values are %{value_chars_avg}
-        characters long, keys have %{key_segments_avg} segments, a locale has %{per_locale_avg} keys.
-      text_single_locale: has %{key_count} keys in total. On average, values are %{value_chars_avg}
-        characters long, keys have %{key_segments_avg} segments.
-      title: Forest (%{locales})
-    google_translate:
-      errors:
-        no_api_key: Set Google API key via GOOGLE_TRANSLATE_API_KEY environment variable or translation.api_key
-          in config/i18n-tasks.yml. Get the key at https://code.google.com/apis/console.
-        no_results: Google Translate returned no results. Make sure billing information is set at
-          https://code.google.com/apis/console.
-    health:
-      no_keys_detected: No keys detected. Check data.read in config/i18n-tasks.yml.
-    missing:
-      details_title: Value in other locales or source
-      none: No translations are missing.
-    remove_unused:
-      confirm:
-        one: "%{count} translation will be removed from %{locales}."
-        other: "%{count} translation will be removed from %{locales}."
-      noop: No unused keys to remove
-      removed: Removed %{count} keys
-    translate_missing:
-      translated: Translated %{count} keys
-    unused:
-      none: Every translation is in use.
-    usages:
-      none: No key usages found.
+---
+en:
+  i18n_tasks:
+    add_missing:
+      added:
+        one: Added %{count} key
+        other: Added %{count} keys
+    cmd:
+      args:
+        default_text: 'Default: %{value}'
+        desc:
+          confirm: Confirm automatically
+          data_format: 'Data format: %{valid_text}.'
+          key_pattern: Filter by key pattern (e.g. 'common.*')
+          key_pattern_to_rename: Full key (pattern) to rename. Required
+          locale: Locale
+          locale_to_translate_from: Locale to translate from
+          locales_filter: 'Locale(s) to process. Special: base'
+          missing_types: 'Filter by types: %{valid}'
+          new_key_name: New name, interpolates original name as %{key}. Required
+          nostdin: Do not read from stdin
+          out_format: 'Output format: %{valid_text}'
+          pattern_router: 'Use pattern router: keys moved per config data.write'
+          strict: Avoid inferring dynamic key usages such as t("cats.#{cat}.name"). Takes precedence over the
+            config setting if set.
+          value: 'Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}'
+      desc:
+        add_missing: add missing keys to locale data
+        config: display i18n-tasks configuration
+        data: show locale data
+        data_merge: merge locale data with trees
+        data_remove: remove keys present in tree from data
+        data_write: replace locale data with tree
+        eq_base: show translations equal to base value
+        find: show where keys are used in the code
+        gem_path: show path to the gem
+        health: is everything OK?
+        irb: start REPL session within i18n-tasks context
+        missing: show missing translations
+        normalize: 'normalize translation data: sort and move to the right files'
+        remove_unused: remove unused keys
+        translate_missing: translate missing keys with Google Translate
+        tree_convert: convert tree between formats
+        tree_filter: filter tree by key pattern
+        tree_merge: merge trees
+        tree_rename_key: rename tree node
+        tree_set_value: set values of keys, optionally match a pattern
+        tree_subtract: tree A minus the keys in tree B
+        tree_translate: Google Translate a tree to root locales
+        unused: show unused translations
+        xlsx_report: save missing and unused translations to an Excel file
+      encourage:
+      - Good job!
+      - Well done!
+      - Perfect!
+      enum_list_opt:
+        invalid: "%{invalid} is not in: %{valid}."
+      enum_opt:
+        invalid: "%{invalid} is not one of: %{valid}."
+      errors:
+        invalid_format: 'invalid format: %{invalid}. valid: %{valid}.'
+        invalid_locale: 'invalid locale: %{invalid}'
+        invalid_missing_type:
+          one: 'invalid type: %{invalid}. valid: %{valid}.'
+          other: 'unknown types: %{invalid}. valid: %{valid}.'
+        pass_forest: pass locale forest
+    common:
+      base_value: Base Value
+      continue_q: Continue?
+      key: Key
+      locale: Locale
+      n_more: "%{count} more"
+      type: Type
+      value: Value
+    data_stats:
+      text: has %{key_count} keys across %{locale_count} locales. On average, values are %{value_chars_avg}
+        characters long, keys have %{key_segments_avg} segments, a locale has %{per_locale_avg} keys.
+      text_single_locale: has %{key_count} keys in total. On average, values are %{value_chars_avg}
+        characters long, keys have %{key_segments_avg} segments.
+      title: Forest (%{locales})
+    google_translate:
+      errors:
+        no_api_key: Set Google API key via GOOGLE_TRANSLATE_API_KEY environment variable or translation.api_key
+          in config/i18n-tasks.yml. Get the key at https://code.google.com/apis/console.
+        no_results: Google Translate returned no results. Make sure billing information is set at
+          https://code.google.com/apis/console.
+    health:
+      no_keys_detected: No keys detected. Check data.read in config/i18n-tasks.yml.
+    missing:
+      details_title: Value in other locales or source
+      none: No translations are missing.
+    remove_unused:
+      confirm:
+        one: "%{count} translation will be removed from %{locales}."
+        other: "%{count} translation will be removed from %{locales}."
+      noop: No unused keys to remove
+      removed: Removed %{count} keys
+    translate_missing:
+      translated: Translated %{count} keys
+    unused:
+      none: Every translation is in use.
+    usages:
+      none: No key usages found.

data/config/locales/ru.yml

@@ -21,7 +21,7 @@ ru:
           out_format: "Формат вывода: %{valid_text}. %{default_text}."
           pattern_router: "Использовать pattern_router: ключи распределятся по файлам согласно data.write"
           strict: Не угадывать динамические использования ключей, например `t("category.#{category.key}")`
-          value: "Значение, интерполируется с %{value}, %{human_key}, %{value_or_human_key}, %{key}"
+          value: "Значение, интерполируется с %{value}, %{human_key}, %{value_or_human_key}"
       desc:
         add_missing: "добавить недостающие ключи к переводам"
         config: "показать конфигурацию"

data/i18n-tasks.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'i18n/tasks/version'
@@ -34,7 +33,7 @@ TEXT
   s.require_paths = ['lib']
 
   s.add_dependency 'erubis'
-  s.add_dependency 'activesupport', '>= 2.3.18'
+  s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'easy_translate', '>= 0.5.0'
   s.add_dependency 'term-ansicolor', '>= 1.3.2'
   s.add_dependency 'terminal-table', '>= 1.5.1'

data/lib/i18n/tasks.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # define all the modules to be able to use ::
 module I18n
   module Tasks

data/lib/i18n/tasks/base_task.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'i18n/tasks/command_error'
 require 'i18n/tasks/split_key'
 require 'i18n/tasks/key_pattern_matching'

data/lib/i18n/tasks/cli.rb

@@ -170,7 +170,7 @@ class I18n::Tasks::CLI
   end
 
   def option_name(flag)
-    flag.detect { |f| f.start_with?('--') }.sub(/\A--/, '').sub(/[^\-\w].*\z/, '').to_sym
+    flag.detect { |f| f.start_with?('--') }.sub(/\A--(\[no-\])?/, '').sub(/[^\-\w].*\z/, '').to_sym
   end
 
   def try_call(v)

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'i18n/tasks/cli'
 require 'i18n/tasks/reports/terminal'
 require 'i18n/tasks/reports/spreadsheet'

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

@@ -47,22 +47,10 @@ module I18n::Tasks
             args: [:locales, :out_format, arg(:value) + [{default: '%{value_or_human_key}'}]]
 
         def add_missing(opt = {})
-          added   = i18n.empty_forest
-          locales = (opt[:locales] || i18n.locales)
-          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!(opt[:value])
-            i18n.data.merge! forest
-            added.merge! forest
-            locales = locales[1..-1]
-          end
-          forest = i18n.missing_keys({locales: locales}.update(opt.slice(:types, :base_locale))).
-              set_each_value!(opt[:value])
+          forest = i18n.missing_keys(opt).set_each_value!(opt[:value])
           i18n.data.merge! forest
-          added.merge! forest
-          log_stderr t('i18n_tasks.add_missing.added', count: added.leaves.count)
-          print_forest added, opt
+          log_stderr t('i18n_tasks.add_missing.added', count: forest.leaves.count)
+          print_forest forest, opt
         end
       end
     end

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

@@ -5,18 +5,17 @@ module I18n::Tasks
         include Command::Collection
 
         arg :strict,
-            '-s',
-            '--strict',
+            '--[no-]strict',
             t('i18n_tasks.cmd.args.desc.strict')
 
         cmd :find,
             pos:  '[pattern]',
             desc: t('i18n_tasks.cmd.desc.find'),
-            args: [:out_format, :pattern]
+            args: [:out_format, :pattern, :strict]
 
         def find(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
+          print_forest i18n.used_tree(strict: opt[:strict], key_filter: opt[:filter].presence), opt, :used_keys
         end
 
         cmd :unused,
@@ -25,7 +24,7 @@ module I18n::Tasks
             args: [:locales, :out_format, :strict]
 
         def unused(opt = {})
-          forest = i18n.unused_keys(opt)
+          forest = i18n.unused_keys(opt.slice(:locales, :strict))
           print_forest forest, opt, :unused_keys
           :exit_1 unless forest.empty?
         end
@@ -36,7 +35,7 @@ module I18n::Tasks
             args: [:locales, :out_format, :strict, :confirm]
 
         def remove_unused(opt = {})
-          unused_keys = i18n.unused_keys(opt)
+          unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))
           if unused_keys.present?
             terminal_report.unused_keys(unused_keys)
             confirm_remove_unused!(unused_keys, opt)

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

@@ -36,18 +36,11 @@ module I18n::Tasks
             if vals == %w(all) || vals.blank?
               context.locales
             else
-              move_base_locale_to_front! vals.map { |v| v == 'base' ? context.base_locale : v }, context.base_locale
+              vals.map { |v| v == 'base' ? context.base_locale : v }
             end.tap do |locales|
               locales.each { |locale| validate! locale }
             end
           end
-
-          def move_base_locale_to_front!(locales, base_locale)
-            if (pos = locales.index(base_locale)) && pos > 0
-              locales[pos], locales[0] = locales[0], locales[pos]
-            end
-            locales
-          end
         end
       end
     end

data/lib/i18n/tasks/command_error.rb

@@ -1,10 +1,14 @@
-# coding: utf-8
 module I18n
   module Tasks
     # When this type of error is caught:
     # 1. show error message of the backtrace
     # 2. exit with non-zero exit code
     class CommandError < StandardError
+
+      def initialize(error = nil, message)
+        super(message)
+        set_backtrace error.backtrace
+      end
     end
   end
 end