i18n-tasks 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82cf5495a5f1756309ed77f51f8425c0b0c6d86e
-  data.tar.gz: 5169466a107b4260ee26d43e6f25126d3a9a88b0
+  metadata.gz: a70e643cadbeb135db42081bdf2b9ea9ed7d5163
+  data.tar.gz: 99b5ba4d17e4d93b646895172faa2a74d982d006
 SHA512:
-  metadata.gz: 8c80cedb3419bf2b25b4de1331ad74be439db29f93526f7f9e66a853b873e8e331357b64f55ffb9a9fed987f01648a8baa39cfd9cb22ee7d7f1c35d2cdf72ac3
-  data.tar.gz: b9894a72294a25dd552d2ad5dcd44df63687df41a2c22ae067ab1f0f0927abc8d60f9bdba623079a654b1c2f3b4baf1182973c47c7db84627cbcdf2147b047bd
+  metadata.gz: 15800850eefad7aea706c8275ac804976bff7047d84d13c1ee3a1b33b53e91215ac55515e5c74b7d93b02dd9bb764ce34a4076f88668899620dad141e87a8a65
+  data.tar.gz: 55820e43acb2cc6e033fee27cc0abc19cfe945c1334ba18aed67c5b03c27a96adba8ca0b6dc89c79ee4e1b5f2da36367a7c0b2914604c6de494a41302dad5633

data/.gitattributes

@@ -0,0 +1,2 @@
+* -lf
+*.cmd -crlf

data/CHANGES.md

@@ -1,3 +1,12 @@
+## 0.8.6
+
+* Report missing keys found in source in all the locales. [#162](https://github.com/glebm/i18n-tasks/issues/162)
+* Fix `data-remove` task. [#140](https://github.com/glebm/i18n-tasks/issues/140)
+* Non-zero exit code on `health`, `missing`, and `unused` if such keys are present. [#151](https://github.com/glebm/i18n-tasks/issues/151)
+* XLSX report compatibility with the OSX Numbers App. [#159](https://github.com/glebm/i18n-tasks/issues/159)
+* RSpec template compatibility with `config.expose_dsl_globally = false`. [#148](https://github.com/glebm/i18n-tasks/issues/148)
+* `bundle show vagrant` example in the config template is no longer interpolated .[#161](https://github.com/glebm/i18n-tasks/issues/161)
+
 ## 0.8.5
 
 * Fix regression: Plugin support [#153](https://github.com/glebm/i18n-tasks/issues/153).

data/README.md

@@ -1,5 +1,7 @@
 # i18n-tasks [![Build Status][badge-travis]][travis] [![Coverage Status][badge-coverage]][coverage] [![Code Climate][badge-code-climate]][code-climate] [![Gemnasium][badge-gemnasium]][gemnasium] [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/glebm/i18n-tasks?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+<a href='https://pledgie.com/campaigns/28570'><img alt='Click here to lend your support to: i18n-tasks for Ruby and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/28570.png?skin_name=chrome' border='0' ></a>
+
 i18n-tasks helps you find and manage missing and unused translations.
 
 <img width="539" height="331" src="https://raw.github.com/glebm/i18n-tasks/master/doc/img/i18n-tasks.png">
@@ -22,7 +24,7 @@ i18n-tasks can be used with any project using the ruby [i18n gem][i18n-gem] (def
 Add i18n-tasks to the Gemfile:
 
 ```ruby
-gem 'i18n-tasks', '~> 0.8.3'
+gem 'i18n-tasks', '~> 0.8.6'
 ```
 
 Copy the default [configuration file](#configuration):

data/bin/i18n-tasks.cmd

@@ -0,0 +1,2 @@
+@echo off
+ruby %~dp0\i18n-tasks %*

data/config/locales/en.yml

@@ -15,7 +15,7 @@ en:
           key_pattern_to_rename: Full key (pattern) to rename. Required
           locale: Locale
           locale_to_translate_from: Locale to translate from
-          locales_filter: "Locale(s) to process. Special: base"
+          locales_filter: 'Locale(s) to process. Special: base'
           missing_types: 'Filter by types: %{valid}'
           new_key_name: New name, interpolates original name as %{key}. Required
           nostdin: Do not read from stdin
@@ -90,7 +90,7 @@ en:
       none: No translations are missing.
     remove_unused:
       confirm:
-        one: One translations will be removed from %{locales}.
+        one: "%{count} translation will be removed from %{locales}."
         other: "%{count} translation will be removed from %{locales}."
       noop: No unused keys to remove
       removed: Removed %{count} keys

data/i18n-tasks.gemspec

@@ -43,6 +43,6 @@ TEXT
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'yard'
 end

data/lib/i18n/tasks/cli.rb

@@ -15,7 +15,9 @@ class I18n::Tasks::CLI
   def start(argv)
     auto_output_coloring do
       begin
-        run(argv)
+        if run(argv) == :exit_1
+          exit 1
+        end
       rescue OptionParser::ParseError => e
         error e.message, 64
       rescue I18n::Tasks::CommandError => e

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

@@ -16,8 +16,7 @@ module I18n::Tasks
             raise CommandError.new t('i18n_tasks.health.no_keys_detected')
           end
           terminal_report.forest_stats forest, stats
-          missing opt
-          unused opt
+          [missing(opt), unused(opt)].detect { |result| result == :exit_1 }
         end
       end
     end

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

@@ -23,7 +23,9 @@ module I18n::Tasks
             args: [:locales, :out_format, :missing_types]
 
         def missing(opt = {})
-          print_forest i18n.missing_keys(opt), opt, :missing_keys
+          forest = i18n.missing_keys(opt)
+          print_forest forest, opt, :missing_keys
+          :exit_1 unless forest.empty?
         end
 
         cmd :translate_missing,
@@ -47,11 +49,6 @@ module I18n::Tasks
         def add_missing(opt = {})
           forest = i18n.missing_keys(opt).set_each_value!(opt[:value])
           i18n.data.merge! forest
-          # missing keys detected in the source are only returned in the base locale tree
-          # merge again in case such keys have been added to add them to other locales
-          forest_2 = i18n.missing_keys(opt).set_each_value!(opt[:value])
-          i18n.data.merge! forest_2
-          forest.merge! forest_2
           log_stderr t('i18n_tasks.add_missing.added', count: forest.leaves.count)
           print_forest forest, opt
         end

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

@@ -25,7 +25,9 @@ module I18n::Tasks
             args: [:locales, :out_format, :strict]
 
         def unused(opt = {})
-          print_forest i18n.unused_keys(opt), opt, :unused_keys
+          forest = i18n.unused_keys(opt)
+          print_forest forest, opt, :unused_keys
+          :exit_1 unless forest.empty?
         end
 
         cmd :remove_unused,
@@ -50,7 +52,7 @@ module I18n::Tasks
 
         def confirm_remove_unused!(unused_keys, opt)
           return if ENV['CONFIRM'] || opt[:confirm]
-          locales = bold(opt[:locales] * ', ')
+          locales = bold(unused_keys.flat_map { |root| root.key.split('+') }.sort.uniq * ', ')
           msg     = [
               red(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
               yellow(t('i18n_tasks.common.continue_q')),

data/lib/i18n/tasks/console_context.rb

@@ -36,13 +36,12 @@ module I18n::Tasks
         green(bold "i18n-tasks IRB Quick Start guide") + "\n" + <<-TEXT
 #{yellow 'Data as trees'}
   tree(locale)
-  missing_tree(locale, compared_to = base_locale)
   used_tree(source_occurrences: false, key_filter: nil)
   unused_tree(locale)
   build_tree('es' => {'hello' => 'Hola'})
 
 #{yellow 'Traversal'}
-  tree = missing_tree(base_locale)
+  tree = missing_diff_tree('es')
   tree.nodes { |node| }
   tree.nodes.to_a
   tree.leaves { |node| }

data/lib/i18n/tasks/data/tree/node.rb

@@ -63,7 +63,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def children?
-      children && children.any?
+      children && !children.empty?
     end
 
     def data
@@ -119,6 +119,13 @@ module I18n::Tasks::Data::Tree
       end
     end
 
+    def set(full_key, node)
+      (@children ||= Siblings.new(parent: self)).set(full_key, node)
+      dirty!
+      node
+    end
+    alias []= set
+
     def to_nodes
       Nodes.new([self])
     end

data/lib/i18n/tasks/data/tree/nodes.rb

@@ -79,7 +79,7 @@ module I18n::Tasks::Data::Tree
     alias + merge!
 
     def children(&block)
-      return to_enum(:children) { map { |c| c.children.size }.reduce(:+) } unless block
+      return to_enum(:children) { map { |c| c.children ? c.children.size : 0 }.reduce(:+) } unless block
       each do |node|
         node.children.each(&block) if node.children?
       end

data/lib/i18n/tasks/data/tree/siblings.rb

@@ -1,11 +1,15 @@
 # coding: utf-8
 
+require 'set'
+require 'i18n/tasks/split_key'
 require 'i18n/tasks/data/tree/nodes'
 module I18n::Tasks::Data::Tree
   # Siblings represents a subtree sharing a common parent
   # in case of an empty parent (nil) it represents a forest
   # siblings' keys are unique
   class Siblings < Nodes
+    include ::I18n::Tasks::SplitKey
+
     attr_reader :parent, :key_to_node
 
     def initialize(opts = {})
@@ -44,8 +48,6 @@ module I18n::Tasks::Data::Tree
       key_to_node[new_node.key] = new_node
     end
 
-    include ::I18n::Tasks::SplitKey
-
     # @return [Node] by full key
     def get(full_key)
       first_key, rest = split_key(full_key.to_s, 2)
@@ -121,15 +123,12 @@ module I18n::Tasks::Data::Tree
     end
 
     def subtract_keys(keys)
-      exclude = {}
+      to_remove = Set.new
       keys.each do |full_key|
-        if (node = get full_key)
-          exclude[node] = true
-        end
+        node = get full_key
+        to_remove << node if node
       end
-      select_nodes { |node|
-        not exclude[node] || node.children.try(:all?) { |c| exclude[c] }
-      }
+      remove_nodes_collapsing_emptied_ancestors to_remove
     end
 
     def subtract_by_key(other)
@@ -143,8 +142,6 @@ module I18n::Tasks::Data::Tree
       self
     end
 
-    private
-
     def merge_node!(node)
       if key_to_node.key?(node.key)
         our = key_to_node[node.key]
@@ -164,6 +161,27 @@ module I18n::Tasks::Data::Tree
       end
     end
 
+    # @param [Enumerable] nodes. Modified in-place.
+    def remove_nodes_collapsing_emptied_ancestors(nodes)
+      add_ancestors_that_only_contain_nodes! nodes
+      select_nodes { |node| !nodes.include?(node) }
+    end
+
+    # @param [Enumerable] nodes. Modified in-place.
+    def remove_nodes_collapsing_emptied_ancestors!(nodes)
+      add_ancestors_that_only_contain_nodes! nodes
+      select_nodes! { |node| !nodes.include?(node) }
+    end
+
+    private
+
+    # @param [Set] nodes. Modified in-place.
+    def add_ancestors_that_only_contain_nodes!(nodes)
+      levels.reverse_each do |level_nodes|
+        level_nodes.each { |node| nodes << node if node.children? && node.children.all? { |c| nodes.include?(c) } }
+      end
+    end
+
     def warn_add_children_to_leaf(node)
       ::I18n::Tasks::Logging.log_warn "'#{node.full_key}' was a leaf, now has children (value <- scope conflict)"
     end

data/lib/i18n/tasks/data/tree/traversal.rb

@@ -18,14 +18,15 @@ module I18n::Tasks
 
       def levels(&block)
         return to_enum(:levels) unless block
-        nodes    = to_nodes
+        nodes = to_nodes
         unless nodes.empty?
           block.yield nodes
-          if nodes.children.size == 1
-            first.children
+          if nodes.size == 1
+            node = first
+            node.children.levels(&block) if node.children?
           else
-            Nodes.new(nodes: nodes.children)
-          end.levels(&block)
+            Nodes.new(nodes: nodes.children).levels(&block)
+          end
         end
         self
       end
@@ -76,7 +77,8 @@ module I18n::Tasks
 
       #-- modify / derive
 
-      # @return Siblings
+      # Select the nodes for which the block returns true. Pre-order traversal.
+      # @return [Siblings] a new tree
       def select_nodes(&block)
         tree = Siblings.new
         each do |node|
@@ -90,6 +92,22 @@ module I18n::Tasks
         tree
       end
 
+      # Select the nodes for which the block returns true. Pre-order traversal.
+      # @return [Siblings] self
+      def select_nodes!(&block)
+        to_remove = []
+        each do |node|
+          if block.yield(node)
+            node.children.select_nodes!(&block) if node.children
+          else
+            # removing during each is unsafe
+            to_remove << node
+          end
+        end
+        to_remove.each { |node| remove! node }
+        self
+      end
+
       # @return Siblings
       def select_keys(opts = {}, &block)
         root = opts.key?(:root) ? opts[:root] : false

data/lib/i18n/tasks/missing_keys.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'set'
 module I18n::Tasks
   module MissingKeys
 
@@ -48,20 +49,10 @@ module I18n::Tasks
       tree
     end
 
-    def missing_used_forest(locales, base = base_locale)
-      if locales.include?(base)
-        missing_used_tree(base)
-      else
-        empty_forest
-      end
-    end
-
-    def missing_tree(locale, compared_to)
-      if locale == compared_to
-        missing_used_tree locale
-      else
-        missing_diff_tree locale, compared_to
-      end
+    def missing_used_forest(locales, _base = base_locale)
+      locales.inject(empty_forest) { |forest, locale|
+        forest.merge! missing_used_tree(locale)
+      }
     end
 
     # keys present in compared_to, but not in locale
@@ -96,5 +87,32 @@ module I18n::Tasks
     def locale_key_missing?(locale, key)
       !key_value?(key, locale) && !ignore_key?(key, :missing)
     end
+
+    # @param [::I18n::Tasks::Data::Tree::Siblings] forest
+    def collapse_missing_used_locales!(forest)
+      locales_and_nodes_by_key = {}
+      to_remove                = []
+      forest.each do |root|
+        locale = root.key
+        root.leaves { |node|
+          if node.data[:type] == :missing_used
+            (locales_and_nodes_by_key[node.full_key(root: false)] ||= []) << [locale, node]
+            to_remove << node
+          end
+        }
+      end
+      forest.remove_nodes_collapsing_emptied_ancestors! to_remove
+      keys_and_nodes_by_locale = {}
+      locales_and_nodes_by_key.each { |key, locales_and_nodes|
+        locales = locales_and_nodes.map(&:first).sort.join('+')
+        (keys_and_nodes_by_locale[locales] ||= []) << [key, locales_and_nodes[0][1]]
+      }
+      keys_and_nodes_by_locale.map { |locales, keys_nodes|
+        keys_nodes.each { |(key, node)|
+          forest["#{locales}.#{key}"] = node
+        }
+      }
+      forest
+    end
   end
 end

data/lib/i18n/tasks/reports/base.rb

@@ -51,5 +51,14 @@ module I18n::Tasks::Reports
         {key: key, value: node.value, type: node.data[:type], locale: node.root.key, data: node.data}
       }
     end
+
+    def format_locale(locale)
+      return '' unless locale
+      if locale.split('+') == task.locales.sort
+        'all'
+      else
+        locale.tr '+', ' '
+      end
+    end
   end
 end

data/lib/i18n/tasks/reports/spreadsheet.rb

@@ -8,6 +8,7 @@ module I18n::Tasks::Reports
     def save_report(path, opts)
       path = path.presence || 'tmp/i18n-report.xlsx'
       p = Axlsx::Package.new
+      p.use_shared_strings = true # see #159
       add_missing_sheet p.workbook
       add_unused_sheet p.workbook
       add_eq_base_sheet p.workbook
@@ -19,17 +20,19 @@ module I18n::Tasks::Reports
     private
 
     def add_missing_sheet(wb)
-      tree = task.missing_keys
+      forest = task.missing_keys
+      forest = task.collapse_plural_nodes!(forest)
+      forest = task.collapse_missing_used_locales!(forest)
       wb.styles do |s|
         type_cell = s.add_style :alignment => {:horizontal => :center}
         locale_cell  = s.add_style :alignment => {:horizontal => :center}
         regular_style = s.add_style
-        wb.add_worksheet(name: missing_title(tree)) { |sheet|
+        wb.add_worksheet(name: missing_title(forest)) { |sheet|
           sheet.page_setup.fit_to :width => 1
           sheet.add_row [I18n.t('i18n_tasks.common.type'), I18n.t('i18n_tasks.common.locale'), I18n.t('i18n_tasks.common.key'), I18n.t('i18n_tasks.common.base_value')]
           style_header sheet
-          tree.keys do |key, node|
-            locale, type = node.root.data[:locale], node.data[:type]
+          forest.keys do |key, node|
+            locale, type = format_locale(node.root.data[:locale]), node.data[:type]
             sheet.add_row [missing_type_info(type)[:summary], locale, key, task.t(key)],
             styles: [type_cell, locale_cell, regular_style, regular_style]
           end

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

@@ -9,13 +9,14 @@ module I18n
 
         def missing_keys(forest = task.missing_keys)
           forest = task.collapse_plural_nodes!(forest)
+          forest = task.collapse_missing_used_locales!(forest)
           if forest.present?
             print_title missing_title(forest)
             print_table headings: [cyan(bold(I18n.t('i18n_tasks.common.locale'))),
                                    cyan(bold I18n.t('i18n_tasks.common.key')),
                                    I18n.t('i18n_tasks.missing.details_title')] do |t|
               t.rows = sort_by_attr!(forest_to_attr(forest)).map do |a|
-                [{value: cyan(a[:locale]), alignment: :center}, cyan(a[:key]), missing_key_info(a)]
+                [{value: cyan(format_locale(a[:locale])), alignment: :center}, cyan(a[:key]), missing_key_info(a)]
               end
             end
           else

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

@@ -15,7 +15,9 @@ module I18n::Tasks::Scanners
 
     def initialize(config = {})
       @config = config.dup.with_indifferent_access.tap do |conf|
-        conf[:relative_roots] = %w(app/views app/controllers app/helpers app/presenters) if conf[:relative_roots].blank?
+        if conf[:relative_roots].blank?
+          conf[:relative_roots] = %w(app/controllers app/helpers app/mailers app/presenters app/views)
+        end
         conf[:paths]   = %w(app/) if conf[:paths].blank?
         conf[:include] = Array(conf[:include]) if conf[:include].present?
         conf[:exclude] = Array(conf[:exclude]) + ALWAYS_EXCLUDE
@@ -109,7 +111,7 @@ module I18n::Tasks::Scanners
       data = {src_path: path}
       if position
         line_begin = text.rindex(/^/, src_pos - 1)
-        line_end   = text.index(/.(?=\n|$)/, src_pos)
+        line_end   = text.index(/.(?=\r?\n|$)/, src_pos)
         data.merge! pos:      src_pos,
                     line_num: text[0..src_pos].count("\n") + 1,
                     line_pos: src_pos - line_begin + 1,

data/lib/i18n/tasks/version.rb

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

data/spec/commands/data_commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Data commands' do
+RSpec.describe 'Data commands' do
   delegate :run_cmd, to: :TestCodebase
   def en_data
     {'en' => {'a' => '1', 'common' => {'hello' => 'Hello'}}}

data/spec/commands/tree_commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Tree commands' do
+RSpec.describe 'Tree commands' do
   delegate :run_cmd, to: :TestCodebase
   before do
     TestCodebase.setup

data/spec/conservative_router_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Conservative router' do
+RSpec.describe 'Conservative router' do
   describe '#available_locales' do
     before do
       TestCodebase.setup(

data/spec/file_system_data_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'File system i18n' do
+RSpec.describe 'File system i18n' do
   describe '#available_locales' do
     before do
       TestCodebase.setup(

data/spec/google_translate_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'i18n/tasks/commands'
 
-describe 'Google Translation' do
+RSpec.describe 'Google Translation' do
   include I18n::Tasks::GoogleTranslation
 
   tests = [

data/spec/i18n_spec.rb

@@ -1,6 +1,6 @@
 require 'i18n/tasks'
 
-describe 'I18n' do
+RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }

data/spec/i18n_tasks_spec.rb

@@ -4,8 +4,9 @@ require 'fileutils'
 require 'open3'
 
 # Integration tests
-describe 'i18n-tasks' do
-  delegate :run_cmd, :run_cmd_capture_stderr, :i18n_task, :in_test_app_dir, to: :TestCodebase
+RSpec.describe 'i18n-tasks' do
+  delegate :run_cmd, :run_cmd_capture_stdout_and_result, :run_cmd_capture_stderr, :i18n_task, :in_test_app_dir,
+           to: :TestCodebase
 
   describe 'bin/i18n-tasks' do
     it 'shows help when invoked with no arguments, shows version on --version' do
@@ -43,29 +44,36 @@ describe 'i18n-tasks' do
   end
 
   describe 'missing' do
-    let (:expected_missing_keys) {
-      %w( en.used_but_missing.key
-          en.relative.index.missing
-          es.missing_in_es.a
-          en.present_in_es_but_not_en.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
-          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
-          en.events.show.success
-        )
+    let (:expected_missing_keys_in_source) {
+      %w(
+        used_but_missing.key
+        relative.index.missing
+        hash.pattern_missing.a
+        hash.pattern_missing.b
+        missing_symbol_key
+        missing_symbol.key_two
+        missing_symbol.key_three
+        missing-key-with-a-dash.key
+        missing-key-question?.key
+        fn_comment
+        events.show.success
+      )
+    }
+    let (:expected_missing_keys_diff) {
+      %w(
+        es.missing_in_es.a
+        en.present_in_es_but_not_en.a
+        es.missing_in_es_plural_1.a
+        es.missing_in_es_plural_2.a
+        en.only_in_es
+      )
     }
     it 'detects missing' do
-      es_keys = expected_missing_keys.grep(/^es\./)
-      expect(run_cmd 'missing').to be_i18n_keys expected_missing_keys
-      # locale argument
+      es_keys = expected_missing_keys_diff.grep(/^es\./) + expected_missing_keys_in_source.map { |k| "es.#{k}" }
+      out, result = run_cmd_capture_stdout_and_result 'missing'
+      expect(result).to eq :exit_1
+      expect(out).to be_i18n_keys(expected_missing_keys_diff +
+                                      expected_missing_keys_in_source.map { |k| "all.#{k}" })
       expect(run_cmd 'missing', '-les').to be_i18n_keys es_keys
       expect(run_cmd 'missing', 'es').to be_i18n_keys es_keys
     end
@@ -91,7 +99,9 @@ describe 'i18n-tasks' do
 
   describe 'unused' do
     it 'detects unused' do
-      expect(run_cmd 'unused').to be_i18n_keys expected_unused_keys
+      out, result = run_cmd_capture_stdout_and_result 'unused'
+      expect(result).to eq :exit_1
+      expect(out).to be_i18n_keys expected_unused_keys
     end
 
     it 'detects unused (--strict)' do

data/spec/key_pattern_matching_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Key pattern' do
+RSpec.describe 'Key pattern' do
   include I18n::Tasks::KeyPatternMatching
   describe 'matching' do
     describe '*' do

data/spec/locale_pathname_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'LocalePathname' do
+RSpec.describe 'LocalePathname' do
   include ::I18n::Tasks::LocalePathname
   context '#replace_locale' do
 

data/spec/locale_tree/siblings_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Tree siblings / forest' do
+RSpec.describe 'Tree siblings / forest' do
 
   context 'Node' do
     it '::new with children' do

data/spec/pattern_scanner_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Pattern Scanner' do
+RSpec.describe 'Pattern Scanner' do
   describe 'scan_file' do
     it 'returns absolute keys from controllers' do
       file_path = 'spec/fixtures/app/controllers/events_controller.rb'

data/spec/plural_keys_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Plural keys' do
+RSpec.describe 'Plural keys' do
   let(:task) { ::I18n::Tasks::BaseTask.new }
   before do
     TestCodebase.setup('config/locales/en.yml' => '')

data/spec/readme_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-describe 'README.md' do
+RSpec.describe 'README.md' do
   let(:readme) { File.read('README.md', encoding: 'UTF-8') }
   it 'has valid YAML in ```yaml blocks' do
     readme.scan /```yaml\n(.*)(?=^)\n```/ do |m|

data/spec/relative_keys_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 require 'spec_helper'
-describe 'Relative keys' do
+RSpec.describe 'Relative keys' do
   let(:scanner) { I18n::Tasks::Scanners::BaseScanner.new }
 
   describe 'absolutize_key' do

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ Term::ANSIColor::coloring = false
 Dir['spec/support/**/*.rb'].each { |f| require "./#{f}" }
 
 RSpec.configure do |config|
+  config.expose_dsl_globally = false
   config.include FixturesSupport
   config.include CaptureStd
   config.include Trees

data/spec/split_key_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'SplitKey' do
+RSpec.describe 'SplitKey' do
   include ::I18n::Tasks::SplitKey
 
   [['', %w()],

data/spec/support/i18n_tasks_output_matcher.rb

@@ -8,14 +8,13 @@ RSpec::Matchers.define :be_i18n_keys do |expected|
     actual = Term::ANSIColor.uncolor(actual).split("\n").map(&:presence).compact
     actual = actual[3..-2]
     actual = actual.map { |row|
-      next if row =~ /^\|\s+\|/
-      row.gsub(/(?:\s|^)\|(?:\s|$)/, ' ').gsub(/\s+/, ' ').strip.split(' ').map(&:presence).compact
+      row[1..-1].gsub(/(?:\s+|^)\|(?:\s+|$)/, '|').gsub(/\s+/, ' ').strip.split(/\s*\|\s*/)
     }.compact
     return [] if actual.empty?
     locale_col = 0
     key_col = 1
     actual.map { |row|
-      key = "#{row[locale_col]}.#{row[key_col]}"
+      key = [row[locale_col], row[key_col]].map(&:presence).compact.join('.')
       key = key[0..-2] if key.end_with?(':')
       key
     }.compact

data/spec/support/test_codebase.rb

@@ -22,6 +22,14 @@ module TestCodebase
     } } }
   end
 
+  def run_cmd_capture_stdout_and_result(name, *args)
+    result = nil
+    out = capture_stdout { capture_stderr { in_test_app_dir {
+      result = run_cli(name, *args)
+    } } }
+    [out, result]
+  end
+
   def run_cmd_capture_stderr(name, *args)
     capture_stderr { capture_stdout { in_test_app_dir {
       run_cli(name, *args)

data/spec/support/trees.rb

@@ -2,6 +2,11 @@
 module Trees
   def expect_node_key_data(node, key, data)
     expect(node.full_key(root: false)).to eq key
+    if Gem.win_platform?
+      # adjust position to account for \r on Windows
+      data = data.dup
+      data[:source_occurrences].map! { |occ| occ.dup.tap { |o| o[:pos] += o[:line_num] - 1 } }
+    end
     expect(node.data).to eq data
   end
 

data/spec/used_keys_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'UsedKeys' do
+RSpec.describe 'UsedKeys' do
   let!(:task) { I18n::Tasks::BaseTask.new }
   let(:file_name) { 'a.html.slim' }
   let(:file_content) do
@@ -27,15 +27,15 @@ h1 = t 'b'
         leaves[0],
         'a',
         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'}]
+            [{src_path: 'a.html.slim', 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'"}]
     )
 
     expect_node_key_data(
         leaves[1],
         'b',
         source_occurrences:
-            [{pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'", src_path: 'a.html.slim'}]
+            [{src_path: 'a.html.slim', pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'"}]
     )
   end
 
@@ -46,7 +46,7 @@ h1 = t 'b'
         used_keys.leaves.first,
         'b',
         source_occurrences:
-            [{pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'", src_path: 'a.html.slim'}]
+            [{src_path: 'a.html.slim', pos: 29, line_num: 3, line_pos: 6, line: "h1 = t 'b'"}]
     )
   end
 
@@ -67,8 +67,8 @@ h1 = t 'b'
           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'}]
+              [{src_path: 'a.html.haml', 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') }"}]
       )
     end
   end

data/templates/config/i18n-tasks.yml

@@ -19,8 +19,8 @@ data:
     # - config/locales/%{locale}.yml
     ## More files:
     # - config/locales/**/*.%{locale}.yml
-    ## Another gem:
-    # - "<%= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+    ## Another gem (replace %#= with %=):
+    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
@@ -54,10 +54,11 @@ search:
 
   ## Root directories for relative keys resolution.
   # relative_roots:
-  #   - app/views
   #   - app/controllers
   #   - app/helpers
+  #   - app/mailers
   #   - app/presenters
+  #   - app/views
 
   ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)

data/templates/rspec/i18n_spec.rb

@@ -1,6 +1,6 @@
 require 'i18n/tasks'
 
-describe 'I18n' do
+RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -187,10 +187,12 @@ email:
 - glex.spb@gmail.com
 executables:
 - i18n-tasks
+- i18n-tasks.cmd
 extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".gitattributes"
 - ".gitignore"
 - ".travis.yml"
 - CHANGES.md
@@ -199,6 +201,7 @@ files:
 - README.md
 - Rakefile
 - bin/i18n-tasks
+- bin/i18n-tasks.cmd
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/locales/ru.yml
@@ -317,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
@@ -352,4 +355,3 @@ test_files:
 - spec/support/test_codebase.rb
 - spec/support/trees.rb
 - spec/used_keys_spec.rb
-has_rdoc: