i18n-tasks 0.9.33 → 0.9.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac2026537e1679b2e306eddee2c97ca569d6c498d1a9850e512702626ab9c19
-  data.tar.gz: 49a908c2b2a9144919076a5c3948fa537486739dc9b02968366c7ec0d3ccf62b
+  metadata.gz: 5477cbdf1fb14c575eaad7221cac570147acfcde877fa5960dcdfd958d76d270
+  data.tar.gz: b40dbef296c01aa2c047b8ae2f6ef3567f8643b35895516a8fde281f225e6daa
 SHA512:
-  metadata.gz: 639a786f1b1dfa5ee217e658975ac8b01b0966a4afdea49b69fdb4d1d4ff8cf9e48aab98eae0c6475a5c71fa4e8caccee88f1239205317550a03505a015fc932
-  data.tar.gz: d5a7ed2e9e1f4d2bf0474eb821e00713eff0fe486ef3cc92da12bc6e227bfecc987c5d2e70538e2c4436aba8958a763c8640d46c68d5ff2fdbf18e364d3d6cbc
+  metadata.gz: f732fc9479ba13cd3acb1c7222401f873ace5a8db1ef248712c1ea4dbdb9d05a7fdc5da5bb3600c7c799c64b7f21b1586518b1feec508a0ad36d211110b07b3e
+  data.tar.gz: f05241d9bd75bbecb1cb992882d84c4e9826c00c66b66263e7203603e19c9a188e96ea7f4e4131160e23216265df675f4519d190263cf14de59384bd2e62c88d

data/README.md

@@ -22,7 +22,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', '~> 0.9.34'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -385,7 +385,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.
 

data/i18n-tasks.gemspec

@@ -16,16 +16,16 @@ 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
+  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.required_ruby_version = '>= 2.5', '< 4.0' if s.respond_to?(:required_ruby_version=)
 
   s.files = `git ls-files`.split($/)
   s.files -= s.files.grep(%r{^(doc/|\.|spec/)}) + %w[CHANGES.md config/i18n-tasks.yml Gemfile]
@@ -46,7 +46,7 @@ TEXT
   s.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
   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.6.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'
 

data/lib/i18n/tasks/cli.rb

@@ -15,21 +15,19 @@ 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
@@ -195,7 +193,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/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,7 +7,7 @@ module I18n::Tasks
         include Command::Collection
 
         cmd :health,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.health'),
             args: %i[locales out_format]
 
@@ -15,13 +15,14 @@ module I18n::Tasks
           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,18 +23,18 @@ module I18n::Tasks
             )
 
         cmd :missing,
-            pos:  '[locale ...]',
+            pos: '[locale ...]',
             desc: t('i18n_tasks.cmd.desc.missing'),
             args: %i[locales out_format missing_types]
 
         def missing(opt = {})
           forest = i18n.missing_keys(**opt.slice(:locales, :base_locale, :types))
           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]
 
@@ -47,13 +47,14 @@ 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}' }],
                    ['--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|

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

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

@@ -64,6 +64,7 @@ module I18n::Tasks
         # @return [I18n::Tasks::Data::Tree::Siblings]
         def parse_forest(src, format)
           fail CommandError, I18n.t('i18n_tasks.cmd.errors.pass_forest') unless src
+
           if format == 'keys'
             ::I18n::Tasks::Data::Tree::Siblings.from_key_names parse_keys(src)
           else

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

@@ -13,22 +13,22 @@ module I18n::Tasks
             '--locales en,es,ru',
             Array,
             t('i18n_tasks.cmd.args.desc.locales_filter'),
-            parser:             OptionParsers::Locale::ListParser,
-            default:            'all',
+            parser: OptionParsers::Locale::ListParser,
+            default: 'all',
             consume_positional: true
 
         arg :locale,
             '-l',
             '--locale en',
             t('i18n_tasks.cmd.args.desc.locale'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: 'base'
 
         arg :locale_to_translate_from,
             '-f',
             '--from en',
             t('i18n_tasks.cmd.args.desc.locale_to_translate_from'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: 'base'
 
         TRANSLATION_BACKENDS = %w[google deepl].freeze
@@ -36,7 +36,7 @@ module I18n::Tasks
             '-b',
             '--backend BACKEND',
             t('i18n_tasks.cmd.args.desc.translation_backend'),
-            parser:  OptionParsers::Locale::Parser,
+            parser: OptionParsers::Locale::Parser,
             default: TRANSLATION_BACKENDS[0]
       end
     end