i18n-tasks 0.2.22 → 0.3.0.rc1

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

@@ -2,6 +2,9 @@ p #{t('ca.a')} #{t 'ca.b'} #{t "ca.c"}
 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.a'
+p = t 'x', scope: 'scoped'
+p = t 'x', scope: [:very, :scoped]
+p = t 'x', scope: [:scoped, code]
 p = t 'ignored_missing_key.a'
 p = t 'ignore.a'
 p = t 'ignored_pattern.some_key'
@@ -11,4 +14,4 @@ p = t 'numeric.a'
 p = t 'plural.a', count: 2
 p = t 'devise.a'
 p = t :missing_symbol_key
-p #{t :"missing_symbol.key_two"} #{t :'missing_symbol.key_three'}
+p #{t :"missing_symbol.key_two"} #{t :'missing_symbol.key_three'}

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

@@ -0,0 +1,2 @@
+p = t 'used.a'
+b = t 'used.a'

data/spec/fixtures/config/i18n-tasks.yml

@@ -37,7 +37,7 @@ ignore_unused:
 
 # do not report these keys as missing:
 ignore_missing:
-  - ignored_missing_key.a # one key to ignore
+  - ignored_missing_key.a # one key t ignore
   - ignored_pattern.*     # ignore the whole pattern
 
 # do not report these keys when they have the same value as the base locale version

data/spec/i18n_tasks_spec.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
 require 'spec_helper'
+require 'fileutils'
 
 describe 'rake i18n' do
   describe 'missing' do
     it 'detects missing or identical' do
-      TestCodebase.capture_stderr do
-        TestCodebase.rake_result('i18n:missing').should be_i18n_keys %w(
+      capture_stderr do
+        expect(TestCodebase.rake_result('i18n:missing')).to be_i18n_keys %w(
           en.used_but_missing.a en.relative.index.missing
           es.missing_in_es.a es.blank_in_es.a es.same_in_es.a
+          en.hash.pattern_missing.a en.hash.pattern_missing.b
           en.missing_symbol_key en.missing_symbol.key_two en.missing_symbol.key_three
         )
       end
@@ -18,7 +20,7 @@ describe 'rake i18n' do
     let(:expected_unused_keys) { %w(unused.a unused.numeric unused.plural) }
 
     it 'detects unused' do
-      TestCodebase.capture_stderr do
+      capture_stderr do
         out = TestCodebase.rake_result('i18n:unused')
         expect(out).to be_i18n_keys expected_unused_keys
       end
@@ -27,20 +29,18 @@ describe 'rake i18n' do
     it 'removes unused' do
       TestCodebase.in_test_app_dir do
         t = I18n::Tasks::BaseTask.new
-
         expected_unused_keys.each do |key|
-          expect(t.t(t.data[:en], key)).to be_present
-          expect(t.t(t.data[:es], key)).to be_present
+          expect(t.key_value?(key, :en)).to be_true
+          expect(t.key_value?(key, :es)).to be_true
         end
-
         ENV['CONFIRM'] = '1'
-        TestCodebase.capture_stderr { TestCodebase.rake_result('i18n:remove_unused') }
-
+        capture_stderr {
+          TestCodebase.rake_result('i18n:remove_unused')
+        }
         t.data.reload
-        # or save both to an xlsx file:
         expected_unused_keys.each do |key|
-          expect(t.t(t.data[:en], key)).to be_nil
-          expect(t.t(t.data[:es], key)).to be_nil
+          expect(t.key_value?(key, :en)).to be_false
+          expect(t.key_value?(key, :es)).to be_false
         end
       end
     end
@@ -49,9 +49,9 @@ describe 'rake i18n' do
   describe 'normalize' do
     it 'moves keys to the corresponding files as per data.write' do
       TestCodebase.in_test_app_dir {
-        File.exists?('config/locales/devise.en.yml').should be_false
+        expect(File).to_not exist 'config/locales/devise.en.yml'
         TestCodebase.rake_result('i18n:normalize')
-        YAML.load_file('config/locales/devise.en.yml')['en']['devise']['a'].should == 'EN_TEXT'
+        expect(YAML.load_file('config/locales/devise.en.yml')['en']['devise']['a']).to eq 'EN_TEXT'
       }
     end
   end
@@ -59,31 +59,59 @@ describe 'rake i18n' do
   describe 'spreadsheet report' do
     it 'saves' do
       TestCodebase.in_test_app_dir {
-        TestCodebase.rake_result('i18n:spreadsheet_report')
-        File.should exist 'tmp/i18n-report.xlsx'
+        capture_stderr { TestCodebase.rake_result('i18n:spreadsheet_report') }
+        expect(File).to exist 'tmp/i18n-report.xlsx'
+        FileUtils.cp('tmp/i18n-report.xlsx', '..')
       }
     end
 
   end
 
-  describe 'fill:' do
-    it 'add missing' do
-      TestCodebase.in_test_app_dir { YAML.load_file('config/locales/en.yml')['en']['used_but_missing'].should be_nil }
-      TestCodebase.rake_result('i18n:add_missing')
-      TestCodebase.in_test_app_dir { YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['a'].should == 'A' }
+  describe 'add_missing' do
+    it 'placeholder' do
+      TestCodebase.in_test_app_dir {
+        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']).to be_nil
+      }
+      TestCodebase.rake_result('i18n:add_missing:placeholder', 'base')
+      TestCodebase.in_test_app_dir {
+        expect(YAML.load_file('config/locales/en.yml')['en']['used_but_missing']['a']).to eq 'A'
+      }
     end
 
-    it 'base_value' do
-      TestCodebase.in_test_app_dir { YAML.load_file('config/locales/es.yml')['es']['missing_in_es'].should be_nil }
-      TestCodebase.rake_result('i18n:fill:base_value')
+    it 'placeholder[VALUE]' do
+      TestCodebase.in_test_app_dir {
+        expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']).to be_nil
+      }
+      TestCodebase.rake_result('i18n:add_missing:placeholder', 'all', 'TRME')
       TestCodebase.in_test_app_dir {
-        YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a'].should == 'EN_TEXT'
-        YAML.load_file('config/locales/devise.en.yml')['en']['devise']['a'].should == 'EN_TEXT'
-        YAML.load_file('config/locales/devise.es.yml')['es']['devise']['a'].should == 'ES_TEXT'
+        expect(YAML.load_file('config/locales/es.yml')['es']['missing_in_es']['a']).to eq 'TRME'
+        # does not touch existing, but moves to the right file:
+        expect(YAML.load_file('config/locales/devise.es.yml')['es']['devise']['a']).to eq 'ES_TEXT'
       }
     end
   end
 
+  describe 'tasks_config' do
+    it 'prints config' do
+      expect(YAML.load(TestCodebase.rake_result('i18n:tasks_config'))).to(
+          eq TestCodebase.in_test_app_dir { I18n::Tasks::BaseTask.new.config_for_inspect }
+      )
+    end
+  end
+
+  describe 'usages' do
+    it 'prints usages' do
+      capture_stderr do
+        expect(TestCodebase.rake_result('i18n:usages', 'used.*')).to eq(<<-TXT)
+used.a 2
+  app/views/usages.html.slim:1 p = t 'used.a'
+  app/views/usages.html.slim:2 b = t 'used.a'
+TXT
+      end
+    end
+  end
+
+
   # --- setup ---
   BENCH_KEYS = 100
   before do
@@ -92,8 +120,10 @@ describe 'rake i18n' do
       {
         'ca'                  => {'a' => v, 'b' => v, 'c' => v, 'd' => v, 'e' => "#{v}%{i}", 'f' => "#{v}%{i}"},
         'cb'                  => {'a' => v, 'b' => "#{v}%{i}"},
-        'hash_pattern'        => {'a' => v},
-        'hash_pattern2'       => {'a' => v},
+        'hash' => {
+            'pattern'  => {'a' => v},
+            'pattern2' => {'a' => v},
+        },
         'unused'              => {'a' => v, 'numeric' => v_num, 'plural' => {'one' => v, 'other' => v}},
         'ignore_unused'       => {'a' => v},
         'missing_in_es'       => {'a' => v},
@@ -110,7 +140,10 @@ describe 'rake i18n' do
         },
         'numeric'             => {'a' => v_num},
         'plural'              => {'a' => {'one' => v, 'other' => "%{count} #{v}s"}},
-        'devise'              => {'a' => v}
+        'devise'              => {'a' => v},
+        'scoped' => {'x' => v},
+        'very'   => {'scoped' => {'x' => v}},
+        'used'   => {'a' => v}
       }.tap { |r|
         gen = r["bench"] = {}
         BENCH_KEYS.times { |i| gen["key#{i}"] = v }
@@ -124,18 +157,13 @@ describe 'rake i18n' do
     es_data['ignore_eq_base_all']['a'] = 'EN_TEXT'
     es_data['ignore_eq_base_es']['a']  = 'EN_TEXT'
 
-    fs = {
+    fs = fixtures_contents.merge(
       'config/locales/en.yml'                 => {'en' => en_data}.to_yaml,
       'config/locales/es.yml'                 => {'es' => es_data}.to_yaml,
-      'config/i18n-tasks.yml'                 => load_fixture('config/i18n-tasks.yml'),
-      'app/views/index.html.slim'             => load_fixture('app/views/index.html.slim'),
-      'app/views/relative/index.html.slim'    => load_fixture('app/views/relative/index.html.slim'),
-      'app/controllers/events_controller.rb'  => load_fixture('app/controllers/events_controller.rb'),
-      'app/assets/javascripts/application.js' => load_fixture('app/assets/javascripts/application.js'),
-
       # test that our algorithms can scale to the order of {BENCH_KEYS} keys.
       'vendor/heavy.file' => BENCH_KEYS.times.map { |i| "t('bench.key#{i}') " }.join
-    }
+    )
+
     TestCodebase.setup fs
   end
 

data/spec/pattern_scanner_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Pattern Scanner' do
   describe 'default pattern' do
-    let!(:pattern) { I18n::Tasks::Scanners::PatternScanner::DEFAULT_PATTERN }
+    let!(:pattern) { I18n::Tasks::Scanners::PatternScanner.new.default_pattern }
 
     ['t "a.b"', "t 'a.b'", 't("a.b")', "t('a.b')",
      "t('a.b', :arg => val)", "t('a.b', arg: val)",

data/spec/spec_helper.rb

@@ -21,4 +21,5 @@ Dir['spec/support/**/*.rb'].each { |f| require "./#{f}" }
 
 RSpec.configure do |config|
   config.include FixturesSupport
-end
+  config.include CaptureStd
+end

data/spec/support/capture_std.rb

@@ -0,0 +1,17 @@
+module CaptureStd
+  def capture_stderr
+    err, $stderr = $stderr, StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = err
+  end
+
+  def capture_stdout
+    out, $stdout = $stdout, StringIO.new
+    yield
+    $stdout.string
+  ensure
+    $stdout = out
+  end
+end

data/spec/support/fixtures.rb

@@ -1,7 +1,14 @@
 # quick'n'dirty fixture loader
 module FixturesSupport
-  def load_fixture(path)
-    Pathname.new('spec/fixtures').join(path).expand_path.read
+  def fixtures_contents
+    @fixtures_contents ||= begin
+      fixtures_path = 'spec/fixtures'
+      Dir.glob("#{fixtures_path}/**/*").inject({}) { |h, path|
+        next h if File.directory?(path)
+        h[path[fixtures_path.length + 1..-1]] = Pathname.new(path).read
+        h
+      }
+    end
   end
 end
 

data/spec/support/test_codebase.rb

@@ -1,11 +1,12 @@
 require 'fileutils'
 require 'yaml'
+require_relative 'capture_std'
 
 module TestCodebase
+  include CaptureStd
   extend self
   AT = 'tmp/test_codebase'
 
-
   def setup(files = {})
     FileUtils.mkdir_p AT
     in_test_app_dir do
@@ -20,11 +21,11 @@ module TestCodebase
     FileUtils.rm_rf AT
   end
 
-  def rake_result(task)
+  def rake_result(task, *args)
     in_test_app_dir {
       rake_task = Rake::Task[task]
       rake_task.reenable
-      capture_stdout { rake_task.invoke }
+      capture_stdout { rake_task.invoke(*args) }
     }
   end
 
@@ -40,20 +41,6 @@ module TestCodebase
       @in_dir = false
     end
   end
+end
 
-  def capture_stderr
-    err, $stderr = $stderr, StringIO.new
-    yield
-    $stderr.string
-  ensure
-    $stderr = err
-  end
 
-  def capture_stdout
-    out, $stdout = $stdout, StringIO.new
-    yield
-    $stdout.string
-  ensure
-    $stdout = out
-  end
-end

data/spec/support/test_codebase_env.rake

@@ -1,6 +1,8 @@
 task :environment do
-  I18n.default_locale = 'en'
-  I18n.available_locales = %w(en es)
+  Thread.exclusive do
+    I18n.default_locale    = 'en'
+    I18n.available_locales = %w(en es)
+  end
 end
 
 namespace :i18n do

data/spec/used_keys_spec.rb

@@ -11,6 +11,7 @@ div = t 'a'
 h1 = t 'b'
     SLIM
     TestCodebase.in_test_app_dir { ex.run }
+    TestCodebase.teardown
   end
 
   it '#used_keys(true) finds usages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.4.7
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +198,8 @@ description: |2
       and prefill missing keys. Supports relative and plural keys and Google Translate.
 email:
 - glex.spb@gmail.com
-executables: []
+executables:
+- i18n-tasks
 extensions: []
 extra_rdoc_files: []
 files:
@@ -196,9 +211,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/i18n-tasks
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/commands.rb
+- lib/i18n/tasks/commands_base.rb
 - lib/i18n/tasks/configuration.rb
 - lib/i18n/tasks/data/adapter/json_adapter.rb
 - lib/i18n/tasks/data/adapter/yaml_adapter.rb
@@ -210,6 +228,9 @@ files:
 - lib/i18n/tasks/google_translation.rb
 - lib/i18n/tasks/ignore_keys.rb
 - lib/i18n/tasks/key.rb
+- lib/i18n/tasks/key/key_group.rb
+- lib/i18n/tasks/key/match_pattern.rb
+- lib/i18n/tasks/key/usages.rb
 - lib/i18n/tasks/key_group.rb
 - lib/i18n/tasks/key_pattern_matching.rb
 - lib/i18n/tasks/missing_keys.rb
@@ -221,6 +242,7 @@ files:
 - lib/i18n/tasks/reports/terminal.rb
 - lib/i18n/tasks/scanners/base_scanner.rb
 - lib/i18n/tasks/scanners/pattern_scanner.rb
+- lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb
 - lib/i18n/tasks/translation_data.rb
 - lib/i18n/tasks/unused_keys.rb
 - lib/i18n/tasks/used_keys.rb
@@ -231,6 +253,7 @@ files:
 - spec/fixtures/app/controllers/events_controller.rb
 - spec/fixtures/app/views/index.html.slim
 - spec/fixtures/app/views/relative/index.html.slim
+- spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/google_translate_spec.rb
 - spec/i18n_tasks_spec.rb
@@ -240,6 +263,7 @@ files:
 - spec/readme_spec.rb
 - spec/relative_keys_spec.rb
 - spec/spec_helper.rb
+- spec/support/capture_std.rb
 - spec/support/fixtures.rb
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/key_pattern_matcher.rb
@@ -262,9 +286,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -278,6 +302,7 @@ test_files:
 - spec/fixtures/app/controllers/events_controller.rb
 - spec/fixtures/app/views/index.html.slim
 - spec/fixtures/app/views/relative/index.html.slim
+- spec/fixtures/app/views/usages.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/google_translate_spec.rb
 - spec/i18n_tasks_spec.rb
@@ -287,6 +312,7 @@ test_files:
 - spec/readme_spec.rb
 - spec/relative_keys_spec.rb
 - spec/spec_helper.rb
+- spec/support/capture_std.rb
 - spec/support/fixtures.rb
 - spec/support/i18n_tasks_output_matcher.rb
 - spec/support/key_pattern_matcher.rb