i18n-tasks 0.6.3 → 0.7.0

data/lib/i18n/tasks/stats.rb

@@ -0,0 +1,20 @@
+module I18n::Tasks
+  module Stats
+    def forest_stats(forest)
+      key_count    = forest.leaves.count
+      locale_count = forest.count
+      if key_count.zero?
+        {key_count: 0}
+      else
+        {
+            locales:          forest.map(&:key).join(', '),
+            key_count:        key_count,
+            locale_count:     locale_count,
+            per_locale_avg:   forest.inject(0) { |sum, f| sum + f.leaves.count } / locale_count,
+            key_segments_avg: '%.1f' % (forest.leaves.inject(0) { |sum, node| sum + node.walk_to_root.count - 1 } / key_count.to_f),
+            value_chars_avg:  forest.leaves.inject(0) { |sum, node| sum + node.value.length } / key_count
+        }
+      end
+    end
+  end
+end

data/lib/i18n/tasks/string_interpolation.rb

@@ -0,0 +1,14 @@
+module I18n::Tasks
+  module StringInterpolation
+    extend self
+
+    def interpolate_soft(s, t = {})
+      return s unless s
+      t.each do |k, v|
+        pat = "%{#{k}}"
+        s = s.gsub pat, v.to_s if s.include?(pat)
+      end
+      s
+    end
+  end
+end

data/lib/i18n/tasks/unused_keys.rb

@@ -18,16 +18,6 @@ module I18n
               !used_key?(depluralize_key(key, locale))
         }
       end
-
-      def remove_unused!(locales = nil)
-        locales ||= self.locales
-        locales.each do |locale|
-          unused       = unused_tree(locale).key_names.to_set
-          data[locale] = data[locale].select_keys { |key, value|
-            !unused.include?(depluralize_key(key, locale))
-          }
-        end
-      end
     end
   end
 end

data/lib/i18n/tasks/version.rb

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

data/spec/commands/data_commands_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe 'Data commands' do
+  delegate :run_cmd, to: :TestCodebase
+  def en_data
+    {'en' => {'a' => '1', 'common' => {'hello' => 'Hello'}}}
+  end
+
+  def en_data_2
+    {'en' => {'common' => {'hi' => 'Hi'}}}
+  end
+
+
+  before do
+    TestCodebase.setup('config/locales/en.yml' => en_data.to_yaml)
+  end
+
+  after do
+    TestCodebase.teardown
+  end
+
+  it '#data' do
+    expect(JSON.parse(run_cmd :data, format: 'json')).to eq(en_data)
+  end
+
+  it '#data-merge' do
+    expect(JSON.parse(run_cmd :data_merge, format: 'json', arguments: [en_data_2.to_json], nostdin: true)).to eq(en_data.deep_merge en_data_2)
+  end
+
+  it '#data-write' do
+    expect(JSON.parse(run_cmd :data_write, format: 'json', arguments: [en_data_2.to_json])).to eq(en_data_2)
+  end
+
+  it '#data-remove' do
+    to_remove = {'en' => {'common' => {'hello' => ''}}}
+    expect(JSON.parse(run_cmd :data_remove, format: 'json', arguments: [to_remove.to_json])).to eq('en' => {'common' => en_data['en']['common'] })
+  end
+end

data/spec/commands/tree_commands_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'Tree commands' do
+  delegate :run_cmd, to: :TestCodebase
+  before do
+    TestCodebase.setup
+  end
+
+  after do
+    TestCodebase.teardown
+  end
+
+  context 'tree-merge' do
+    trees = [{'a' => '1', 'b' => '2'}, {'a' => '-1', 'c' => '3'}]
+    it trees.map(&:to_json).join(', ') do
+      merged = JSON.parse run_cmd(:tree_merge, format: 'json', arguments: trees.map(&:to_json), nostdin: true)
+      expect(merged).to eq trees.reduce(:merge)
+    end
+  end
+
+  context 'tree-filter' do
+    forest  = {'a' => '1', 'b' => '2', 'c' => {'a' => '3'}}
+    pattern = '{a,c.*}'
+    it "-p #{pattern.inspect} #{forest.to_json}" do
+      selected = JSON.parse run_cmd(:tree_filter, format: 'json', pattern: pattern, arguments: [forest.to_json])
+      expect(selected).to eq(forest.except('b'))
+    end
+  end
+
+  context 'tree-subtract' do
+    trees = [{'a' => '1', 'b' => '2'}, {'a' => '-1', 'c' => '3'}]
+    it trees.map(&:to_json).join(' - ') do
+      subtracted = JSON.parse run_cmd(:tree_subtract, format: 'json', arguments: trees.map(&:to_json), nostdin: true)
+      expected = {'b' => '2'}
+      expect(subtracted).to eq expected
+    end
+  end
+
+  context 'tree-rename-key' do
+    def forest
+      {'a' => {'b' => {'a' => '1'}}}
+    end
+
+    it 'renames root node' do
+      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a', name: 'x', format: 'json', arguments: [forest.to_json])
+      expect(renamed).to eq(forest.tap { |f| f['x'] = f.delete('a') })
+    end
+    it 'renames node' do
+      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a.b', name: 'x', format: 'json', arguments: [forest.to_json])
+      expect(renamed).to eq(forest.tap { |f| f['a']['x'] = f['a'].delete('b') })
+    end
+    it 'renames leaf' do
+      renamed = JSON.parse run_cmd(:tree_rename_key, key: 'a.b.a', name: 'x', format: 'json', arguments: [forest.to_json])
+      expect(renamed).to eq(forest.tap { |f| f['a']['b']['x'] = f['a']['b'].delete('a') })
+    end
+  end
+
+  context 'tree-convert' do
+    def forest
+      {'x' => '1', 'a' => {'b' => {'a' => '2'}}}
+    end
+
+    it 'converts to keys' do
+      keys = run_cmd(:tree_convert, from: 'json', to: 'keys', arguments: [forest.to_json]).split("\n")
+      expect(keys.sort).to eq(['a.b.a', 'x'].sort)
+    end
+  end
+end

data/spec/fixtures/app/views/index.html.slim

@@ -8,6 +8,7 @@ p #{t 'ca.d'} #{t 'ca.f', i: 'world'} #{t 'ca.e', i: 'world'}
 p #{t 'missing_in_es.a'} #{t 'same_in_es.a'} #{t 'blank_in_es.a'}
 p = t 'used_but_missing.key'
 p = t 'missing-key-with-a-dash.key'
+p = t 'missing-key-question?.key'
 p = t 'x', scope: 'scoped'
 p = t 'x', scope: [:very, :scoped]
 p = t 'x', scope: [:scoped, code]

data/spec/google_translate_spec.rb

@@ -16,10 +16,10 @@ describe 'Google Translation' do
     describe 'real world test' do
       delegate :i18n_cmd, :i18n_task, :in_test_app_dir, to: :TestCodebase
 
-      context 'API' do
+      context '#google_translate_list' do
         it "works with #{tests.map(&:first)}" do
           # Just one test with all the cases to lower the Google bill
-          translations = google_translate(
+          translations = google_translate_list(
               tests.map { |t| t[0..1] }, from: :en, to: :es, key: ENV['GOOGLE_TRANSLATE_API_KEY'])
           expect(translations).to eq(tests.map { |t| [t[0], t[2]] })
         end
@@ -43,7 +43,8 @@ describe 'Google Translation' do
                 'common' => {
                     'a' => 'λ',
                     'hello' => text_test[1],
-                    'hello_html' => html_test[1]
+                    'hello_html' => html_test[1],
+                    'array_key' => array_test[1]
                 }
             })
             task.data[:es] = build_tree('es' =>{
@@ -55,6 +56,7 @@ describe 'Google Translation' do
             cmd.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])
             expect(task.t('common.a', 'es')).to eq('λ')
           end
         end

data/spec/i18n_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'i18n/tasks'
+
+describe 'I18n' do
+  let(:i18n) { I18n::Tasks::BaseTask.new }
+  let(:missing_keys) { i18n.missing_keys }
+  let(:unused_keys) { i18n.unused_keys }
+
+  it 'does not have missing keys' do
+    expect(missing_keys).to be_empty,
+                            "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
+  end
+
+  it 'does not have unused keys' do
+    expect(i18n.unused_keys).to be_empty,
+                                "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
+  end
+end

data/spec/i18n_tasks_spec.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 require 'spec_helper'
-require 'i18n/tasks/commands'
 require 'fileutils'
 
 describe 'i18n-tasks' do
@@ -15,6 +14,7 @@ describe 'i18n-tasks' do
           en.missing_symbol_key en.missing_symbol.key_two en.missing_symbol.key_three
           es.missing_in_es_plural_1.a es.missing_in_es_plural_2.a
           en.missing-key-with-a-dash.key
+          en.missing-key-question?.key
           en.fn_comment en.only_in_es
         )
     }
@@ -103,12 +103,12 @@ describe 'i18n-tasks' do
       }
       run_cmd :add_missing, locales: 'base'
       in_test_app_dir {
-        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['key']).to eq 'Key'
-        expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'A'
+        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['key']).to eq I18n.t('i18n_tasks.common.key')
+        expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'ES_TEXT'
       }
     end
 
-    it 'default placeholder: base_value for non-base locale' do
+    it 'default value: base_value for non-base locale' do
       in_test_app_dir {
         expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']).to be_nil
       }
@@ -119,12 +119,12 @@ describe 'i18n-tasks' do
       }
     end
 
-    it 'placeholder: value' do
+    it '--value' do
       in_test_app_dir {
         expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']).to be_nil
       }
       run_cmd :normalize, pattern_router: true
-      run_cmd :add_missing, locales: 'all', placeholder: 'TRME'
+      run_cmd :add_missing, locales: 'all', value: 'TRME'
       in_test_app_dir {
         expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a']).to eq 'TRME'
         expect(YAML.load_file('config/locales/devise.es.yml')['es']['devise']['a']).to eq 'ES_TEXT'
@@ -132,11 +132,11 @@ describe 'i18n-tasks' do
       }
     end
 
-    it 'placeholder: value with base_value' do
+    it '--value with %{value}' do
       in_test_app_dir {
         expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']).to be_nil
       }
-      run_cmd :add_missing, locales: 'all', placeholder: 'TRME %{base_value}'
+      run_cmd :add_missing, locales: 'all', value: 'TRME %{value}'
       in_test_app_dir {
         expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a']).to eq 'TRME EN_TEXT'
         expect(YAML.load_file('config/locales/en.yml')['en']['present_in_es_but_not_en']['a']).to eq 'TRME ES_TEXT'

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 ENV['RAILS_ENV'] = ENV['RAKE_ENV'] = 'test'
 
-unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-  require 'coveralls'
-  Coveralls.wear! 'rails'
+if ENV['TRAVIS'] && !(defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx')
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
 end
 
 $: << File.expand_path('../lib', __FILE__)

data/spec/support/test_codebase.rb

@@ -2,6 +2,7 @@
 require 'fileutils'
 require 'yaml'
 require_relative 'capture_std'
+require 'i18n/tasks/commands'
 
 module TestCodebase
   include CaptureStd
@@ -22,7 +23,9 @@ module TestCodebase
 
   def run_cmd(name, *args, &block)
     in_test_app_dir do
-      capture_stdout { i18n_cmd.send(name, *args, &block) }
+      silence_stderr {
+        capture_stdout { i18n_cmd.send(name, *args, &block) }
+      }
     end
   end
 

data/spec/used_keys_spec.rb

@@ -15,14 +15,14 @@ h1 = t 'b'
     TestCodebase.teardown
   end
 
-  it '#used_keys(source_locations: true)' do
-    used   = task.used_tree(source_locations: true)
+  it '#used_keys(source_occurrences: true)' do
+    used   = task.used_tree(source_occurrences: true)
     leaves = used.leaves.to_a
     expect(leaves.size).to eq 2
     expect_node_key_data(
         leaves[0],
         'a',
-        source_locations:
+        source_occurrences:
             [{pos: 6, line_num: 1, line_pos: 7, line: "div = t 'a'", src_path: 'a.html.slim'},
              {pos: 18, line_num: 2, line_pos: 7, line: "  p = t 'a'", src_path: 'a.html.slim'}]
     )
@@ -30,18 +30,18 @@ h1 = t 'b'
     expect_node_key_data(
         leaves[1],
         'b',
-        source_locations:
+        source_occurrences:
             [{pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'", src_path: 'a.html.slim'}]
     )
   end
 
-  it '#used_keys(source_locations: true, key_filter: "b*")' do
-    used_keys = task.used_tree(key_filter: 'b*', source_locations: true)
+  it '#used_keys(source_occurrences: true, key_filter: "b*")' do
+    used_keys = task.used_tree(key_filter: 'b*', source_occurrences: true)
     expect(used_keys.size).to eq 1
     expect_node_key_data(
         used_keys.leaves.first,
         'b',
-        source_locations:
+        source_occurrences:
             [{pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'", src_path: 'a.html.slim'}]
     )
   end

data/templates/config/i18n-tasks.yml

@@ -27,8 +27,8 @@ data:
   # YAML / JSON serializer options, passed to load / dump / parse / serialize
   yaml:
     write:
-      ## do not wrap lines at 80 characters (override default)
-      # line_width: -1
+      # do not wrap lines at 80 characters
+      line_width: -1
   json:
     write:
       # pretty print JSON

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -201,12 +215,32 @@ files:
 - README.md
 - Rakefile
 - bin/i18n-tasks
+- config/i18n-tasks.yml
+- config/locales/en.yml
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/command/collection.rb
+- lib/i18n/tasks/command/commander.rb
+- lib/i18n/tasks/command/commands/data.rb
+- lib/i18n/tasks/command/commands/eq_base.rb
+- lib/i18n/tasks/command/commands/health.rb
+- lib/i18n/tasks/command/commands/meta.rb
+- lib/i18n/tasks/command/commands/missing.rb
+- lib/i18n/tasks/command/commands/tree.rb
+- lib/i18n/tasks/command/commands/usages.rb
+- lib/i18n/tasks/command/commands/xlsx.rb
+- lib/i18n/tasks/command/dsl.rb
+- lib/i18n/tasks/command/dsl/cmd.rb
+- lib/i18n/tasks/command/dsl/cmd_opt.rb
+- lib/i18n/tasks/command/dsl/enum_opt.rb
+- lib/i18n/tasks/command/options/common.rb
+- lib/i18n/tasks/command/options/enum_opt.rb
+- lib/i18n/tasks/command/options/list_opt.rb
+- lib/i18n/tasks/command/options/locales.rb
+- lib/i18n/tasks/command/options/trees.rb
 - lib/i18n/tasks/command_error.rb
 - lib/i18n/tasks/commands.rb
-- lib/i18n/tasks/commands_base.rb
 - lib/i18n/tasks/configuration.rb
 - lib/i18n/tasks/console_context.rb
 - lib/i18n/tasks/data.rb
@@ -221,10 +255,11 @@ files:
 - lib/i18n/tasks/data/tree/nodes.rb
 - lib/i18n/tasks/data/tree/siblings.rb
 - lib/i18n/tasks/data/tree/traversal.rb
-- lib/i18n/tasks/fill_tasks.rb
 - lib/i18n/tasks/google_translation.rb
+- lib/i18n/tasks/html_keys.rb
 - lib/i18n/tasks/ignore_keys.rb
 - lib/i18n/tasks/key_pattern_matching.rb
+- lib/i18n/tasks/locale_list.rb
 - lib/i18n/tasks/locale_pathname.rb
 - lib/i18n/tasks/logging.rb
 - lib/i18n/tasks/missing_keys.rb
@@ -236,10 +271,15 @@ files:
 - lib/i18n/tasks/scanners/pattern_scanner.rb
 - lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb
 - lib/i18n/tasks/scanners/relative_keys.rb
+- lib/i18n/tasks/slop_command.rb
 - lib/i18n/tasks/split_key.rb
+- lib/i18n/tasks/stats.rb
+- lib/i18n/tasks/string_interpolation.rb
 - lib/i18n/tasks/unused_keys.rb
 - lib/i18n/tasks/used_keys.rb
 - lib/i18n/tasks/version.rb
+- spec/commands/data_commands_spec.rb
+- spec/commands/tree_commands_spec.rb
 - spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
 - spec/fixtures/app/assets/javascripts/application.js
@@ -249,6 +289,7 @@ files:
 - spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/google_translate_spec.rb
+- spec/i18n_spec.rb
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/locale_pathname_spec.rb
@@ -294,6 +335,8 @@ 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/tree_commands_spec.rb
 - spec/conservative_router_spec.rb
 - spec/file_system_data_spec.rb
 - spec/fixtures/app/assets/javascripts/application.js
@@ -303,6 +346,7 @@ test_files:
 - spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/google_translate_spec.rb
+- spec/i18n_spec.rb
 - spec/i18n_tasks_spec.rb
 - spec/key_pattern_matching_spec.rb
 - spec/locale_pathname_spec.rb