i18n-tasks 0.9.33 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac2026537e1679b2e306eddee2c97ca569d6c498d1a9850e512702626ab9c19
-  data.tar.gz: 49a908c2b2a9144919076a5c3948fa537486739dc9b02968366c7ec0d3ccf62b
+  metadata.gz: e77c4c19ca040adf1879259e8ad1d963e181eb1682e97ffa99f5b09d1b59e803
+  data.tar.gz: cc5ed0a16159c8f14a9006ab3908cfdc93b5dbc338603d54846d0ae4f84abb80
 SHA512:
-  metadata.gz: 639a786f1b1dfa5ee217e658975ac8b01b0966a4afdea49b69fdb4d1d4ff8cf9e48aab98eae0c6475a5c71fa4e8caccee88f1239205317550a03505a015fc932
-  data.tar.gz: d5a7ed2e9e1f4d2bf0474eb821e00713eff0fe486ef3cc92da12bc6e227bfecc987c5d2e70538e2c4436aba8958a763c8640d46c68d5ff2fdbf18e364d3d6cbc
+  metadata.gz: 978d87d9e73dc5f4e183a7fdebabeec9864c3b1ba530f722bc3a80428b1c422eeda55f2bbd2b7ec8c1a67649ee128db4ae9ab0fc24db4b8cf386f7740b0f34d4
+  data.tar.gz: 46a0b0cbb262c17aaf1195293edd1fc04d665dd85d5f8d1b399f1ae565db2eb99e3e281fb1a34a5cb3629aadee2c2b279642d8beca623814fcd9b75c0c502b5e

data/README.md

@@ -1,4 +1,6 @@
-# i18n-tasks [![Build Status][badge-travis]][travis] [![Coverage Status][badge-coverage]][coverage] [![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)
+# i18n-tasks [![Build Status][badge-ci]][ci] [![Coverage Status][badge-coverage]][coverage] [![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)
+
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua/)
 
 i18n-tasks helps you find and manage missing and unused translations.
 
@@ -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.9.33'
+gem 'i18n-tasks', '~> 1.0.12'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -212,7 +214,7 @@ $ i18n-tasks missing -f yaml fr | i18n-tasks tree-set-value 'TRME %{value}' | i1
 $ i18n-tasks unused -f yaml | i18n-tasks data-remove
 ```
 
-Remove all keys in `fr` but not `en` from `fr`:
+Remove all keys from `fr` that do not exist in `en`. Do not change `en`:
 ```console
 $ i18n-tasks missing -t diff -f yaml en | i18n-tasks tree-mv en fr | i18n-tasks data-remove
 ```
@@ -221,7 +223,7 @@ See the full list of tasks with `i18n-tasks --help`.
 
 ### Features and limitations
 
-`i18n-tasks` uses an AST scanner for `.rb` files, and a regexp-based scanner for other files, such as `.haml`.
+`i18n-tasks` uses an AST scanner for `.rb` and `.html.erb` files, and a regexp-based scanner for other files, such as `.haml`.
 
 #### Relative keys
 
@@ -353,7 +355,7 @@ If you have implemented a custom adapter please share it on [the wiki][wiki].
 
 ### Usage search
 
-i18n-tasks uses an AST scanner for `.rb` files, and a regexp scanner for all other files.
+i18n-tasks uses an AST scanner for `.rb` and `.html.erb` files, and a regexp scanner for all other files.
 New scanners can be added easily: please refer to [this example](https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example).
 
 See the `search` section in the [config file][config] for all available configuration options.
@@ -385,7 +387,7 @@ See the [config file][config] to find out more.
 Where this key is depends on your Google API console:
 
 * Old console: API Access -> Simple API Access -> Key for server apps.
-* New console: Project -> APIS & AUTH -> Credentials -> Public API access -> Key for server applications.
+* New console: Nav Menu -> APIs & Services -> Credentials -> Create Credentials -> API Keys -> Restrict Key -> Cloud Translation API
 
 In both cases, you may need to create the key if it doesn't exist.
 
@@ -405,7 +407,9 @@ translation:
 ```yaml
 # config/i18n-tasks.yml
 translation:
-  deepl_api_key: <Deep Pro API key>
+  deepl_api_key: <DeepL Pro API key>
+  deepl_host: <optional>
+  deepl_version: <optional>
 ```
 
 <a name="yandex-translation-config"></a>
@@ -432,15 +436,28 @@ See [i18n-tasks wiki: CSV import and export tasks](https://github.com/glebm/i18n
 Tasks that come with the gem are defined in [lib/i18n/tasks/command/commands](lib/i18n/tasks/command/commands).
 Custom tasks can be added easily, see the examples [on the wiki](https://github.com/glebm/i18n-tasks/wiki#custom-tasks).
 
+# Development
+
+- Install dependencies using `bundle install`
+- Run tests using `bundle exec rspec`
+- Install [Overcommit](overcommit) by running `overcommit --install`
+
+## Skip Overcommit-hooks
+
+- `SKIP=RuboCop git commit`
+- `OVERCOMMIT_DISABLE=1 git commit`
+
+
 [MIT license]: /LICENSE.txt
-[travis]: https://travis-ci.org/glebm/i18n-tasks
-[badge-travis]: https://img.shields.io/travis/glebm/i18n-tasks.svg
+[ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml
+[badge-ci]: https://github.com/glebm/i18n-tasks/actions/workflows/tests.yml/badge.svg
 [coverage]: https://codeclimate.com/github/glebm/i18n-tasks
 [badge-coverage]: https://api.codeclimate.com/v1/badges/5d173e90ada8df07cedc/test_coverage
-[config]: https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
+[config]: https://github.com/glebm/i18n-tasks/blob/main/templates/config/i18n-tasks.yml
 [wiki]: https://github.com/glebm/i18n-tasks/wiki "i18n-tasks wiki"
 [i18n-gem]: https://github.com/svenfuchs/i18n "svenfuchs/i18n on Github"
 [screenshot-i18n-tasks]: https://i.imgur.com/XZBd8l7.png "i18n-tasks screenshot"
 [screenshot-find]: https://i.imgur.com/VxBrSfY.png "i18n-tasks find output screenshot"
-[adapter-example]: https://github.com/glebm/i18n-tasks/blob/master/lib/i18n/tasks/data/file_system_base.rb
+[adapter-example]: https://github.com/glebm/i18n-tasks/blob/main/lib/i18n/tasks/data/file_system_base.rb
 [custom-scanner-docs]: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+[overcommit]: https://github.com/sds/overcommit#installation

data/config/locales/en.yml

@@ -11,6 +11,7 @@ en:
         desc:
           all_locales: Do not expect key patterns to start with a locale, instead apply them to all
             locales implicitly.
+          config: Override config location
           confirm: Confirm automatically
           data_format: 'Data format: %{valid_text}.'
           keep_order: Keep the order of the keys
@@ -32,7 +33,7 @@ en:
             Value. Interpolates: %{value}, %{human_key}, %{key}, %{default}, %{value_or_human_key},
             %{value_or_default_or_human_key}
       desc:
-        add_missing: add missing keys to locale data
+        add_missing: add missing keys to locale data, optionally match a pattern
         check_consistent_interpolations: verify that all translations use correct interpolation variables
         check_normalized: verify that all translation data is normalized
         config: display i18n-tasks configuration
@@ -45,12 +46,13 @@ en:
         gem_path: show path to the gem
         health: is everything OK?
         irb: start REPL session within i18n-tasks context
-        missing: show missing translations
+        missing: show missing translations, optionally match a pattern
         mv: rename/merge the keys in locale data that match the given pattern
         normalize: 'normalize translation data: sort and move to the right files'
         remove_unused: remove unused keys
         rm: remove the keys in locale data that match the given pattern
-        translate_missing: translate missing keys with Google Translate or DeepL Pro
+        translate_missing: translate missing keys with Google Translate or DeepL Pro, optionally match
+          a pattern
         tree_convert: convert tree between formats
         tree_filter: filter tree by key pattern
         tree_merge: merge trees

data/config/locales/ru.yml

@@ -8,6 +8,7 @@ ru:
         default_text: 'По умолчанию: %{value}'
         desc:
           all_locales: Не ожидать, что маски ключа начинаются с локали. Применять маски ко всем локалям.
+          config: Путь к файлу конфигурации
           confirm: Подтвердить автоматом
           data_format: 'Формат данных: %{valid_text}.'
           keep_order: Keep the order of the keys

data/i18n-tasks.gemspec

@@ -16,16 +16,21 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
 
     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.
-TEXT
+  TEXT
   s.post_install_message = <<~TEXT
     # Install default configuration:
     cp $(bundle exec i18n-tasks gem-path)/templates/config/i18n-tasks.yml config/
     # Add an RSpec for missing and unused keys:
     cp $(bundle exec i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/
-TEXT
+    # Or for minitest:
+    cp $(bundle exec i18n-tasks gem-path)/templates/minitest/i18n_test.rb test/
+  TEXT
   s.homepage = 'https://github.com/glebm/i18n-tasks'
-  s.metadata = { 'issue_tracker' => 'https://github.com/glebm/i18n-tasks' } if s.respond_to?(:metadata=)
-  s.required_ruby_version = '>= 2.3', '< 4.0' if s.respond_to?(:required_ruby_version=)
+  s.metadata = {
+    'issue_tracker' => 'https://github.com/glebm/i18n-tasks',
+    'rubygems_mfa_required' => 'true'
+  }
+  s.required_ruby_version = '>= 2.6', '< 4.0'
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
@@ -35,6 +40,7 @@ TEXT
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.1.0'
+  s.add_dependency 'better_html', '>= 1.0', '< 3.0'
   s.add_dependency 'erubi'
   s.add_dependency 'highline', '>= 2.0.0'
   s.add_dependency 'i18n'
@@ -42,11 +48,11 @@ TEXT
   s.add_dependency 'rails-i18n'
   s.add_dependency 'rainbow', '>= 2.2.2', '< 4.0'
   s.add_dependency 'terminal-table', '>= 1.5.1'
-  s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
+  s.add_development_dependency 'overcommit', '~> 0.58.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
-  s.add_development_dependency 'rubocop', '~> 0.53.0'
+  s.add_development_dependency 'rubocop', '~> 1.27.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
 

data/lib/i18n/tasks/base_task.rb

@@ -39,7 +39,8 @@ module I18n
       include Data
       include Stats
 
-      def initialize(config = {})
+      def initialize(config_file: nil, **config)
+        @config_override = config_file
         self.config = config || {}
       end
 

data/lib/i18n/tasks/cli.rb

@@ -15,28 +15,38 @@ class I18n::Tasks::CLI
 
   def start(argv)
     auto_output_coloring do
+      exit 1 if run(argv) == :exit1
+    rescue OptionParser::ParseError => e
+      error e.message, 64
+    rescue I18n::Tasks::CommandError => e
       begin
-        exit 1 if run(argv) == :exit_1
-      rescue OptionParser::ParseError => e
-        error e.message, 64
-      rescue I18n::Tasks::CommandError => e
-        begin
-          error e.message, 78
-        ensure
-          log_verbose e.backtrace * "\n"
-        end
-      rescue Errno::EPIPE
-        # ignore Errno::EPIPE which is throw when pipe breaks, e.g.:
-        # i18n-tasks missing | head
-        exit 1
+        error e.message, 78
+      ensure
+        log_verbose e.backtrace * "\n"
       end
+    rescue Errno::EPIPE
+      # ignore Errno::EPIPE which is throw when pipe breaks, e.g.:
+      # i18n-tasks missing | head
+      exit 1
     end
   rescue ExecutionError => e
     exit e.exit_code
   end
 
   def run(argv)
-    I18n.with_locale(base_task.internal_locale) do
+    argv.each_with_index do |arg, i|
+      if ['--config', '-c'].include?(arg)
+        _, config_file = argv.slice!(i, 2)
+        if File.exist?(config_file)
+          @config_file = config_file
+          break
+        else
+          error "Config file doesn't exist: #{config_file}", 128
+        end
+      end
+    end
+
+    I18n.with_locale(base_task(config_file: @config_file).internal_locale) do
       name, *options = parse!(argv.dup)
       context.run(name, *options)
     end
@@ -54,8 +64,8 @@ class I18n::Tasks::CLI
 
   private
 
-  def base_task
-    @base_task ||= I18n::Tasks::BaseTask.new
+  def base_task(config_file: nil)
+    @base_task ||= I18n::Tasks::BaseTask.new(config_file: config_file)
   end
 
   def parse!(argv)
@@ -195,7 +205,7 @@ class I18n::Tasks::CLI
     end
   end
 
-  def auto_output_coloring(coloring = ENV['I18N_TASKS_COLOR'] || STDOUT.isatty)
+  def auto_output_coloring(coloring = ENV['I18N_TASKS_COLOR'] || $stdout.isatty)
     coloring_was    = Rainbow.enabled
     Rainbow.enabled = coloring
     yield

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

@@ -16,6 +16,7 @@ module I18n::Tasks
       end
 
       def run(name, opts = {})
+        log_stderr "#{Rainbow('#StandWith').bg(:blue)}#{Rainbow('Ukraine').bg(:yellow)}"
         name = name.to_sym
         public_name = name.to_s.tr '_', '-'
         log_verbose "task: #{public_name}(#{opts.map { |k, v| "#{k}: #{v.inspect}" } * ', '})"

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

@@ -12,7 +12,7 @@ module I18n::Tasks
             t('i18n_tasks.cmd.args.desc.pattern_router')
 
         cmd :normalize,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.normalize'),
             args: %i[locales pattern_router]
 
@@ -29,7 +29,7 @@ module I18n::Tasks
         def check_normalized(opt)
           non_normalized = i18n.non_normalized_paths locales: opt[:locales]
           terminal_report.check_normalized_results(non_normalized)
-          :exit_1 unless non_normalized.empty?
+          :exit1 unless non_normalized.empty?
         end
 
         cmd :mv,
@@ -37,6 +37,7 @@ module I18n::Tasks
             desc: t('i18n_tasks.cmd.desc.mv')
         def mv(opt = {})
           fail CommandError, 'requires FROM_KEY_PATTERN and TO_KEY_PATTERN' if opt[:arguments].size < 2
+
           from_pattern = opt[:arguments].shift
           to_pattern = opt[:arguments].shift
           forest = i18n.data_forest
@@ -50,6 +51,7 @@ module I18n::Tasks
             desc: t('i18n_tasks.cmd.desc.rm')
         def rm(opt = {})
           fail CommandError, 'requires KEY_PATTERN' if opt[:arguments].empty?
+
           forest = i18n.data_forest
           results = opt[:arguments].each_with_object({}) do |key_pattern, h|
             h.merge! forest.mv_key!(compile_key_pattern(key_pattern), '', root: false)
@@ -59,7 +61,7 @@ module I18n::Tasks
         end
 
         cmd :data,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.data'),
             args: %i[locales out_format]
 
@@ -68,7 +70,7 @@ module I18n::Tasks
         end
 
         cmd :data_merge,
-            pos:  '[tree ...]',
+            pos: '[tree ...]',
             desc: t('i18n_tasks.cmd.desc.data_merge'),
             args: %i[data_format nostdin]
 
@@ -79,7 +81,7 @@ module I18n::Tasks
         end
 
         cmd :data_write,
-            pos:  '[tree]',
+            pos: '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_write'),
             args: %i[data_format nostdin]
 
@@ -90,7 +92,7 @@ module I18n::Tasks
         end
 
         cmd :data_remove,
-            pos:  '[tree]',
+            pos: '[tree]',
             desc: t('i18n_tasks.cmd.desc.data_remove'),
             args: %i[data_format nostdin]
 

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

@@ -7,14 +7,14 @@ module I18n::Tasks
         include Command::Collection
 
         cmd :eq_base,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.eq_base'),
             args: %i[locales out_format]
 
         def eq_base(opt = {})
           forest = i18n.eq_base_keys(opt)
           print_forest forest, opt, :eq_base_keys
-          :exit_1 unless forest.empty?
+          :exit1 unless forest.empty?
         end
       end
     end

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

@@ -7,21 +7,22 @@ module I18n::Tasks
         include Command::Collection
 
         cmd :health,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.health'),
-            args: %i[locales out_format]
+            args: %i[locales out_format config]
 
         def health(opt = {})
           forest = i18n.data_forest(opt[:locales])
           stats  = i18n.forest_stats(forest)
           fail CommandError, t('i18n_tasks.health.no_keys_detected') if stats[:key_count].zero?
+
           terminal_report.forest_stats forest, stats
           [
             missing(**opt),
             unused(**opt),
             check_consistent_interpolations(**opt),
             check_normalized(**opt)
-          ].detect { |result| result == :exit_1 }
+          ].detect { |result| result == :exit1 }
         end
       end
     end

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

@@ -14,7 +14,7 @@ module I18n::Tasks
         def check_consistent_interpolations(opt = {})
           forest = i18n.inconsistent_interpolations(**opt.slice(:locales, :base_locale))
           print_forest forest, opt, :inconsistent_interpolations
-          :exit_1 unless forest.empty?
+          :exit1 unless forest.empty?
         end
       end
     end

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

@@ -7,7 +7,7 @@ module I18n::Tasks
         include Command::Collection
 
         cmd :config,
-            pos:  '[section ...]',
+            pos: '[section ...]',
             desc: t('i18n_tasks.cmd.desc.config')
 
         def config(opts = {})

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

@@ -23,23 +23,31 @@ module I18n::Tasks
             )
 
         cmd :missing,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.missing'),
-            args: %i[locales out_format missing_types]
+            args: %i[locales out_format missing_types pattern]
 
         def missing(opt = {})
           forest = i18n.missing_keys(**opt.slice(:locales, :base_locale, :types))
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            forest.select_keys! { |full_key, _node| full_key =~ pattern_re }
+          end
           print_forest forest, opt, :missing_keys
-          :exit_1 unless forest.empty?
+          :exit1 unless forest.empty?
         end
 
         cmd :translate_missing,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.translate_missing'),
-            args: [:locales, :locale_to_translate_from, arg(:out_format).from(1), :translation_backend]
+            args: [:locales, :locale_to_translate_from, arg(:out_format).from(1), :translation_backend, :pattern]
 
         def translate_missing(opt = {})
           missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
+          if opt[:pattern]
+            pattern_re = i18n.compile_key_pattern(opt[:pattern])
+            missing.select_keys! { |full_key, _node| full_key =~ pattern_re }
+          end
           translated = i18n.translate_forest missing, from: opt[:from], backend: opt[:backend].to_sym
           i18n.data.merge! translated
           log_stderr t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
@@ -47,18 +55,23 @@ module I18n::Tasks
         end
 
         cmd :add_missing,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.add_missing'),
-            args: [:locales, :out_format, arg(:value) + [{ default: '%{value_or_default_or_human_key}' }],
+            args: [:locales, :out_format, :pattern, arg(:value) + [{ default: '%{value_or_default_or_human_key}' }],
                    ['--nil-value', 'Set value to nil. Takes precedence over the value argument.']]
 
-        def add_missing(opt = {}) # rubocop:disable Metrics/AbcSize
-          [ # Merge base locale first, as this may affect the value for the other locales
+        # Merge base locale first, as this may affect the value for the other locales
+        def add_missing(opt = {})
+          [
             [i18n.base_locale] & opt[:locales],
             opt[:locales] - [i18n.base_locale]
           ].reject(&:empty?).each_with_object(i18n.empty_forest) do |locales, added|
             forest = i18n.missing_keys(locales: locales, **opt.slice(:types, :base_locale))
                          .set_each_value!(opt[:'nil-value'] ? nil : opt[:value])
+            if opt[:pattern]
+              pattern_re = i18n.compile_key_pattern(opt[:pattern])
+              forest.select_keys! { |full_key, _node| full_key =~ pattern_re }
+            end
             i18n.data.merge! forest
             added.merge! forest
           end.tap do |added|

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

@@ -8,7 +8,7 @@ module I18n::Tasks
         include I18n::Tasks::KeyPatternMatching
 
         cmd :tree_translate,
-            pos:  '[tree (or stdin)]',
+            pos: '[tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_translate'),
             args: [:locale_to_translate_from, arg(:data_format).from(1), :translation_backend]
 
@@ -18,7 +18,7 @@ module I18n::Tasks
         end
 
         cmd :tree_merge,
-            pos:  '[[tree] [tree] ... (or stdin)]',
+            pos: '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_merge'),
             args: %i[data_format nostdin]
 
@@ -27,7 +27,7 @@ module I18n::Tasks
         end
 
         cmd :tree_filter,
-            pos:  '[pattern] [tree (or stdin)]',
+            pos: '[pattern] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_filter'),
             args: %i[data_format pattern]
 
@@ -52,6 +52,7 @@ module I18n::Tasks
             args: %i[data_format all_locales]
         def tree_mv(opt = {})
           fail CommandError, 'requires FROM_KEY_PATTERN and TO_KEY_PATTERN' if opt[:arguments].size < 2
+
           from_pattern = opt[:arguments].shift
           to_pattern = opt[:arguments].shift
           forest = forest_pos_or_stdin!(opt)
@@ -60,7 +61,7 @@ module I18n::Tasks
         end
 
         cmd :tree_subtract,
-            pos:  '[[tree] [tree] ... (or stdin)]',
+            pos: '[[tree] [tree] ... (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_subtract'),
             args: %i[data_format nostdin]
 
@@ -71,7 +72,7 @@ module I18n::Tasks
         end
 
         cmd :tree_set_value,
-            pos:  '[VALUE] [tree (or stdin)]',
+            pos: '[VALUE] [tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_set_value'),
             args: %i[value data_format nostdin pattern]
 
@@ -80,12 +81,13 @@ module I18n::Tasks
           forest      = forest_pos_or_stdin!(opt)
           key_pattern = opt[:pattern]
           fail CommandError, 'pass value (-v, --value)' if value.blank?
+
           forest.set_each_value!(value, key_pattern)
           print_forest forest, opt
         end
 
         cmd :tree_convert,
-            pos:  '[tree (or stdin)]',
+            pos: '[tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_convert'),
             args: [arg(:data_format).dup.tap { |a| a[0..1] = ['-f', '--from FORMAT'] },
                    arg(:out_format).dup.tap { |a| a[0..1] = ['-t', '--to FORMAT'] }]

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

@@ -16,7 +16,7 @@ module I18n::Tasks
             t('i18n_tasks.cmd.args.desc.keep_order')
 
         cmd :find,
-            pos:  '[pattern]',
+            pos: '[pattern]',
             desc: t('i18n_tasks.cmd.desc.find'),
             args: %i[out_format pattern strict]
 
@@ -27,18 +27,18 @@ module I18n::Tasks
         end
 
         cmd :unused,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.unused'),
             args: %i[locales out_format strict]
 
         def unused(opt = {})
           forest = i18n.unused_keys(**opt.slice(:locales, :strict))
           print_forest forest, opt, :unused_keys
-          :exit_1 unless forest.empty?
+          :exit1 unless forest.empty?
         end
 
         cmd :remove_unused,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.remove_unused'),
             args: %i[locales out_format strict keep_order confirm pattern]
 
@@ -66,6 +66,7 @@ module I18n::Tasks
 
         def confirm_remove_unused!(unused_keys, opt)
           return if ENV['CONFIRM'] || opt[:confirm]
+
           locales = Rainbow(unused_keys.flat_map { |root| root.key.split('+') }.sort.uniq * ', ').bright
           msg     = [
             Rainbow(t('i18n_tasks.remove_unused.confirm', count: unused_keys.leaves.count, locales: locales)).red,

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

@@ -10,8 +10,8 @@ module I18n::Tasks
         end
       end
 
-      def t(*args)
-        I18n.t(*args)
+      def t(*args, **kwargs)
+        I18n.t(*args, **kwargs)
       end
 
       module ClassMethods
@@ -42,8 +42,8 @@ module I18n::Tasks
         end
 
         # late-bound I18n.t for module bodies
-        def t(*args, **opts)
-          proc { I18n.t(*args, **opts) }
+        def t(*args, **kwargs)
+          proc { I18n.t(*args, **kwargs) }
         end
 
         # if class is a module, merge DSL definitions when it is included

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

@@ -16,6 +16,7 @@ module I18n::Tasks
 
           def call(value, *)
             return @valid.first unless value.present?
+
             if @valid.include?(value)
               value
             else
@@ -37,6 +38,7 @@ module I18n::Tasks
           def call(values, *)
             values = Array(values)
             return @valid if values == %w[all]
+
             invalid = values - @valid
             if invalid.empty?
               if values.empty?

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

@@ -5,12 +5,13 @@ module I18n::Tasks
     module OptionParsers
       module Locale
         module Validator
-          VALID_LOCALE_RE = /\A\w[\w\-\.]*\z/i
+          VALID_LOCALE_RE = /\A\w[\w\-.]*\z/i.freeze
 
           def validate!(locale)
             if VALID_LOCALE_RE !~ locale
               fail CommandError, I18n.t('i18n_tasks.cmd.errors.invalid_locale', invalid: locale)
             end
+
             locale
           end
         end