i18n-tasks 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fdd3b0e7a3f582d6ebf37b2fa35117f626ce72
-  data.tar.gz: 2e487915be57d0b7392bba89bb666a28fd143d23
+  metadata.gz: 414af08a4707037cdb353bba1ed426fd44852906
+  data.tar.gz: 986fd27c576e0763f1980ba70fa45e7cad81ce95
 SHA512:
-  metadata.gz: 445084513fabeddd582963ed14d6fbb8345f45781c294b7d20bd97aeb5fa88820dcd75d268a9a1e701175d982ef9f3e1f2f46e31e07f1bae03b1af6b82978772
-  data.tar.gz: 23e916f594cd903f57d9b130a39d2ee89b834c319db8e15c9791caa963bb183f9161718079d81c1b8ce2318fb01a25a94027836fa9794b85bf4c6a85acb7662c
+  metadata.gz: 9cd51331aa6e088f79d0d06d28c88b1b32b5321c25af2821c638639ebf40ea28b121ad1ac056f37d1ace4e702589282df29957d9e0be9877fc444b97e31daa39
+  data.tar.gz: 46339dd43fcb62d8630bb348df8ceee774d90ced3eab072f0565e66df1ae426228ad81e5584b28e3d346e5bac81f2f4988c04879ca594d63c74175d3e8b59e38

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# 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%20Chat.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>
 
@@ -24,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.9.12'
+gem 'i18n-tasks', '~> 0.9.13'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -354,13 +354,9 @@ translation:
 
 `i18n-tasks irb` starts an IRB session in i18n-tasks context. Type `guide` for more information.
 
-### XLSX
+### Import / export to a CSV spreadsheet
 
-Export missing and unused data to XLSX:
-
-```console
-$ i18n-tasks xlsx-report
-```
+See [i18n-tasks wiki: CSV import and export tasks](https://github.com/glebm/i18n-tasks/wiki/Custom-CSV-import-and-export-tasks).
 
 ## Add new tasks
 

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:rspec)

data/i18n-tasks.gemspec

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'i18n/tasks/version'
@@ -41,7 +42,7 @@ TEXT
   s.add_dependency 'highline', '>= 1.7.3'
   s.add_dependency 'i18n'
   s.add_dependency 'parser', '>= 2.2.3.0'
-  s.add_dependency 'term-ansicolor', '>= 1.3.2'
+  s.add_dependency 'rainbow', '~> 2.2'
   s.add_dependency 'terminal-table', '>= 1.5.1'
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'

data/lib/i18n/tasks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # define all the modules to be able to use ::
 module I18n
   module Tasks
@@ -55,7 +56,7 @@ rescue LoadError => _e
   # activesupport ~> 2.3.2
   require 'active_support/core_ext/try'
 end
-require 'term/ansicolor'
+require 'rainbow'
 require 'erubis'
 
 require 'i18n/tasks/version'

data/lib/i18n/tasks/base_task.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command_error'
 require 'i18n/tasks/split_key'
 require 'i18n/tasks/key_pattern_matching'

data/lib/i18n/tasks/cli.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks'
 require 'i18n/tasks/commands'
 require 'optparse'
@@ -197,10 +198,10 @@ class I18n::Tasks::CLI
   end
 
   def auto_output_coloring(coloring = ENV['I18N_TASKS_COLOR'] || STDOUT.isatty)
-    coloring_was             = Term::ANSIColor.coloring?
-    Term::ANSIColor.coloring = coloring
+    coloring_was    = Rainbow.enabled
+    Rainbow.enabled = coloring
     yield
   ensure
-    Term::ANSIColor.coloring = coloring_was
+    Rainbow.enabled = coloring_was
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/dsl'
 require 'i18n/tasks/command/options/common'
 require 'i18n/tasks/command/options/locales'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/cli'
 require 'i18n/tasks/reports/terminal'
 require 'i18n/tasks/reports/spreadsheet'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -13,7 +14,7 @@ module I18n::Tasks
         cmd :normalize,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.normalize'),
-            args: [:locales, :pattern_router]
+            args: %i(locales pattern_router)
 
         def normalize(opt = {})
           i18n.normalize_store! opt[:locales], opt[:pattern_router]
@@ -48,7 +49,7 @@ module I18n::Tasks
         cmd :data,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.data'),
-            args: [:locales, :out_format]
+            args: %i(locales out_format)
 
         def data(opt = {})
           print_forest i18n.data_forest(opt[:locales]), opt
@@ -57,7 +58,7 @@ module I18n::Tasks
         cmd :data_merge,
             pos:  '[tree ...]',
             desc: t('i18n_tasks.cmd.desc.data_merge'),
-            args: [:data_format, :nostdin]
+            args: %i(data_format nostdin)
 
         def data_merge(opt = {})
           forest = merge_forests_stdin_and_pos!(opt)
@@ -68,7 +69,7 @@ module I18n::Tasks
         cmd :data_write,
             pos:  '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_write'),
-            args: [:data_format, :nostdin]
+            args: %i(data_format nostdin)
 
         def data_write(opt = {})
           forest = forest_pos_or_stdin!(opt)
@@ -79,7 +80,7 @@ module I18n::Tasks
         cmd :data_remove,
             pos:  '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_remove'),
-            args: [:data_format, :nostdin]
+            args: %i(data_format nostdin)
 
         def data_remove(opt = {})
           removed = i18n.data.remove_by_key!(forest_pos_or_stdin!(opt))

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -8,7 +9,7 @@ module I18n::Tasks
         cmd :eq_base,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.eq_base'),
-            args: [:locales, :out_format]
+            args: %i(locales out_format)
 
         def eq_base(opt = {})
           print_forest i18n.eq_base_keys(opt), opt, :eq_base_keys

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -8,7 +9,7 @@ module I18n::Tasks
         cmd :health,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.health'),
-            args: [:locales, :out_format]
+            args: %i(locales out_format)
 
         def health(opt = {})
           forest = i18n.data_forest(opt[:locales])

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -14,7 +15,7 @@ module I18n::Tasks
           cfg = cfg.slice(*opts[:arguments]) if opts[:arguments].present?
           cfg = cfg.to_yaml
           cfg.sub!(/\A---\n/, '')
-          cfg.gsub!(/^([^\s-].+?:)/, Term::ANSIColor.cyan(Term::ANSIColor.bold('\1')))
+          cfg.gsub!(/^([^\s-].+?:)/, Rainbow('\1').cyan.bright)
           puts cfg
         end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/collection'
 
 module I18n::Tasks
@@ -24,7 +25,7 @@ module I18n::Tasks
         cmd :missing,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.missing'),
-            args: [:locales, :out_format, :missing_types]
+            args: %i(locales out_format missing_types)
 
         def missing(opt = {})
           forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :missing_types))

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -19,7 +20,7 @@ module I18n::Tasks
         cmd :tree_merge,
             pos:  '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_merge'),
-            args: [:data_format, :nostdin]
+            args: %i(data_format nostdin)
 
         def tree_merge(opts = {})
           print_forest merge_forests_stdin_and_pos!(opts), opts
@@ -28,7 +29,7 @@ module I18n::Tasks
         cmd :tree_filter,
             pos:  '[pattern] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_filter'),
-            args: [:data_format, :pattern]
+            args: %i(data_format pattern)
 
         def tree_filter(opts = {})
           pattern = arg_or_pos! :pattern, opts
@@ -74,7 +75,7 @@ module I18n::Tasks
         cmd :tree_subtract,
             pos:  '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_subtract'),
-            args: [:data_format, :nostdin]
+            args: %i(data_format nostdin)
 
         def tree_subtract(opt = {})
           forests = forests_stdin_and_pos! opt, 2
@@ -85,7 +86,7 @@ module I18n::Tasks
         cmd :tree_set_value,
             pos:  '[VALUE] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_set_value'),
-            args: [:value, :data_format, :nostdin, :pattern]
+            args: %i(value data_format nostdin pattern)
 
         def tree_set_value(opt = {})
           value       = arg_or_pos! :value, opt

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -12,7 +13,7 @@ module I18n::Tasks
         cmd :find,
             pos:  '[pattern]',
             desc: t('i18n_tasks.cmd.desc.find'),
-            args: [:out_format, :pattern, :strict]
+            args: %i(out_format pattern strict)
 
         def find(opt = {})
           opt[:filter] ||= opt.delete(:pattern) || opt[:arguments].try(:first)
@@ -23,7 +24,7 @@ module I18n::Tasks
         cmd :unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.unused'),
-            args: [:locales, :out_format, :strict]
+            args: %i(locales out_format strict)
 
         def unused(opt = {})
           forest = i18n.unused_keys(opt.slice(:locales, :strict))
@@ -34,7 +35,7 @@ module I18n::Tasks
         cmd :remove_unused,
             pos:  '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.remove_unused'),
-            args: [:locales, :out_format, :strict, :confirm]
+            args: %i(locales out_format strict confirm)
 
         def remove_unused(opt = {})
           unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))
@@ -45,7 +46,7 @@ module I18n::Tasks
             log_stderr t('i18n_tasks.remove_unused.removed', count: unused_keys.leaves.count)
             print_forest removed, opt
           else
-            log_stderr bold green t('i18n_tasks.remove_unused.noop')
+            log_stderr Rainbow(t('i18n_tasks.remove_unused.noop')).green.bright
           end
         end
 
@@ -53,11 +54,11 @@ module I18n::Tasks
 
         def confirm_remove_unused!(unused_keys, opt)
           return if ENV['CONFIRM'] || opt[:confirm]
-          locales = bold(unused_keys.flat_map { |root| root.key.split('+') }.sort.uniq * ', ')
+          locales = Rainbow(unused_keys.flat_map { |root| root.key.split('+') }.sort.uniq * ', ').bright
           msg     = [
-            red(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)),
-            yellow(t('i18n_tasks.common.continue_q')),
-            yellow('(yes/no)')
+            Rainbow(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)).red,
+            Rainbow(t('i18n_tasks.common.continue_q')).yellow,
+            Rainbow('(yes/no)').yellow
           ].join(' ')
           exit 1 unless agree msg
         end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module Commands
@@ -16,7 +17,7 @@ module I18n::Tasks
             require 'axlsx'
           rescue LoadError
             message = %(For spreadsheet report please add axlsx gem to Gemfile:\ngem 'axlsx', '~> 2.0')
-            log_stderr Term::ANSIColor.red Term::ANSIColor.bold message
+            log_stderr Rainbow(message).red.bright
             exit 1
           end
           spreadsheet_report.save_report opt[:path], opt.except(:path)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module DSL

data/lib/i18n/tasks/command/option_parsers/enum.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module OptionParsers

data/lib/i18n/tasks/command/option_parsers/locale.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   module Command
     module OptionParsers
@@ -39,7 +40,7 @@ module I18n::Tasks
             if vals == %w(all) || vals.blank?
               context.locales
             else
-              move_base_locale_to_front! vals.map { |v| v == 'base' ? context.base_locale : v }, context.base_locale
+              move_base_locale_to_front!(vals.map { |v| v == 'base' ? context.base_locale : v }, context.base_locale)
             end.tap do |locales|
               locales.each { |locale| validate! locale }
             end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/dsl'
 
 module I18n::Tasks

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/option_parsers/enum'
 
 module I18n::Tasks

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/option_parsers/locale'
 
 module I18n::Tasks

data/lib/i18n/tasks/command_error.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n
   module Tasks
     # When this type of error is caught:

data/lib/i18n/tasks/commands.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'i18n/tasks/command/dsl'
 require 'i18n/tasks/command/collection'
 require 'i18n/tasks/command/commands/health'
@@ -23,7 +24,6 @@ module I18n::Tasks
     include Command::Commands::Meta
     include Command::Commands::XLSX
 
-    include Term::ANSIColor
     require 'highline/import'
   end
 end

data/lib/i18n/tasks/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks::Configuration # rubocop:disable Metrics/ModuleLength
   DEFAULTS = {
     base_locale:     'en',

data/lib/i18n/tasks/console_context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module I18n::Tasks
   class ConsoleContext < BaseTask
     def to_s
@@ -28,21 +29,19 @@ module I18n::Tasks
     module Messages
       module_function
 
-      extend Term::ANSIColor
-
       def banner
-        bold("i18n-tasks v#{I18n::Tasks::VERSION} IRB") + "\nType #{green 'guide'} to learn more"
+        Rainbow("i18n-tasks v#{I18n::Tasks::VERSION} IRB").bright + "\nType #{Rainbow('guide').green} to learn more"
       end
 
       def guide
-        green(bold('i18n-tasks IRB Quick Start guide')) + "\n" + <<-TEXT
-#{yellow 'Data as trees'}
+        Rainbow('i18n-tasks IRB Quick Start guide').green.bright + "\n" + <<-TEXT
+#{Rainbow('Data as trees').yellow}
   tree(locale)
   used_tree(key_filter: nil, strict: nil)
   unused_tree(locale: base_locale, strict: nil)
   build_tree('es' => {'hello' => 'Hola'})
 
-#{yellow 'Traversal'}
+#{Rainbow('Traversal').yellow}
   tree = missing_diff_tree('es')
   tree.nodes { |node| }
   tree.nodes.to_a
@@ -50,23 +49,23 @@ module I18n::Tasks
   tree.each { |root_node| }
   # also levels, depth_first, and breadth_first
 
-#{yellow 'Select nodes'}
+#{Rainbow('Select nodes').yellow}
   tree.select_nodes { |node| } # new tree with only selected nodes
 
-#{yellow 'Match by full key'}
+#{Rainbow('Match by full key').yellow}
   tree.select_keys { |key, leaf| } # new tree with only selected keys
   tree.grep_keys(/hello/)          # grep, using ===
   tree.keys { |key, leaf| }        # enumerate over [full_key, leaf_node]
   # Pass {root: true} to include root node in full_key (usually locale)
 
-#{yellow 'Nodes'}
+#{Rainbow('Nodes').yellow}
   node = node(key, locale)
   node.key      # only the part after the last dot
   node.full_key # full key. Includes root key, pass {root: false} to override.
   # also: value, value_or_children_hash, data, walk_to_root, walk_from_root
   Tree::Node.new(key: 'en')
 
-#{yellow 'Keys'}
+#{Rainbow('Keys').yellow}
   t(key, locale)
   key_value?(key, locale)
   depluralize_key(key, locale) # convert 'hat.one' to 'hat'