i18n-tasks 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70e643cadbeb135db42081bdf2b9ea9ed7d5163
-  data.tar.gz: 99b5ba4d17e4d93b646895172faa2a74d982d006
+  metadata.gz: 0b7283fc75cd948d4e33223d13c310da41c71249
+  data.tar.gz: a0cbd7255e3306869faec54d994c26659e9c2334
 SHA512:
-  metadata.gz: 15800850eefad7aea706c8275ac804976bff7047d84d13c1ee3a1b33b53e91215ac55515e5c74b7d93b02dd9bb764ce34a4076f88668899620dad141e87a8a65
-  data.tar.gz: 55820e43acb2cc6e033fee27cc0abc19cfe945c1334ba18aed67c5b03c27a96adba8ca0b6dc89c79ee4e1b5f2da36367a7c0b2914604c6de494a41302dad5633
+  metadata.gz: 50b79a50af3669c354a7c7ebc8acbf6ae6587bb344048b92d89656ab1474b241121ae9794637399ca4a47ec4abe9d383a0b25681aa6c0e26c43e18743c004295
+  data.tar.gz: ec135b8e1b5638443228fe9d0ec4144876b6e3c8e9fc85cffea9b7c38c1cf6e4d8f79d00c8d9cb2ad2123cfb30a3909bf6ddb6bce186c94f1112e341f043c0bc

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.8.7
+
+* 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)
+
 ## 0.8.6
 
 * Report missing keys found in source in all the locales. [#162](https://github.com/glebm/i18n-tasks/issues/162)

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.6'
+gem 'i18n-tasks', '~> 0.8.7'
 ```
 
 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}. Default: %{value_or_human_key}.
+    -v, --value    Value. Interpolates: %{value}, %{human_key}, %{value_or_human_key}, %{key}. Default: %{value_or_human_key}.
     -h, --help     Display this help message.
 ```
 
@@ -124,18 +124,21 @@ $ i18n-tasks normalize -p
 
 ### Compose tasks
 
-`i18n-tasks` also provides composable tasks for reading, writing and manipulating locale data.
-
-For example, `add-missing` implemented with `missing`, `tree-set-value` and `data-merge`:
+`i18n-tasks` also provides composable tasks for reading, writing and manipulating locale data. Examples below.
 
+`add-missing` implemented with `missing`, `tree-set-value` and `data-merge`:
 ```console
-$ i18n-tasks missing -fyaml fr | i18n-tasks tree-set-value 'TRME %{value}' | i18n-tasks data-merge
+$ i18n-tasks missing -f yaml fr | i18n-tasks tree-set-value 'TRME %{value}' | i18n-tasks data-merge
 ```
 
-Another example, `remove-unused` implemented with `unused` and `data-remove`:
+`remove-unused` implemented with `unused` and `data-remove` (sans the confirmation):
+```console
+$ i18n-tasks unused -f yaml | i18n-tasks data-remove
+```
 
-```bash
-$ i18n-tasks unused -fyaml | 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
 ```
 
 See the full list of tasks with `i18n-tasks --help`.

data/config/locales/en.yml

@@ -22,7 +22,7 @@ en:
           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}'
+          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/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}"
+          value: "Значение, интерполируется с %{value}, %{human_key}, %{value_or_human_key}, %{key}"
       desc:
         add_missing: "добавить недостающие ключи к переводам"
         config: "показать конфигурацию"

data/i18n-tasks.gemspec

@@ -34,11 +34,11 @@ TEXT
   s.require_paths = ['lib']
 
   s.add_dependency 'erubis'
-  s.add_dependency 'activesupport'
+  s.add_dependency 'activesupport', '>= 2.3.18'
   s.add_dependency 'easy_translate', '>= 0.5.0'
-  s.add_dependency 'term-ansicolor'
+  s.add_dependency 'term-ansicolor', '>= 1.3.2'
   s.add_dependency 'terminal-table', '>= 1.5.1'
-  s.add_dependency 'highline'
+  s.add_dependency 'highline', '>= 1.7.3'
   s.add_dependency 'i18n'
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'

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

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

@@ -36,11 +36,18 @@ module I18n::Tasks
             if vals == %w(all) || vals.blank?
               context.locales
             else
-              vals.map { |v| v == 'base' ? context.base_locale : v }
+              move_base_locale_to_front! vals.map { |v| v == 'base' ? context.base_locale : v }, context.base_locale
             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/data/tree/traversal.rb

@@ -147,10 +147,12 @@ module I18n::Tasks
         value_proc ||= proc { |node|
           node_value = node.value
           human_key  = ActiveSupport::Inflector.humanize(node.key.to_s)
+          full_key = node.full_key
           StringInterpolation.interpolate_soft(
               val_pattern,
               value: node_value,
               human_key: human_key,
+              key: full_key,
               value_or_human_key: node_value.presence || human_key
           )
         }

data/lib/i18n/tasks/version.rb

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

data/spec/commands/missing_commands_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+RSpec.describe 'Data commands' do
+  delegate :run_cmd, to: :TestCodebase
+
+  describe '#add_missing' do
+    describe 'adds the missing keys to base locale first, then to other locales' do
+      around do |ex|
+        TestCodebase.setup(
+            'config/i18n-tasks.yml' => {base_locale: 'en', locales: %w(es fr)}.to_yaml,
+            'config/locales/es.yml' => {'es' => {'a' => 'A'}}.to_yaml)
+        TestCodebase.in_test_app_dir { ex.call }
+        TestCodebase.teardown
+      end
+
+      it 'with -v argument' do
+        run_cmd 'add-missing', '-vTRME'
+        expect(YAML.load_file('config/locales/en.yml')).to eq('en' => {'a' => 'TRME'})
+        expect(YAML.load_file('config/locales/fr.yml')).to eq('fr' => {'a' => 'TRME'})
+      end
+    end
+  end
+end

data/spec/i18n_tasks_spec.rb

@@ -211,6 +211,17 @@ RSpec.describe 'i18n-tasks' do
         expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'TRME ES_TEXT'
       }
     end
+
+    it '--value with %{key}' do
+      in_test_app_dir {
+        expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']).to be_nil
+      }
+      run_cmd 'add-missing', '-v', 'TRME %{key}'
+      in_test_app_dir {
+        expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a']).to eq 'TRME es.missing_in_es.a'
+        expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'TRME en.present_in_es_but_not_en.a'
+      }
+    end
   end
 
   describe 'config' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.18
 - !ruby/object:Gem::Dependency
   name: easy_translate
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +264,7 @@ files:
 - lib/i18n/tasks/used_keys.rb
 - lib/i18n/tasks/version.rb
 - spec/commands/data_commands_spec.rb
+- spec/commands/missing_commands_spec.rb
 - spec/commands/tree_commands_spec.rb
 - spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
@@ -320,12 +321,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
 test_files:
 - spec/commands/data_commands_spec.rb
+- spec/commands/missing_commands_spec.rb
 - spec/commands/tree_commands_spec.rb
 - spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
@@ -355,3 +357,4 @@ test_files:
 - spec/support/test_codebase.rb
 - spec/support/trees.rb
 - spec/used_keys_spec.rb
+has_rdoc: