i18n-tasks 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4b9791c830f1768141d6d43dba65b1e3b963e90
-  data.tar.gz: ddc91d95b7bdf1a0590af2c4175d71ac5a896fa7
+  metadata.gz: adc5e2843018cd679f4c0ee2b0b424e662d161e5
+  data.tar.gz: e0b636d1930cde221e2c72aac7b46aad29e32130
 SHA512:
-  metadata.gz: fd0ea56aef3a916fd7f1a1ae6f51bdd83b01b69aa66f9c9ed8a38e0f82e3d59550443ac116a731227b8330f2866fc8eb69fca8841d2731c013a681f2021f9f13
-  data.tar.gz: b4f2afc081cda21da193205db3d5f4555e41cb986c47cb9f85a29387fee4daf81d99c41436fd3a7c6be4c5510ac8f23f836fb864432d66aca96d98fb5f544452
+  metadata.gz: fd93fca95e142f5b01753b6841b77b1d64f22e4366e38e2777d418dafc6c3b553daacb8ecc3773a28b7816dca3d03f0dd33a10e60882e7147a8eb95c7b9ac6ea
+  data.tar.gz: e2ca0ffa8f077911d495ba53a704ffb1d255a801e6f076e0e1b9b194e047ae7f5d3a412f8b6cb81c27f037cf0a11f50971dadc9aed6dd0dc8a1a8016fa37f0fa

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-- 2.1.1
+- 2.1.3
 - 2.0.0
 - 1.9.3
-- jruby-1.7.13
+- jruby
 - rbx-2.2.10
 env:
   global:

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.7.8
+
+* Fix Google Translate issues with non-string keys [#100](https://github.com/glebm/i18n-tasks/pull/100)
+* Fix an issue with certain HAML not being parsed [#96](https://github.com/glebm/i18n-tasks/issues/96) [#102](https://github.com/glebm/i18n-tasks/pull/102)
+* Fix other minor issues
+
 ## 0.7.7
 
 * Fix regression: keys are sorted once again [#92](https://github.com/glebm/i18n-tasks/issues/92).

data/README.md

@@ -22,7 +22,7 @@ i18n-tasks can be used with any project using [i18n][i18n-gem] (default in Rails
 Add it to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.7.7'
+gem 'i18n-tasks', '~> 0.7.8'
 ```
 
 Copy default [configuration file](#configuration) (optional):
@@ -114,7 +114,7 @@ Sort the keys:
 $ i18n-tasks normalize
 ```
 
-Sort the keys, and move them to the respective files as defined by (`config.write`)[#multiple-locale-files]:
+Sort the keys, and move them to the respective files as defined by [`config.write`](#multiple-locale-files):
 
 ```console
 $ i18n-tasks normalize -p
@@ -408,7 +408,7 @@ Add a custom task like the ones defined by the gem:
 
 ```ruby
 # my_commands.rb
-class MyCommands
+module MyCommands
   include ::I18n::Tasks::Command::Collection
   cmd :my_task, desc: 'my custom task'
   def my_task(opts = {})
@@ -419,7 +419,7 @@ end
 ```yaml
 # config/i18n-tasks.yml
 <%
-  require 'my_commands'
+  require './my_commands'
   I18n::Tasks::Commands.send :include, MyCommands
 %>
 ```

data/config/i18n-tasks.yml

@@ -1,5 +1,8 @@
 # i18n-tasks works on itself! this is the internal config
 
+# This is not the default config for new apps, but is the internal config for i18n-tasks to analyze itself.
+# You can find the default config here: https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
+
 base_locale: en
 ## i18n-tasks detects locales automatically from the existing locale files
 ## uncomment to set locales explicitly
@@ -59,10 +62,6 @@ search:
   ## Or, File.fnmatch patterns to include
   # include: ["*.rb", "*.html.slim"]
 
-  ## Lines starting with # or / are ignored by default
-  # ignore_lines:
-  #  - "^\\s*[#/](?!\\si18n-tasks-use)"
-
 ## Google Translate
 # translation:
 #   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate

data/config/locales/en.yml

@@ -12,7 +12,6 @@ en:
           data_format: 'Data format: %{valid_text}. %{default_text}.'
           key_pattern: Filter by key pattern (e.g. 'common.*')
           key_pattern_to_rename: Full key (pattern) to rename. Required
-          keys: List of keys separated by commas (,), spaces, or newlines.
           locale: 'Locale. Default: base'
           locale_to_translate_from: 'Locale to translate from (default: base)'
           locales_filter: 'Comma-separated list of locale(s) to process. Default: all. Special: base.'
@@ -82,6 +81,8 @@ en:
       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:

data/config/locales/ru.yml

@@ -12,7 +12,6 @@ ru:
           data_format: "Формат данных: %{valid_text}. %{default_text}."
           key_pattern: "Маска ключа (например, common.*)"
           key_pattern_to_rename: "Полный ключ (шаблон) для переименования. Необходимый параметр."
-          keys: "Список ключей, разделенных запятыми (,), пробелами или символами новой строки."
           locale: "Язык. По умолчанию: base"
           locale_to_translate_from: "Язык, с которого переводить (по умолчанию: base)"
           locales_filter: "Список языков для обработки, разделенный запятыми (,). По умолчанию: все.
@@ -83,8 +82,10 @@ ru:
       title: "Данные (%{locales}):"
     google_translate:
       errors:
+        no_api_key: Задайте ключ API Google через переменную окружения GOOGLE_TRANSLATE_API_KEY
+          или translation.api_key в config/i18n-tasks.yml. Получите ключ через https://code.google.com/apis/console.
         no_results: Google Translate не дал результатов. Убедитесь в том, что платежная информация
-          добавлена в в https://code.google.com/apis/console.
+          добавлена в https://code.google.com/apis/console.
     health:
       no_keys_detected: "Ключи не обнаружены. Проверьте data.read в config/i18n-tasks.yml."
     missing:

data/i18n-tasks.gemspec

@@ -14,7 +14,6 @@ i18n-tasks helps you find and manage missing and unused translations.
 
 It analyses code statically for key usages, such as `I18n.t('some.key')`, in order to report keys that are missing or unused,
 pre-fill missing keys (optionally from Google Translate), and remove unused keys.
- well.
 TEXT
   s.post_install_message = <<-TEXT
 # Install default configuration:

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

@@ -7,7 +7,7 @@ module I18n::Tasks
     module Collection
       def self.included(base)
         base.module_eval do
-          extend Command::DSL
+          include Command::DSL
           include Command::Options::Common
           include Command::Options::Locales
           include Command::Options::Trees

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

@@ -7,13 +7,13 @@ module I18n::Tasks
         cmd_opt :pattern_router, {
             short: :p,
             long:  :pattern_router,
-            desc: proc { I18n.t('i18n_tasks.cmd.args.desc.pattern_router') },
+            desc: t('i18n_tasks.cmd.args.desc.pattern_router'),
             conf:  {argument: false, optional: true}
         }
 
         cmd :normalize,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.normalize') },
+            desc: t('i18n_tasks.cmd.desc.normalize'),
             opt:  cmd_opts(:locales, :pattern_router)
 
         def normalize(opt = {})
@@ -22,7 +22,7 @@ module I18n::Tasks
 
         cmd :data,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.data') },
+            desc: t('i18n_tasks.cmd.desc.data'),
             opt:  cmd_opts(:locales, :out_format)
 
         def data(opt = {})
@@ -31,7 +31,7 @@ module I18n::Tasks
 
         cmd :data_merge,
             args: '[tree ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_merge') },
+            desc: t('i18n_tasks.cmd.desc.data_merge'),
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_merge(opt = {})
@@ -42,7 +42,7 @@ module I18n::Tasks
 
         cmd :data_write,
             args: '[tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_write') },
+            desc: t('i18n_tasks.cmd.desc.data_write'),
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_write(opt = {})
@@ -53,7 +53,7 @@ module I18n::Tasks
 
         cmd :data_remove,
             args: '[tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.data_remove') },
+            desc: t('i18n_tasks.cmd.desc.data_remove'),
             opt:  cmd_opts(:data_format, :nostdin)
 
         def data_remove(opt = {})

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :eq_base,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.eq_base') },
+            desc: t('i18n_tasks.cmd.desc.eq_base'),
             opt:  cmd_opts(:locales, :out_format)
 
         def eq_base(opt = {})

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

@@ -6,14 +6,14 @@ module I18n::Tasks
 
         cmd :health,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.health') },
+            desc: t('i18n_tasks.cmd.desc.health'),
             opt:  cmd_opts(:locales, :out_format)
 
         def health(opt = {})
           forest = i18n.data_forest(opt[:locales])
           stats  = i18n.forest_stats(forest)
           if stats[:key_count].zero?
-            raise CommandError.new I18n.t('i18n_tasks.health.no_keys_detected')
+            raise CommandError.new t('i18n_tasks.health.no_keys_detected')
           end
           terminal_report.forest_stats forest, stats
           missing opt

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :config,
             args: '[section ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.config') }
+            desc: t('i18n_tasks.cmd.desc.config')
 
         def config(opts = {})
           cfg = i18n.config_for_inspect
@@ -17,13 +17,13 @@ module I18n::Tasks
           puts cfg
         end
 
-        cmd :gem_path, desc: proc { I18n.t('i18n_tasks.cmd.desc.gem_path') }
+        cmd :gem_path, desc: t('i18n_tasks.cmd.desc.gem_path')
 
         def gem_path
           puts I18n::Tasks.gem_path
         end
 
-        cmd :irb, desc: I18n.t('i18n_tasks.cmd.desc.irb')
+        cmd :irb, desc: t('i18n_tasks.cmd.desc.irb')
 
         def irb
           require 'i18n/tasks/console_context'

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

@@ -7,12 +7,12 @@ module I18n::Tasks
         enum_opt :missing_types, I18n::Tasks::MissingKeys.missing_keys_types
         cmd_opt :missing_types, enum_list_opt_attr(
             :t, :types=, enum_opt(:missing_types),
-            proc { |valid, default| I18n.t('i18n_tasks.cmd.args.desc.missing_types', valid: valid, default: default) },
-            proc { |invalid, valid| I18n.t('i18n_tasks.cmd.errors.invalid_missing_type', invalid: invalid * ', ', valid: valid * ', ', count: invalid.length) })
+            proc { |valid, default| t('i18n_tasks.cmd.args.desc.missing_types', valid: valid, default: default) },
+            proc { |invalid, valid| t('i18n_tasks.cmd.errors.invalid_missing_type', invalid: invalid * ', ', valid: valid * ', ', count: invalid.length) })
 
         cmd :missing,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.missing') },
+            desc: t('i18n_tasks.cmd.desc.missing'),
             opt:  cmd_opts(:locales, :out_format, :missing_types)
 
         def missing(opt = {})
@@ -21,14 +21,14 @@ module I18n::Tasks
 
         cmd :translate_missing,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.translate_missing') },
+            desc: t('i18n_tasks.cmd.desc.translate_missing'),
             opt:  cmd_opts(:locales, :locale_to_translate_from) << cmd_opt(:out_format).except(:short)
 
         def translate_missing(opt = {})
           missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
           translated = i18n.google_translate_forest missing, opt[:from]
           i18n.data.merge! translated
-          log_stderr I18n.t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
+          log_stderr t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
           print_forest translated, opt
         end
 
@@ -36,14 +36,14 @@ module I18n::Tasks
 
         cmd :add_missing,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.add_missing') },
+            desc: t('i18n_tasks.cmd.desc.add_missing'),
             opt:  cmd_opts(:locales, :out_format) <<
-                      cmd_opt(:value).merge(desc: proc { "#{cmd_opt(:value)[:desc].call}. #{I18n.t('i18n_tasks.cmd.args.default_text', value: DEFAULT_ADD_MISSING_VALUE)}" })
+                      cmd_opt(:value).merge(desc: proc { "#{cmd_opt(:value)[:desc].call}. #{t('i18n_tasks.cmd.args.default_text', value: DEFAULT_ADD_MISSING_VALUE)}" })
 
         def add_missing(opt = {})
           forest = i18n.missing_keys(opt).set_each_value!(opt[:value] || DEFAULT_ADD_MISSING_VALUE)
           i18n.data.merge! forest
-          log_stderr I18n.t('i18n_tasks.add_missing.added', count: forest.leaves.count)
+          log_stderr t('i18n_tasks.add_missing.added', count: forest.leaves.count)
           print_forest forest, opt
         end
       end

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :tree_translate,
             args: '[tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_translate') },
+            desc: t('i18n_tasks.cmd.desc.tree_translate'),
             opt:  cmd_opts(:locale_to_translate_from) << cmd_opt(:data_format).except(:short)
 
         def tree_translate(opts = {})
@@ -18,7 +18,7 @@ module I18n::Tasks
 
         cmd :tree_merge,
             args: '[tree ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_merge') },
+            desc: t('i18n_tasks.cmd.desc.tree_merge'),
             opt:  cmd_opts(:data_format, :nostdin)
 
         def tree_merge(opts = {})
@@ -27,7 +27,7 @@ module I18n::Tasks
 
         cmd :tree_filter,
             args: '[pattern] [tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_filter') },
+            desc: t('i18n_tasks.cmd.desc.tree_filter'),
             opt:  cmd_opts(:data_format, :pattern)
 
         def tree_filter(opt = {})
@@ -42,12 +42,12 @@ module I18n::Tasks
 
         cmd :tree_rename_key,
             args: '<key> <name> [tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_rename_key') },
+            desc: t('i18n_tasks.cmd.desc.tree_rename_key'),
             opt:  [
                       cmd_opt(:pattern).merge(short: :k, long: :key=, desc: proc {
-                        I18n.t('i18n_tasks.cmd.args.desc.key_pattern_to_rename') }),
+                        t('i18n_tasks.cmd.args.desc.key_pattern_to_rename') }),
                       cmd_opt(:pattern).merge(short: :n, long: :name=, desc: proc {
-                        I18n.t('i18n_tasks.cmd.args.desc.new_key_name') })
+                        t('i18n_tasks.cmd.args.desc.new_key_name') })
                   ] + cmd_opts(:data_format)
 
         def tree_rename_key(opt = {})
@@ -62,7 +62,7 @@ module I18n::Tasks
 
         cmd :tree_subtract,
             args: '[tree A] [tree B ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_subtract') },
+            desc: t('i18n_tasks.cmd.desc.tree_subtract'),
             opt:  cmd_opts(:data_format, :nostdin)
 
         def tree_subtract(opt = {})
@@ -73,7 +73,7 @@ module I18n::Tasks
 
         cmd :tree_set_value,
             args: '[value] [tree]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_set_value') },
+            desc: t('i18n_tasks.cmd.desc.tree_set_value'),
             opt:  cmd_opts(:value, :data_format, :nostdin, :pattern)
 
         def tree_set_value(opt = {})
@@ -87,7 +87,7 @@ module I18n::Tasks
 
         cmd :tree_convert,
             args: '<tree>',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.tree_convert') },
+            desc: t('i18n_tasks.cmd.desc.tree_convert'),
             opt:  [cmd_opt(:data_format).merge(short: :f, long: :from=),
                    cmd_opt(:out_format).merge(short: :t, long: :to=)]
 

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

@@ -7,12 +7,12 @@ module I18n::Tasks
         cmd_opt :strict, {
             short: :s,
             long:  :strict,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.strict') }
+            desc:  t('i18n_tasks.cmd.args.desc.strict')
         }
 
         cmd :find,
             args: '[pattern]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.find') },
+            desc: t('i18n_tasks.cmd.desc.find'),
             opt:  cmd_opts(:out_format, :pattern)
 
         def find(opt = {})
@@ -22,7 +22,7 @@ module I18n::Tasks
 
         cmd :unused,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.unused') },
+            desc: t('i18n_tasks.cmd.desc.unused'),
             opt:  cmd_opts(:locales, :out_format, :strict)
 
         def unused(opt = {})
@@ -31,7 +31,7 @@ module I18n::Tasks
 
         cmd :remove_unused,
             args: '[locale ...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.remove_unused') },
+            desc: t('i18n_tasks.cmd.desc.remove_unused'),
             opt:  cmd_opts(:locales, :out_format, :strict, :confirm)
 
         def remove_unused(opt = {})
@@ -40,10 +40,10 @@ module I18n::Tasks
             terminal_report.unused_keys(unused_keys)
             confirm_remove_unused!(unused_keys, opt)
             removed = i18n.data.remove_by_key!(unused_keys)
-            log_stderr I18n.t('i18n_tasks.remove_unused.removed', count: unused_keys.leaves.count)
+            log_stderr t('i18n_tasks.remove_unused.removed', count: unused_keys.leaves.count)
             print_forest removed, opt
           else
-            log_stderr bold green I18n.t('i18n_tasks.remove_unused.noop')
+            log_stderr bold green t('i18n_tasks.remove_unused.noop')
           end
         end
 
@@ -53,8 +53,8 @@ module I18n::Tasks
           return if ENV['CONFIRM'] || opt[:confirm]
           locales = bold(opt[:locales] * ', ')
           msg     = [
-              red(I18n.t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
-              yellow(I18n.t('i18n_tasks.common.continue_q')),
+              red(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
+              yellow(t('i18n_tasks.common.continue_q')),
               yellow('(yes/no)')
           ] * ' '
           exit 1 unless agree msg

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

@@ -6,7 +6,7 @@ module I18n::Tasks
 
         cmd :xlsx_report,
             args: '[locale...]',
-            desc: proc { I18n.t('i18n_tasks.cmd.desc.xlsx_report') },
+            desc: t('i18n_tasks.cmd.desc.xlsx_report'),
             opt:  [cmd_opt(:locales),
                    {short: :p, long: :path=, desc: 'Destination path', conf: {default: 'tmp/i18n-report.xlsx'}}]
 

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

@@ -5,22 +5,37 @@ require 'i18n/tasks/command/dsl/enum_opt'
 module I18n::Tasks
   module Command
     module DSL
-      include DSL::Cmd
-      include DSL::CmdOpt
-      include DSL::EnumOpt
-
-      def self.extended(base)
-        base.instance_variable_set :@dsl, HashWithIndifferentAccess.new { |h, k|
-          h[k] = HashWithIndifferentAccess.new
-        }
+      def self.included(base)
+        base.module_eval do
+          @dsl = HashWithIndifferentAccess.new { |h, k|
+            h[k] = HashWithIndifferentAccess.new
+          }
+          extend ClassMethods
+        end
       end
 
-      def included(base)
-        base.instance_variable_get(:@dsl).deep_merge!(@dsl)
+      def t(*args)
+        I18n.t(*args)
       end
 
-      def dsl(key)
-        @dsl[key]
+      module ClassMethods
+        include DSL::Cmd
+        include DSL::CmdOpt
+        include DSL::EnumOpt
+
+        def dsl(key)
+          @dsl[key]
+        end
+
+        # late-bound I18n.t for module bodies
+        def t(*args)
+          proc { I18n.t(*args) }
+        end
+
+        # if class is a module, merge DSL definitions when it is included
+        def included(base)
+          base.instance_variable_get(:@dsl).deep_merge!(@dsl)
+        end
       end
     end
   end

data/lib/i18n/tasks/command/options/common.rb

@@ -5,7 +5,7 @@ module I18n::Tasks
   module Command
     module Options
       module Common
-        extend Command::DSL
+        include Command::DSL
         include Options::EnumOpt
         include Options::ListOpt
 
@@ -14,28 +14,28 @@ module I18n::Tasks
         cmd_opt :nostdin, {
             short: :S,
             long:  :nostdin,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.nostdin') },
+            desc:  t('i18n_tasks.cmd.args.desc.nostdin'),
             conf:  {default: false}
         }
 
         cmd_opt :confirm, {
             short: :y,
             long:  :confirm,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.confirm') },
+            desc:  t('i18n_tasks.cmd.args.desc.confirm'),
             conf:  {default: false}
         }
 
         cmd_opt :pattern, {
             short: :p,
             long:  :pattern=,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.key_pattern') },
+            desc:  t('i18n_tasks.cmd.args.desc.key_pattern'),
             conf:  {argument: true, optional: false}
         }
 
         cmd_opt :value, {
             short: :v,
             long:  :value=,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.value') },
+            desc:  t('i18n_tasks.cmd.args.desc.value'),
             conf:  {argument: true, optional: false}
         }
 

data/lib/i18n/tasks/command/options/locales.rb

@@ -2,12 +2,12 @@ module I18n::Tasks
   module Command
     module Options
       module Locales
-        extend Command::DSL
+        include Command::DSL
 
         cmd_opt :locales, {
             short: :l,
             long:  :locales=,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.locales_filter') },
+            desc:  t('i18n_tasks.cmd.args.desc.locales_filter'),
             conf:  {as: Array, delimiter: /\s*[+:,]\s*/, default: 'all', argument: true, optional: false},
             parse: :parse_locales
         }
@@ -15,7 +15,7 @@ module I18n::Tasks
         cmd_opt :locale, {
             short: :l,
             long:  :locale=,
-            desc:  proc { I18n.t('i18n_tasks.cmd.args.desc.locale') },
+            desc:  t('i18n_tasks.cmd.args.desc.locale'),
             conf:  {default: 'base', argument: true, optional: false},
             parse: :parse_locale
         }
@@ -23,7 +23,7 @@ module I18n::Tasks
         cmd_opt :locale_to_translate_from, cmd_opt(:locale).merge(
             short: :f,
             long: :from=,
-            desc: proc { I18n.t('i18n_tasks.cmd.args.desc.locale_to_translate_from') })
+            desc: t('i18n_tasks.cmd.args.desc.locale_to_translate_from'))
 
         def parse_locales(opt, key = :locales)
           argv    = Array(opt[:arguments]) + Array(opt[key])

data/lib/i18n/tasks/command/options/trees.rb

@@ -2,7 +2,7 @@ module I18n::Tasks
   module Command
     module Options
       module Trees
-        extend Command::DSL
+        include Command::DSL
         format_opt = proc { |type|
           enum_opt_attr :f, :format=, enum_opt(type),
                         proc { |valid, default|

data/lib/i18n/tasks/commands.rb

@@ -13,7 +13,7 @@ require 'i18n/tasks/command/commander'
 
 module I18n::Tasks
   class Commands < Command::Commander
-    extend Command::DSL
+    include Command::DSL
     include Command::Commands::Health
     include Command::Commands::Missing
     include Command::Commands::Usages

data/lib/i18n/tasks/google_translation.rb

@@ -5,6 +5,9 @@ require 'i18n/tasks/html_keys'
 module I18n::Tasks
   module GoogleTranslation
 
+    # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
+    # @param [String] from locale
+    # @return [I18n::Tasks::Tree::Siblings] translated forest
     def google_translate_forest(forest, from)
       forest.inject empty_forest do |result, root|
         translated = google_translate_list(root.key_values(root: true), to: root.key, from: from)
@@ -12,7 +15,8 @@ module I18n::Tasks
       end
     end
 
-    # @param [Array] list of [key, value] pairs
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<[String, Object]>] translated list
     def google_translate_list(list, opts)
       return [] if list.empty?
       opts       = opts.dup
@@ -26,6 +30,8 @@ module I18n::Tasks
       result
     end
 
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<[String, Object]>] translated list
     def fetch_google_translations(list, opts)
       from_values(list, EasyTranslate.translate(to_values(list), opts)).tap do |result|
         if result.blank?
@@ -38,21 +44,27 @@ module I18n::Tasks
 
     def validate_google_translate_api_key!(key)
       if key.blank?
-        raise CommandError.new('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.')
+        raise CommandError.new(I18n.t('i18n_tasks.google_translate.errors.no_api_key'))
       end
     end
 
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @return [Array<String>] values for translation extracted from list
     def to_values(list)
       list.map { |l| dump_value l[1] }.flatten.compact
     end
 
+    # @param [Array<[String, Object]>] list of key-value pairs
+    # @param [Array<String>] list of translated values
+    # @return [Array<[String, Object]>] translated key-value pairs
     def from_values(list, translated_values)
       keys                = list.map(&:first)
       untranslated_values = list.map(&:last)
       keys.zip parse_value(untranslated_values, translated_values.to_enum)
     end
 
+    # Prepare value for translation.
+    # @return [String, Array<String, nil>, nil] value for Google Translate or nil for non-string values
     def dump_value(value)
       case value
         when Array
@@ -61,10 +73,14 @@ Get the key at https://code.google.com/apis/console.')
         when String
           replace_interpolations value
         else
-          value
+          nil
       end
     end
 
+    # Parse translated value from the each_translated enumerator
+    # @param [Object] untranslated
+    # @param [Enumerator] each_translated
+    # @return [Object] final translated value
     def parse_value(untranslated, each_translated)
       case untranslated
         when Array
@@ -72,21 +88,23 @@ Get the key at https://code.google.com/apis/console.')
           untranslated.map { |from| parse_value(from, each_translated) }
         when String
           restore_interpolations untranslated, each_translated.next
-        when NilClass
-          nil
         else
-          each_translated.next
+          untranslated
       end
     end
 
     INTERPOLATION_KEY_RE  = /%\{[^}]+\}/.freeze
     UNTRANSLATABLE_STRING = 'zxzxzx'.freeze
 
-    # 'hello, %{name}' => 'hello, <round-trippable string>'
+    # @param [String] value
+    # @return [String] 'hello, %{name}' => 'hello, <round-trippable string>'
     def replace_interpolations(value)
       value.gsub INTERPOLATION_KEY_RE, UNTRANSLATABLE_STRING
     end
 
+    # @param [String] untranslated
+    # @param [String] translated
+    # @return [String] 'hello, <round-trippable string>' => 'hello, %{name}'
     def restore_interpolations(untranslated, translated)
       return translated if untranslated !~ INTERPOLATION_KEY_RE
       each_value = untranslated.scan(INTERPOLATION_KEY_RE).to_enum

data/lib/i18n/tasks/scanners/base_scanner.rb

@@ -8,7 +8,7 @@ module I18n::Tasks::Scanners
     include ::I18n::Tasks::KeyPatternMatching
     include ::I18n::Tasks::Logging
 
-    attr_reader :config, :key_filter, :ignore_lines_re
+    attr_reader :config, :key_filter, :ignore_lines_res
 
     def initialize(config = {})
       @config = config.dup.with_indifferent_access.tap do |conf|
@@ -21,14 +21,25 @@ module I18n::Tasks::Scanners
           # exclude common binary extensions by default (images and fonts)
           conf[:exclude] = %w(*.jpg *.png *.gif *.svg *.ico *.eot *.ttf *.woff *.pdf)
         end
-        conf[:ignore_lines] ||= %q(^\s*[#/](?!\si18n-tasks-use)).freeze
-        conf[:ignore_lines] = Array(conf[:ignore_lines])
-        @ignore_lines_re = conf[:ignore_lines].map { |line| Regexp.new(line) }
+        # Regexps for lines to ignore per extension
+        if conf[:ignore_lines] && !conf[:ignore_lines].is_a?(Hash)
+          warn_deprecated "search.ignore_lines must be a Hash, found #{conf[:ignore_lines].class.name}"
+          conf[:ignore_lines] = nil
+        end
+        conf[:ignore_lines] ||= {
+            'rb'   => %q(^\s*#(?!\si18n-tasks-use)),
+            'haml' => %q(^\s*-\s*#\s*(?!\si18n-tasks-use)),
+            'slim' => %q(^\s*(?:-#|/)(?!\si18n-tasks-use)),
+            'erb'  => %q(^\s*<%\s*#(?!\si18n-tasks-use)),
+        }
+        @ignore_lines_res = conf[:ignore_lines].inject({}) { |h, (ext, re)| h.update(ext => Regexp.new(re)) }
+        @key_filter = nil
       end
     end
 
-    def exclude_line?(line)
-      ignore_lines_re.any? { |re| re =~ line }
+    def exclude_line?(line, path)
+      re = ignore_lines_res[File.extname(path)[1..-1]]
+      re && re =~ line
     end
 
     def key_filter=(value)

data/lib/i18n/tasks/scanners/pattern_scanner.rb

@@ -17,7 +17,7 @@ module I18n::Tasks::Scanners
         next unless valid_key?(key, strict)
         key = key + ':' if key.end_with?('.')
         location = src_location(path, text, src_pos)
-        unless exclude_line?(location[:line])
+        unless exclude_line?(location[:line], path)
           keys << [key, data: location]
         end
       end

data/lib/i18n/tasks/version.rb

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

data/spec/commands/data_commands_spec.rb

@@ -20,7 +20,7 @@ describe 'Data commands' do
   end
 
   it '#data' do
-    expect(JSON.parse(run_cmd :data, format: 'json')).to eq(en_data)
+    expect(JSON.parse(run_cmd :data, format: 'json', locales: 'en')).to eq(en_data)
   end
 
   it '#data-merge' do

data/spec/google_translate_spec.rb

@@ -9,7 +9,8 @@ describe 'Google Translation' do
       nil_value_test = ['nil-value-key', nil, nil],
       text_test      = ['key', "Hello - %{user} O'neill!", "Hola - %{user} O'neill!"],
       html_test      = ['html-key.html', "Hello - <b>%{user} O'neill</b>", "Hola - <b>%{user} O'neill</b>"],
-      array_test     = ['array-key', ['Hello.', nil, '', 'Goodbye.'], ['Hola.', nil, '', 'Adiós.']]
+      array_test     = ['array-key', ['Hello.', nil, '', 'Goodbye.'], ['Hola.', nil, '', 'Adiós.']],
+      fixnum_test    = ['numeric-key', 1, 1],
   ]
 
   if ENV['GOOGLE_TRANSLATE_API_KEY']
@@ -45,7 +46,8 @@ describe 'Google Translation' do
                     'hello'         => text_test[1],
                     'hello_html'    => html_test[1],
                     'array_key'     => array_test[1],
-                    'nil-value-key' => nil_value_test[1]
+                    'nil-value-key' => nil_value_test[1],
+                    'fixnum-key'    => fixnum_test[1]
                 }
             })
             task.data[:es] = build_tree('es' => {
@@ -58,7 +60,8 @@ describe 'Google Translation' do
             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('nil-value-key', 'es')).to eq(nil_value_test[2])
+            expect(task.t('common.nil-value-key', 'es')).to eq(nil_value_test[2])
+            expect(task.t('common.fixnum-key', 'es')).to eq(fixnum_test[2])
             expect(task.t('common.a', 'es')).to eq('λ')
           end
         end

data/spec/used_keys_spec.rb

@@ -3,14 +3,18 @@ require 'spec_helper'
 
 describe 'UsedKeys' do
   let!(:task) { I18n::Tasks::BaseTask.new }
-
-  around do |ex|
-    task.config[:search] = {paths: ['a.html.slim']}
-    TestCodebase.setup('a.html.slim' => <<-SLIM)
+  let(:file_name) { 'a.html.slim' }
+  let(:file_content) do
+    <<-SLIM
 div = t 'a'
   p = t 'a'
 h1 = t 'b'
     SLIM
+  end
+
+  around do |ex|
+    task.config[:search] = {paths: [file_name]}
+    TestCodebase.setup(file_name => file_content)
     TestCodebase.in_test_app_dir { ex.run }
     TestCodebase.teardown
   end
@@ -45,4 +49,27 @@ h1 = t 'b'
             [{pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'", src_path: 'a.html.slim'}]
     )
   end
+
+  describe 'when input is haml' do
+    let(:file_name) { 'a.html.haml' }
+    let(:file_content) do
+      <<-HAML
+#first{ title: t('a') }
+.second{ title: t('a') }
+- # t('a') in a comment is ignored
+      HAML
+    end
+
+    it '#used_keys(source_occurences: true)' do
+      used_keys = task.used_tree(source_occurrences: true)
+      expect(used_keys.size).to eq 1
+      expect_node_key_data(
+          used_keys.leaves.first,
+          'a',
+          source_occurrences:
+              [{pos: 15, line_num: 1, line_pos: 16, line: "#first{ title: t('a') }", src_path: 'a.html.haml'},
+               {pos: 40, line_num: 2, line_pos: 17, line: ".second{ title: t('a') }", src_path: 'a.html.haml'}]
+      )
+    end
+  end
 end

data/templates/config/i18n-tasks.yml

@@ -59,10 +59,6 @@ search:
   ## Or, File.fnmatch patterns to include
   # include: ["*.rb", "*.html.slim"]
 
-  ## Lines starting with # or / are ignored by default
-  # ignore_lines:
-  #  - "^\\s*[#/](?!\\si18n-tasks-use)"
-
 ## Google Translate
 # translation:
 #   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
@@ -70,13 +66,16 @@ search:
 
 ## Consider these keys not missing
 # ignore_missing:
-#   - pagination.views.*
+# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
+# - '{devise,simple_form}.*'
 
 ## Consider these keys used
 # ignore_unused:
-#   - 'simple_form.{yes,no}'
-#   - 'simple_form.{placeholders,hints,labels}.*'
-#   - 'simple_form.{error_notification,required}.:'
+# - 'activerecord.attributes.*'
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
 
 ## Exclude these keys from `i18n-tasks eq-base' report
 # ignore_eq_base:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -197,7 +197,6 @@ description: |
 
   It analyses code statically for key usages, such as `I18n.t('some.key')`, in order to report keys that are missing or unused,
   pre-fill missing keys (optionally from Google Translate), and remove unused keys.
-   well.
 email:
 - glex.spb@gmail.com
 executables: