i18n-tasks 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f197d49c3a8d79992339e4ba4a23e1b9f7df23ff
-  data.tar.gz: 5f08596a492cfec055aab5425353dc8ec2fda1f8
+  metadata.gz: b5394593809b1be9eabef55d84ee0cf8ce692884
+  data.tar.gz: 5629b833e0ef043538a387a3eff45a1e16fdbc6f
 SHA512:
-  metadata.gz: caedad036795f4861f8bdc1fff7309af8c1682f8e3d61779cd8aca8ab681cad1d62b922b57a8ec51eb84608d72572873bc49b5f90ee62340fb6b3e2bd53010a9
-  data.tar.gz: 4a185853088b92aa109b392f18cd940fb30c1aeafd98e083633034886d5a411a69c3a97f834ce7bacfa4358c00e74dd8dfa052d3b7553e031cb0efea6a19e9e1
+  metadata.gz: 80141dbe9b294f9e83b3d1a812aa5f3381e2909ddf8175cec2df66dae8da310e6aedda8d36bb7a11c511d04e41a59972469eabe6475b88f0cfa0065034efa9b7
+  data.tar.gz: a0c620f7af53c0aa9f820afc057eb658f8c84d43caad4a9affdb1854d1b5ecacf76ceef4288b7265eaecca2382e0f3a8e6de226e7c21205c9aaf0d3a54a441a1

data/CHANGES.md

@@ -1,5 +1,10 @@
+## v0.1.6
+
+* New key pattern syntax for i18n-tasks.yml a la globbing (@glebm)
+
 ## v0.1.5
-* Removed get_locale_data, added data configuration options
+
+* Removed get_locale_data, added data configuration options (@glebm)
 
 ## v0.1.4
 
@@ -8,10 +13,10 @@
 
 ## v0.1.3
 
-* detect countable keys as used for unused task
+* detect countable keys as used for unused task (@glebm)
 * account for non-string keys coming from yaml (thanks @lichtamberg)
 
 ## v0.1.2
 
 * added grep config options (thanks @dmke)
-* improved terminal output
+* improved terminal output (@glebm)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in i18n-tasks.gemspec
 gemspec
+
+#gem 'byebug'

data/README.md

@@ -42,7 +42,7 @@ Tasks may incorrectly report framework i18n keys as missing. You can add `config
 # do not report these keys as missing (both on blank value and no key)
 ignore_missing:
   - devise.errors.unauthorized # ignore this key
-  - pagination.views.          # ignore the whole pattern (note the .)
+  - pagination.views.*         # ignore the whole pattern
 
 # do not report these keys when they have the same value as the base locale version
 ignore_eq_base:
@@ -53,11 +53,19 @@ ignore_eq_base:
 
 # do not report these keys as unused
 ignore_unused:
-  - category.
+  - category.*
 
 # do not report these keys ever
 ignore:
-  - kaminari.
+  - kaminari.*
+
+# where to read locale data from
+data:
+  # read paths for a given %{locale} (supports globs)
+  paths:
+    - 'config/locales/%{locale}.yml'
+  # you can also implement a custom storage layer, see the yaml one below
+  class: I18n::Tasks::Data::Yaml
 
 # search configuration (grep arguments)
 grep:
@@ -70,15 +78,6 @@ grep:
     - '*.html*'
   # explicitly exclude files (default: blank = exclude no files)
   exclude: '*.js'
-
-# where to read locale data from
-data:
-  # file patterns for a given %{locale} (supports globs)
-  paths:
-    # default:
-    - 'config/locales/%{locale}.yml'
-  # you can also implement a custom loader, use the default as an example
-  class: I18n::Tasks::Data::Yaml
 ```
 
 ## HTML report
@@ -89,6 +88,7 @@ While i18n-tasks does not provide an HTML version of the report, it's easy to ro
 
 This was originally developed for [Zuigo](http://zuigo.com/), a platform to organize and discover events.
 
+[MIT license](/LICENSE.txt)
 
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/glebm/i18n-tasks/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/i18n/tasks.rb

@@ -1,5 +1,7 @@
 require 'i18n/tasks/version'
 require 'i18n/tasks/railtie'
+require 'i18n/tasks/key_pattern_matching'
+
 require 'i18n/tasks/data/yaml'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/string/access'

data/lib/i18n/tasks/base_task.rb

@@ -1,158 +1,27 @@
 # coding: utf-8
 require 'term/ansicolor'
-require 'i18n/tasks/task_helpers'
+require 'i18n/tasks/usage_search'
+require 'i18n/tasks/fuzzy_source_keys'
+require 'i18n/tasks/plural_keys'
+require 'i18n/tasks/relative_keys'
+require 'i18n/tasks/translation_data'
+require 'i18n/tasks/ignore_keys'
 
 module I18n
   module Tasks
     class BaseTask
-      include TaskHelpers
-
-      # locale data hash, with locale name as root
-      # @return [Hash{String => String,Hash}] locale data in nested hash format
-      def locale_data(locale)
-        locale                        = locale.to_s
-        (@locale_data ||= {})[locale] ||= data_source.get(locale)
-      end
-
-      def data_source
-        return @source if @source
-        conf    = config[:data] || {}
-        @source = if conf[:class]
-                    conf[:class].constantize.new(conf.except(:class))
-                  else
-                    I18n::Tasks::Data::Yaml.new(
-                        paths: Array(conf[:paths].presence || ['config/locales/%{locale}.yml'])
-                    )
-                  end
-      end
-
-      # main locale file path (for writing to)
-      # @return [String]
-      def locale_file_path(locale)
-        "config/locales/#{locale}.yml"
-      end
-
-      # find all keys in the source (relative keys are returned in absolutized)
-      # @return [Array<String>]
-      def find_source_keys
-        @source_keys ||= begin
-          if (grep_out = run_grep)
-            grep_out.split("\n").map { |r|
-              key = r.match(/['"](.*?)['"]/)[1]
-              if key.start_with? '.'
-                absolutize_key key, r.split(':')[0]
-              else
-                key
-              end
-            }.uniq.reject { |k| k !~ /^[\w.\#{}]+$/ }
-          else
-            []
-          end
-        end
-      end
-
-      # whether the key is used in the source
-      def used_key?(key)
-        @used_keys ||= find_source_keys.to_set
-        @used_keys.include?(key)
-      end
-
-      # whether to ignore the key. ignore_type one of :missing, :eq_base, :blank, :unused.
-      # will apply global ignore rules as well
-      def ignore_key?(key, ignore_type, locale = nil)
-        key =~ ignore_pattern(ignore_type, locale)
-      end
-
-      # dynamically generated keys in the source, e.g t("category.#{category_key}")
-      def pattern_key?(key)
-        @pattern_keys_re ||= compile_start_with_re(pattern_key_prefixes)
-        key =~ @pattern_keys_re
-      end
-
-      # keys in the source that end with a ., e.g. t("category.#{cat.i18n_key}") or t("category." + category.key)
-      def pattern_key_prefixes
-        @pattern_keys_prefixes ||=
-            find_source_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }.map { |k| k.split(/\.?#/)[0].presence }.compact
-      end
-
-      # whether the value for key exists in locale (defaults: base_locale)
-      def key_has_value?(key, locale = base_locale)
-        t(locale_data(locale)[locale], key).present?
+      include UsageSearch
+      include PluralKeys
+      include RelativeKeys
+      include FuzzySourceKeys
+      include TranslationData
+      include IgnoreKeys
+
+      # i18n-tasks config (defaults + config/i18n-tasks.yml)
+      # @return [Hash{String => String,Hash,Array}]
+      def config
+        I18n::Tasks.config
       end
-
-      # traverse hash, yielding with full key and value
-      # @param hash [Hash{String => String,Hash}] translation data to traverse
-      # @yield [full_key, value] yields full key and value for every translation in #hash
-      # @return [nil]
-      def traverse(path = '', hash)
-        q = [[path, hash]]
-        until q.empty?
-          path, value = q.pop
-          if value.is_a?(Hash)
-            value.each { |k, v| q << ["#{path}.#{k}", v] }
-          else
-            yield path[1..-1], value
-          end
-        end
-      end
-
-      # translation of the key found in the passed hash or nil
-      # @return [String,nil]
-      def t(hash, key)
-        key.split('.').inject(hash) { |r, seg| r[seg] if r }
-      end
-
-      # @param key [String] relative i18n key (starts with a .)
-      # @param path [String] path to the file containing the key
-      # @return [String] absolute version of the key
-      def absolutize_key(key, path)
-        # normalized path
-        path   = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
-        # key prefix based on path
-        prefix = path.gsub(%r(app/views/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
-        "#{prefix}#{key}"
-      end
-
-      PLURAL_KEY_RE = /\.(?:zero|one|two|few|many|other)$/
-
-      # @param key [String] i18n key
-      # @param data [Hash{String => String,Hash}] locale data
-      # @return the base form if the key is a specific plural form (e.g. apple for apple.many), and the key as passed otherwise
-      def depluralize_key(key, data)
-        return key if key !~ PLURAL_KEY_RE || t(data, key).is_a?(Hash)
-        parent_key      = key.split('.')[0..-2] * '.'
-        plural_versions = t(data, parent_key)
-        if plural_versions.is_a?(Hash) && plural_versions.all? { |k, v| ".#{k}" =~ PLURAL_KEY_RE && !v.is_a?(Hash) }
-          parent_key
-        else
-          key
-        end
-      end
-
-
-      # @return [String] default i18n locale
-      def base_locale
-        I18n.default_locale.to_s
-      end
-
-      # @return [Hash{String => String,Hash}] default i18n locale data
-      def base_locale_data
-        locale_data(base_locale)[base_locale]
-      end
-
-      # Run grep searching for source keys and return grep output
-      # @return [String] output of the grep command
-      def run_grep
-        args = ['grep', '-HoRI']
-        [:include, :exclude].each do |opt|
-          next unless (val = grep_config[opt]).present?
-          args += Array(val).map { |v| "--#{opt}=#{v}" }
-        end
-        args += [%q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, *grep_config[:paths]]
-        args.compact!
-        run_command *args
-      end
-
     end
   end
 end

data/lib/i18n/tasks/data/yaml.rb

@@ -1,19 +1,19 @@
 module I18n::Tasks
   module Data
     class Yaml
-      attr_reader :paths
+      attr_reader :options
 
       def initialize(options)
-        @paths = options[:paths]
+        @options = options
       end
 
       def get(locale)
-        paths.map do |path|
+        options[:paths].map do |path|
           Dir.glob path % { locale: locale }
         end.flatten.map do |locale_file|
           YAML.load_file locale_file
         end.inject({}) do |hash, locale_data|
-          hash.deep_merge! locale_data
+          hash.deep_merge! locale_data || {}
           hash
         end
       end

data/lib/i18n/tasks/fuzzy_source_keys.rb

@@ -0,0 +1,20 @@
+require 'i18n/tasks/key_pattern_matching'
+
+# e.g t("category.#{category_key}")
+module I18n::Tasks
+  module FuzzySourceKeys
+    include KeyPatternMatching
+
+    # dynamically generated keys in the source, e.g t("category.#{category_key}")
+    def pattern_key?(key)
+      @pattern_keys_re ||= compile_start_with_re(pattern_key_prefixes)
+      !!(key =~ @pattern_keys_re)
+    end
+
+    # keys in the source that end with a ., e.g. t("category.#{cat.i18n_key}") or t("category." + category.key)
+    def pattern_key_prefixes
+      @pattern_keys_prefixes ||=
+          find_source_keys.select { |k| k =~ /\#{.*?}/ || k.ends_with?('.') }.map { |k| k.split(/\.?#/)[0].presence }.compact
+    end
+  end
+end

data/lib/i18n/tasks/ignore_keys.rb

@@ -0,0 +1,24 @@
+module I18n::Tasks::IgnoreKeys
+  # whether to ignore the key. ignore_type one of :missing, :eq_base, :blank, :unused.
+  # will apply global ignore rules as well
+  def ignore_key?(key, ignore_type, locale = nil)
+    key =~ ignore_pattern(ignore_type, locale)
+  end
+
+  # @param type [:missing, :eq_base, :unused] type
+  # @param locale [String] only when type is :eq_base
+  # @return [Regexp] a regexp that matches all the keys ignored for the type (and locale)
+  def ignore_pattern(type, locale = nil)
+    ((@ignore_patterns ||= HashWithIndifferentAccess.new)[type] ||= {})[locale] = begin
+      global, type_ignore = config[:ignore].presence || [], config["ignore_#{type}"].presence || []
+      if type_ignore.is_a?(Array)
+        patterns = global + type_ignore
+      elsif type_ignore.is_a?(Hash)
+        # ignore per locale
+        patterns = global + (type_ignore[:all] || []) +
+            type_ignore.select { |k, v| k.to_s =~ /\b#{locale}\b/ }.values.flatten(1).compact
+      end
+      compile_patterns_re patterns
+    end
+  end
+end

data/lib/i18n/tasks/key_pattern_matching.rb

@@ -0,0 +1,39 @@
+module I18n::Tasks::KeyPatternMatching
+  MATCH_NOTHING = /\z\A/
+
+  # one regex to match any
+  def compile_patterns_re(key_patterns)
+    if key_patterns.blank?
+      # match nothing
+      MATCH_NOTHING
+    else
+      /(?:#{ key_patterns.map { |p| key_pattern_to_re p } * '|' })/m
+    end
+  end
+
+  # convert key.* to key\..*
+  def key_pattern_to_re(key_pattern)
+    if key_pattern.end_with? '.'
+      $stderr.puts %Q(i18n-tasks: Deprecated "#{key_pattern}", please change to "#{key_pattern += '*'}".)
+    end
+    /^#{key_pattern.
+        gsub(/\./, '\.').
+        gsub(/\*/, '.*')}$/
+  end
+
+  # @return [Array<String>] keys sans passed patterns
+  def exclude_patterns(keys, patterns)
+    pattern_re = compile_patterns_re patterns.select { |p| p.end_with?('.') }
+    (keys - patterns).reject { |k| k =~ pattern_re }
+  end
+
+  # compile prefix matching Regexp from the list of prefixes
+  # @return [Regexp] regexp matching any of the prefixes
+  def compile_start_with_re(prefixes)
+    if prefixes.blank?
+      MATCH_NOTHING # match nothing
+    else
+      /^(?:#{prefixes.map { |p| Regexp.escape(p) }.join('|')})/
+    end
+  end
+end

data/lib/i18n/tasks/output/terminal.rb

@@ -18,8 +18,12 @@ module I18n
 
         def unused(unused)
           $stderr.puts bold cyan("Unused i18n keys (#{unused.length})")
-          key_col_width = unused.max_by { |x| x[0].length }[0].length + 2
-          unused.each { |(key, value)| puts "#{magenta key.ljust(key_col_width)}#{cyan value.to_s.strip}" }
+          if unused.present?
+            key_col_width = unused.max_by { |x| x[0].length }[0].length + 2
+            unused.each { |(key, value)| puts "#{magenta key.ljust(key_col_width)}#{cyan value.to_s.strip}" }
+          else
+            $stderr.puts(bold green 'Good job! Every translation is used!')
+          end
         end
 
         private
@@ -34,7 +38,10 @@ module I18n
         def print_missing_translation(m, opts)
           locale, key, base_value, status_text = m[:locale], m[:key], m[:base_value].to_s.try(:strip), " #{STATUS_TEXTS[m[:type]]}"
 
-          key = magenta key.ljust(opts[:key_col_width])
+          long = base_value.length > 50
+
+          key = magenta "#{key}#{':' if long}".ljust(opts[:key_col_width])
+          base_value = "\n#{indent(base_value, 13)}\n" if long
           s   = if m[:type] == :none
                   "#{red bold locale.ljust(4)} #{status_text} #{key}"
                 else
@@ -42,6 +49,12 @@ module I18n
                 end
           puts s
         end
+
+        private
+        def indent(txt, n = 2)
+          spaces = ' ' * n
+          txt.gsub /^/, spaces
+        end
       end
     end
   end

data/lib/i18n/tasks/plural_keys.rb

@@ -0,0 +1,17 @@
+module I18n::Tasks::PluralKeys
+  PLURAL_KEY_RE = /\.(?:zero|one|two|few|many|other)$/
+
+  # @param key [String] i18n key
+  # @param data [Hash{String => String,Hash}] locale data
+  # @return the base form if the key is a specific plural form (e.g. apple for apple.many), and the key as passed otherwise
+  def depluralize_key(key, data)
+    return key if key !~ PLURAL_KEY_RE || t(data, key).is_a?(Hash)
+    parent_key      = key.split('.')[0..-2] * '.'
+    plural_versions = t(data, parent_key)
+    if plural_versions.is_a?(Hash) && plural_versions.all? { |k, v| ".#{k}" =~ PLURAL_KEY_RE && !v.is_a?(Hash) }
+      parent_key
+    else
+      key
+    end
+  end
+end

data/lib/i18n/tasks/prefill.rb

@@ -3,6 +3,7 @@ require 'i18n/tasks/base_task'
 module I18n
   module Tasks
     class Prefill < BaseTask
+      # todo refactor to allow configuring output targets
       def perform
         # Will also rewrite en, good for ordering
         I18n.available_locales.map(&:to_s).each do |target_locale|
@@ -11,6 +12,12 @@ module I18n
           File.open(locale_file_path(target_locale), 'w'){ |f| f.write prefilled.to_yaml }
         end
       end
+
+      # main locale file path (for writing to)
+      # @return [String]
+      def locale_file_path(locale)
+        "config/locales/#{locale}.yml"
+      end
     end
   end
 end

data/lib/i18n/tasks/relative_keys.rb

@@ -0,0 +1,13 @@
+module I18n::Tasks::RelativeKeys
+
+  # @param key [String] relative i18n key (starts with a .)
+  # @param path [String] path to the file containing the key
+  # @return [String] absolute version of the key
+  def absolutize_key(key, path)
+    # normalized path
+    path   = Pathname.new(File.expand_path path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+    # key prefix based on path
+    prefix = path.gsub(%r(app/views/|(\.[^/]+)*$), '').tr('/', '.').gsub(%r(\._), '.')
+    "#{prefix}#{key}"
+  end
+end

data/lib/i18n/tasks/translation_data.rb

@@ -0,0 +1,58 @@
+module I18n::Tasks::TranslationData
+  # locale data hash, with locale name as root
+  # @return [Hash{String => String,Hash}] locale data in nested hash format
+  def locale_data(locale)
+    locale                        = locale.to_s
+    (@locale_data ||= {})[locale] ||= data_source.get(locale) || {}
+  end
+
+  # I18n data provider
+  def data_source
+    return @source if @source
+    conf    = config[:data] || {}
+    @source = if conf[:class]
+                conf[:class].constantize.new(conf.except(:class))
+              else
+                I18n::Tasks::Data::Yaml.new(
+                    paths: Array(conf[:paths].presence || ['config/locales/%{locale}.yml'])
+                )
+              end
+  end
+
+  # translation of the key found in the passed hash or nil
+  # @return [String,nil]
+  def t(hash, key)
+    key.split('.').inject(hash) { |r, seg| r[seg] if r }
+  end
+
+  # traverse hash, yielding with full key and value
+  # @param hash [Hash{String => String,Hash}] translation data to traverse
+  # @yield [full_key, value] yields full key and value for every translation in #hash
+  # @return [nil]
+  def traverse(path = '', hash)
+    q = [[path, hash]]
+    until q.empty?
+      path, value = q.pop
+      if value.is_a?(Hash)
+        value.each { |k, v| q << ["#{path}.#{k}", v] }
+      else
+        yield path[1..-1], value
+      end
+    end
+  end
+
+  # @return [String] default i18n locale
+  def base_locale
+    I18n.default_locale.to_s
+  end
+
+  # @return [Hash{String => String,Hash}] default i18n locale data
+  def base_locale_data
+    locale_data(base_locale)[base_locale]
+  end
+
+  # whether the value for key exists in locale (defaults: base_locale)
+  def key_has_value?(key, locale = base_locale)
+    t(locale_data(locale)[locale], key).present?
+  end
+end

data/lib/i18n/tasks/usage_search.rb

@@ -0,0 +1,60 @@
+require 'open3'
+module I18n::Tasks::UsageSearch
+  # grep config, also from config/i18n-tasks.yml
+  # @return [Hash{String => String,Hash,Array}]
+  def grep_config
+    @grep_config ||= (config[:grep] || {}).with_indifferent_access.tap do |conf|
+      conf[:paths] = ['app/'] if conf[:paths].blank?
+    end
+  end
+
+  # whether the key is used in the source
+  def used_key?(key)
+    @used_keys ||= find_source_keys.to_set
+    @used_keys.include?(key)
+  end
+
+  # find all keys in the source (relative keys are returned in absolutized)
+  # @return [Array<String>]
+  def find_source_keys
+    @source_keys ||= begin
+      if (grep_out = run_grep)
+        grep_out.split("\n").map { |r|
+          key = r.match(/['"](.*?)['"]/)[1]
+          if key.start_with? '.'
+            absolutize_key key, r.split(':')[0]
+          else
+            key
+          end
+        }.uniq.reject { |k| k !~ /^[\w.\#{}]+$/ }
+      else
+        []
+      end
+    end
+  end
+
+  protected
+
+  # Run grep searching for source keys and return grep output
+  # @return [String] output of the grep command
+  def run_grep
+    args = ['grep', '-HoRI']
+    [:include, :exclude].each do |opt|
+      next unless (val = grep_config[opt]).present?
+      args += Array(val).map { |v| "--#{opt}=#{v}" }
+    end
+    args += [%q{\\bt(\\?\\s*['"]\\([^'"]*\\)['"]}, *grep_config[:paths]]
+    args.compact!
+    run_command *args
+  end
+
+
+  # Run command and get only stdout output
+  # @return [String] output
+  # @raise [RuntimeError] if grep returns with exit code other than 0
+  def run_command(*args)
+    o, e, s = Open3.capture3(*args)
+    raise "#{args[0]} failed with status #{s.exitstatus} (stderr: #{e})" unless s.success?
+    o
+  end
+end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

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

@@ -1,7 +1,7 @@
 # do not report these keys as missing:
 ignore_missing:
   - ignored_missing_key.a # one key to ignore
-  - ignored_pattern.      # ignore the whole pattern
+  - ignored_pattern.*     # ignore the whole pattern
 
 # do not report these keys when they have the same value as the base locale version
 ignore_eq_base:
@@ -34,8 +34,8 @@ grep:
 
 # how to get the locale data
 data:
+  class: I18n::Tasks::Data::Yaml
   paths:
     # files for a given %{locale}
     - 'config/locales/%{locale}.yml'
     - 'config/locales/*.%{locale}.yml'
-  class: I18n::Tasks::Data::Yaml

data/spec/readme_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+describe 'README.md' do
+  let(:readme) { File.read('README.md') }
+  it 'has valid YAML in ```yaml blocks' do
+    readme.scan /```yaml\n(.*)(?=^)\n```/ do |m|
+      expect { YAML.load(m[0]) }.to_not raise_errors
+    end
+  end
+end

data/spec/support/i18n_tasks_output_matcher.rb

@@ -7,14 +7,13 @@ RSpec::Matchers.define :be_i18n_keys do |expected|
   def extract_keys(actual)
     locales = I18n.available_locales.map(&:to_s)
     actual.split("\n").map { |x|
-      x.strip!
       key = x.gsub(/\s+/, ' ').split(' ').reverse.detect { |p| p && p.include?('.') }
       if x =~ locale_re && locales.include?(x[0..1]) && !(key =~ locale_re && locales.include?(key[0..1]))
-        x.split(' ', 2)[0] + '.' + key
-      else
-        key
+        key = x.split(' ', 2)[0] + '.' + key
       end
-    }
+      key = key[0..-2] if key.end_with?(':')
+      key
+    }.compact
   end
 
   match do |actual|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,12 +128,18 @@ files:
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
 - lib/i18n/tasks/data/yaml.rb
+- lib/i18n/tasks/fuzzy_source_keys.rb
+- lib/i18n/tasks/ignore_keys.rb
+- lib/i18n/tasks/key_pattern_matching.rb
 - lib/i18n/tasks/missing.rb
 - lib/i18n/tasks/output/terminal.rb
+- lib/i18n/tasks/plural_keys.rb
 - lib/i18n/tasks/prefill.rb
 - lib/i18n/tasks/railtie.rb
-- lib/i18n/tasks/task_helpers.rb
+- lib/i18n/tasks/relative_keys.rb
+- lib/i18n/tasks/translation_data.rb
 - lib/i18n/tasks/unused.rb
+- lib/i18n/tasks/usage_search.rb
 - lib/i18n/tasks/version.rb
 - lib/tasks/i18n-tasks.rake
 - spec/fixtures/app/assets/javascripts/application.js
@@ -142,6 +148,7 @@ files:
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/i18n_tasks_spec.rb
+- spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/i18n_tasks_output_matcher.rb
@@ -178,6 +185,7 @@ test_files:
 - spec/fixtures/app/views/relative/index.html.slim
 - spec/fixtures/config/i18n-tasks.yml
 - spec/i18n_tasks_spec.rb
+- spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/i18n_tasks_output_matcher.rb

data/lib/i18n/tasks/task_helpers.rb

@@ -1,64 +0,0 @@
-# coding: utf-8
-require 'open3'
-
-module I18n
-  module Tasks
-    module TaskHelpers
-      # Run command and get only stdout output
-      # @return [String] output
-      # @raise [RuntimeError] if grep returns with exit code other than 0
-      def run_command(*args)
-        o, e, s = Open3.capture3(*args)
-        raise "#{args[0]} failed with status #{s.exitstatus} (stderr: #{e})" unless s.success?
-        o
-      end
-
-      # compile prefix matching Regexp from the list of prefixes
-      # @return [Regexp] regexp matching any of the prefixes
-      def compile_start_with_re(prefixes)
-        if prefixes.blank?
-          /\Z\A/ # match nothing
-        else
-          /^(?:#{prefixes.map { |p| Regexp.escape(p) }.join('|')})/
-        end
-      end
-
-      # @return [Array<String>] keys sans passed patterns
-      def exclude_patterns(keys, patterns)
-        pattern_re = compile_start_with_re patterns.select { |p| p.end_with?('.') }
-        (keys - patterns).reject { |k| k =~ pattern_re }
-      end
-
-      # @param type [:missing, :eq_base, :unused] type
-      # @param locale [String] only when type is :eq_base
-      # @return [Regexp] a regexp that matches all the keys ignored for the type (and locale)
-      def ignore_pattern(type, locale = nil)
-        ((@ignore_patterns ||= HashWithIndifferentAccess.new)[type] ||= {})[locale] = begin
-          global, type_ignore = config[:ignore].presence || [], config["ignore_#{type}"].presence || []
-          if type_ignore.is_a?(Array)
-            patterns = global + type_ignore
-          elsif type_ignore.is_a?(Hash)
-            # ignore per locale
-            patterns = global + (type_ignore[:all] || []) +
-                type_ignore.select { |k, v| k.to_s =~ /\b#{locale}\b/ }.values.flatten(1).compact
-          end
-          compile_start_with_re patterns
-        end
-      end
-
-      # i18n-tasks config (defaults + config/i18n-tasks.yml)
-      # @return [Hash{String => String,Hash,Array}]
-      def config
-        I18n::Tasks.config
-      end
-
-      # grep config, also from config/i18n-tasks.yml
-      # @return [Hash{String => String,Hash,Array}]
-      def grep_config
-        @grep_config ||= (config[:grep] || {}).with_indifferent_access.tap do |conf|
-          conf[:paths] = ['app/'] if conf[:paths].blank?
-        end
-      end
-    end
-  end
-end