i18n-tasks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be5ef7d26c3df1ed7c2d3492c2ddbee544e561c0
-  data.tar.gz: c294aa392797e900e990defa0fbed3c5a7d7cafa
+  metadata.gz: e4a2353a4fb77dc7513547b875f9e22959bf0e65
+  data.tar.gz: 327f3a171a0991b71aba09799d7e508967f88a63
 SHA512:
-  metadata.gz: 783c897ba722831c9893301270e3a8dee8c7dd0775a32bb293c137a3b643f4fd50c9d05628e794891c72bbcfadce25f844da3d3846b750c495ea94bf8ee15d00
-  data.tar.gz: df5d3744b47f1ed0366cb6305823d6f38737e4b583af2ac586808ada0a9a2a0c7a7470db592871962ad1ff3e82a5e4d76790d41207445ca3080054c666573e9a
+  metadata.gz: cc558aa7656a508ce7fa49a49e3b842bb4922625c6387edef62242b9d40f22fdc1052e2ec06429246ca66e85d583f26afb4fe1ac51c6b01409ad1e9f18fe9af7
+  data.tar.gz: e2a120d28f080bb114b9fe31749a881224b654e6beeac8fb60494a6c982a8928cf480cc19a9f98d4a21ea56347bb6795d7cbb6763c89d0db99500ccdfcab77bb

data/README.md

@@ -21,7 +21,7 @@ Installation
 
 Simply add to Gemfile:
 
-    gem 'i18n-tasks', '~> 0.0.1'
+    gem 'i18n-tasks', '~> 0.0.3'
 
 Configuration
 -------------

data/i18n-tasks.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails'
   spec.add_dependency 'rake'
+  spec.add_dependency 'term-ansicolor'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec-rails'

data/lib/i18n/tasks/missing.rb

@@ -3,17 +3,42 @@ require 'i18n/tasks/base_task'
 module I18n
   module Tasks
     class Missing < BaseTask
+      DESC = 'find all missing keys and missing translations'
       def perform
+        $stderr.puts DESC
+        # missing keys (in the code but not in base locale data)
+        pattern_prefixes = find_source_pattern_prefixes
+        find_source_keys.each do |key|
+          if t(base[base_locale], key).blank? && !pattern_prefixes.any? { |pp| key.start_with?(pp) }
+            puts "#{red print_locale base_locale}  #{red "✗ #{bold 'none'}"}\t #{print_key key}"
+          end
+        end
+
+        # missing translations (present in base locale, but untranslated in another locale )
         (I18n.available_locales.map(&:to_s) - [base_locale]).each do |locale|
           trn = get_locale_data(locale)[locale]
           traverse base[base_locale] do |key, base_value|
             translated = t(trn, key)
-            if translated.blank? || translated == base_value
-              puts "#{locale}.#{key}: #{base_value}"
+            data       = "\t #{print_key key} #{cyan base_value}"
+            s = if translated.blank?
+              "#{yellow bold '∅ blank'}#{data}"
+            elsif translated == base_value
+              "#{yellow bold "= #{base_locale}" }#{data}"
             end
+            puts "#{print_locale locale}  #{s}" if s
           end
         end
       end
+
+      private
+      def print_locale(locale)
+        ' ' + bold(locale.ljust(5))
+      end
+
+      def print_key(key)
+        magenta(key).ljust(50)
+      end
+
     end
   end
 end

data/lib/i18n/tasks/task_helpers.rb

@@ -1,8 +1,10 @@
 require 'open3'
+require 'term/ansicolor'
 
 module I18n
   module Tasks
     module TaskHelpers
+      include Term::ANSIColor
       def run_command(*args)
         _in, out, _err = Open3.popen3(*args)
         out.gets nil
@@ -19,6 +21,22 @@ module I18n
         "config/locales/#{locale}.yml"
       end
 
+      # find all keys in the source
+      def find_source_keys
+        @source_keys ||= begin
+          grep_out = run_command 'grep', '-horI', %q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, 'app/'
+          used_keys = grep_out.split("\n").map { |r| r.match(/['"](.*?)['"]/)[1] }.uniq.to_set
+        end
+      end
+
+      def find_source_pattern_keys
+        find_source_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }
+      end
+
+      def find_source_pattern_prefixes
+        find_source_pattern_keys.map { |k| k.split(/\.?#/)[0] }
+      end
+
       # traverse hash, yielding with full key and value
       def traverse(path = '', hash, &block)
         hash.each do |k, v|

data/lib/i18n/tasks/unused.rb

@@ -4,12 +4,11 @@ module I18n
   module Tasks
     class Unused < BaseTask
       def perform
-        grep_out = run_command 'grep', '-horI', %q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, 'app/'
-        used_keys = grep_out.split("\n").map { |r| r.match(/['"](.*?)['"]/)[1] }.uniq.to_set
-        pattern_prefixes = used_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }.map { |k| k.split(/\.?#/)[0] }
+        used_keys = find_source_keys
+        pattern_prefixes = find_source_pattern_prefixes
         traverse base[base_locale] do |key, value|
           if !used_keys.include?(key) && !pattern_prefixes.any? { |pp| key.start_with?(pp) }
-            puts "#{key}: #{value}"
+            puts "#{yellow 'unused'.ljust(10)}#{magenta(key).ljust(60)}\t#{cyan value}"
           end
         end
       end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = "0.0.2"
+    VERSION = '0.0.3'
   end
 end

data/spec/i18n_tasks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'rake i18n' do
   describe 'missing' do
     it 'detects missing or identical' do
-      TestCodebase.rake_result('i18n:missing').should be_i18n_keys %w(es.missing_in_es.a es.blank_in_es.a es.same_in_es.a)
+      TestCodebase.rake_result('i18n:missing').should be_i18n_keys %w(en.used_but_missing.a es.missing_in_es.a es.blank_in_es.a es.same_in_es.a)
     end
   end
 
@@ -48,6 +48,7 @@ describe 'rake i18n' do
         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'
         SLIM
         'app/controllers/events_controller.slim' => <<-RUBY,
         class EventsController < ApplicationController

data/spec/spec_helper.rb

@@ -5,9 +5,10 @@ require 'i18n/tasks'
 require 'rake'
 Rake.load_rakefile 'tasks/i18n-tasks.rake'
 Rake.load_rakefile 'support/test_codebase_env.rake'
+require 'term/ansicolor'
+Term::ANSIColor::coloring = false
 Dir['spec/support/**/*.rb'].each { |f| require "./#{f}" }
 
 RSpec.configure do |config|
-
 end
 

data/spec/support/i18n_tasks_output_matcher.rb

@@ -1,5 +1,14 @@
 RSpec::Matchers.define :be_i18n_keys do |expected|
   match do |actual|
-    actual.split("\n").map { |x| x.split(':')[0] }.sort == expected.sort
+    r = actual.split("\n").map { |x|
+      x.strip!
+      key = x.gsub(/\s+/, ' ').split(' ').reverse.detect { |p| p && p.include?('.') }
+      if x =~ /^\w{2}\b/
+        x.split(' ', 2)[0] + '.' + key
+      else
+        key
+      end
+    }
+    r.sort == expected.sort
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  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: bundler
   requirement: !ruby/object:Gem::Requirement