i18n-tasks 0.9.29 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 955b0b27ee0885fa2860b00848054c1367098e38905fce60ece6f67f35051f78
-  data.tar.gz: f2e2cd7f950bad6420f831e598a2004f280cf214caf8eab4f046963df47a1ab0
+  metadata.gz: c748cb31dcf9a41f13b85f43f0dcad3be53f39ddcff325d41c587c1b32b7812b
+  data.tar.gz: bb8f185177f4c0bdd936c45e71827088d12f45a43718d4a3cf1b533ac937343f
 SHA512:
-  metadata.gz: 71b276f4b5f20d6c111d1a3078d793d61a22bb4695362c1efbda80c4cb92f93fc59a221e6d5ee6fe48d1601b9eebbf74bc94e66bc8f84dd0549dc92af37ac16e
-  data.tar.gz: 5a17f8014105c81d9dfe858c5d7f64735e00617455d339cccfbd9fe3a28eca71c2fb527c9117794563be89252260d365b9e4bb09a1f1dde591b00cefca60d849
+  metadata.gz: 94d977df364cc0494ea55b19d45a3754503211433a983b4963f17b0617182752d15651b3c636808399d00fadfbbc4bff3aa2098ef398a50e814fdfd9d30488ff
+  data.tar.gz: e000d084559176d27f3c1ea6938715e076f6b233d767f3c2ed328ecfe07d2c0deb11feefff4ec10cbc2aad51e807fa4ff883aedd694b41dfd3dbd8aabfc2fe2a

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.29'
+gem 'i18n-tasks', '~> 0.9.30'
 ```
 
 Copy the default [configuration file](#configuration):

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

@@ -22,7 +22,7 @@ module I18n::Tasks
         if opts.empty? || method(name).arity.zero?
           send name
         else
-          send name, opts
+          send name, **opts
         end
       end
 

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

@@ -17,10 +17,10 @@ module I18n::Tasks
           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)
+            missing(**opt),
+            unused(**opt),
+            check_consistent_interpolations(**opt),
+            check_normalized(**opt)
           ].detect { |result| result == :exit_1 }
         end
       end

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

@@ -12,7 +12,7 @@ module I18n::Tasks
             args: %i[locales out_format]
 
         def check_consistent_interpolations(opt = {})
-          forest = i18n.inconsistent_interpolations(opt.slice(:locales, :base_locale))
+          forest = i18n.inconsistent_interpolations(**opt.slice(:locales, :base_locale))
           print_forest forest, opt, :inconsistent_interpolations
           :exit_1 unless forest.empty?
         end

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

@@ -28,7 +28,7 @@ module I18n::Tasks
             args: %i[locales out_format missing_types]
 
         def missing(opt = {})
-          forest = i18n.missing_keys(opt.slice(:locales, :base_locale, :types))
+          forest = i18n.missing_keys(**opt.slice(:locales, :base_locale, :types))
           print_forest forest, opt, :missing_keys
           :exit_1 unless forest.empty?
         end

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

@@ -32,7 +32,7 @@ module I18n::Tasks
             args: %i[locales out_format strict]
 
         def unused(opt = {})
-          forest = i18n.unused_keys(opt.slice(:locales, :strict))
+          forest = i18n.unused_keys(**opt.slice(:locales, :strict))
           print_forest forest, opt, :unused_keys
           :exit_1 unless forest.empty?
         end
@@ -43,7 +43,7 @@ module I18n::Tasks
             args: %i[locales out_format strict keep_order confirm pattern]
 
         def remove_unused(opt = {}) # rubocop:disable Metrics/AbcSize
-          unused_keys = i18n.unused_keys(opt.slice(:locales, :strict))
+          unused_keys = i18n.unused_keys(**opt.slice(:locales, :strict))
 
           if opt[:pattern]
             pattern_re = i18n.compile_key_pattern(opt[:pattern])

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

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks/data/tree/traversal'
 require 'i18n/tasks/data/tree/siblings'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   class Node # rubocop:disable Metrics/ClassLength
     include Enumerable
@@ -28,7 +27,7 @@ module I18n::Tasks::Data::Tree
     end
 
     def derive(new_attr = {})
-      self.class.new(attributes.merge(new_attr))
+      self.class.new(**attributes.merge(new_attr))
     end
 
     def children=(children)
@@ -164,7 +163,7 @@ module I18n::Tasks::Data::Tree
 
     def inspect(level = 0)
       label = if key.nil?
-                I18n::Tasks::RainbowUtils.faint_color('∅')
+                Rainbow('∅').faint
               else
                 [Rainbow(key).color(1 + level % 15),
                  (": #{format_value_for_inspect(value)}" if leaf?),

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n/tasks/data/tree/traversal'
-require 'i18n/tasks/rainbow_utils'
 module I18n::Tasks::Data::Tree
   # A list of nodes
   class Nodes
@@ -48,7 +47,7 @@ module I18n::Tasks::Data::Tree
       if present?
         map(&:inspect) * "\n"
       else
-        I18n::Tasks::RainbowUtils.faint_color('{∅}')
+        Rainbow('{∅}').faint
       end
     end
 

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

@@ -273,7 +273,7 @@ module I18n::Tasks::Data::Tree
         build_forest(opts) do |forest|
           key_attrs.each do |(full_key, attr)|
             fail "Invalid key #{full_key.inspect}" if full_key.end_with?('.')
-            node = ::I18n::Tasks::Data::Tree::Node.new(attr.merge(key: split_key(full_key).last))
+            node = ::I18n::Tasks::Data::Tree::Node.new(**attr.merge(key: split_key(full_key).last))
             yield(full_key, node) if block
             forest[full_key] = node
           end

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

@@ -60,14 +60,12 @@ module I18n::Tasks
         self
       end
 
-      def key_names(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, _node| key }
+      def key_names(root: false)
+        keys(root: root).map { |key, _node| key }
       end
 
-      def key_values(opts = {})
-        opts[:root] = false unless opts.key?(:root)
-        keys(opts).map { |key, node| [key, node.value] }
+      def key_values(root: false)
+        keys(root: root).map { |key, node| [key, node.value] }
       end
 
       def root_key_values(sort = false)
@@ -146,12 +144,12 @@ module I18n::Tasks
       # @return [Siblings]
       def intersect_keys(other_tree, key_opts = {}, &block)
         if block
-          select_keys(key_opts) do |key, node|
+          select_keys(**key_opts.slice(:root)) do |key, node|
             other_node = other_tree[key]
             other_node && yield(key, node, other_node)
           end
         else
-          select_keys(key_opts) { |key, _node| other_tree[key] }
+          select_keys(**key_opts.slice(:root)) { |key, _node| other_tree[key] }
         end
       end
 

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n/tasks/reports/base'
-require 'i18n/tasks/rainbow_utils'
 require 'terminal-table'
 module I18n
   module Tasks
@@ -76,11 +75,11 @@ module I18n
 
         def forest_stats(forest, stats = task.forest_stats(forest))
           text  = if stats[:locale_count] == 1
-                    I18n.t('i18n_tasks.data_stats.text_single_locale', stats)
+                    I18n.t('i18n_tasks.data_stats.text_single_locale', **stats)
                   else
-                    I18n.t('i18n_tasks.data_stats.text', stats)
+                    I18n.t('i18n_tasks.data_stats.text', **stats)
                   end
-          title = Rainbow(I18n.t('i18n_tasks.data_stats.title', stats.slice(:locales))).bright
+          title = Rainbow(I18n.t('i18n_tasks.data_stats.title', **stats.slice(:locales))).bright
           print_info "#{Rainbow(title).cyan} #{Rainbow(text).cyan}"
         end
 
@@ -170,7 +169,7 @@ module I18n
         end
 
         def print_title(title)
-          log_stderr "#{Rainbow(title.strip).bright} #{I18n::Tasks::RainbowUtils.faint_color('|')} " \
+          log_stderr "#{Rainbow(title.strip).bright} #{Rainbow('|').faint} " \
                      "#{"i18n-tasks v#{I18n::Tasks::VERSION}"}"
         end
 

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

@@ -12,7 +12,7 @@ module I18n::Tasks::Scanners
     include OccurrenceFromPosition
     include RubyKeyLiterals
 
-    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:ranslate)?/
+    TRANSLATE_CALL_RE = /(?<=^|[^\w'\-.]|[^\w'\-]I18n\.|I18n\.)t(?:!|ranslate!?)?/
     IGNORE_LINES = {
       'coffee' => /^\s*#(?!\si18n-tasks-use)/,
       'erb' => /^\s*<%\s*#(?!\si18n-tasks-use)/,

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

@@ -15,10 +15,10 @@ module I18n::Tasks::Scanners
     include AST::Sexp
 
     MAGIC_COMMENT_PREFIX = /\A.\s*i18n-tasks-use\s+/
-    RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t translate])
+    RECEIVER_MESSAGES = [nil, AST::Node.new(:const, [nil, :I18n])].product(%i[t t! translate translate!])
 
     def initialize(**args)
-      super(args)
+      super(**args)
       @parser = ::Parser::CurrentRuby.new
       @magic_comment_parser = ::Parser::CurrentRuby.new
       @call_finder = RubyAstCallFinder.new(

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.29'
+    VERSION = '0.9.30'
   end
 end

data/templates/rspec/i18n_spec.rb

@@ -2,10 +2,11 @@
 
 require 'i18n/tasks'
 
-RSpec.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 }
+  let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }
 
   it 'does not have missing keys' do
     expect(missing_keys).to be_empty,
@@ -21,7 +22,13 @@ RSpec.describe 'I18n' do
     non_normalized = i18n.non_normalized_paths
     error_message = "The following files need to be normalized:\n" \
                     "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
-                    'Please run `i18n-tasks normalize` to fix'
+                    "Please run `i18n-tasks normalize' to fix"
     expect(non_normalized).to be_empty, error_message
   end
+
+  it 'does not have inconsistent interpolations' do
+    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
+                    "Run `i18n-tasks check-consistent-interpolations' to show them"
+    expect(inconsistent_interpolations).to be_empty, error_message
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.29
+  version: 0.9.30
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -340,7 +340,6 @@ files:
 - lib/i18n/tasks/logging.rb
 - lib/i18n/tasks/missing_keys.rb
 - lib/i18n/tasks/plural_keys.rb
-- lib/i18n/tasks/rainbow_utils.rb
 - lib/i18n/tasks/references.rb
 - lib/i18n/tasks/reports/base.rb
 - lib/i18n/tasks/reports/terminal.rb
@@ -399,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis

data/lib/i18n/tasks/rainbow_utils.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module I18n
-  module Tasks
-    module RainbowUtils
-      # TODO: This method can be removed after below PR is released.
-      # https://github.com/sickill/rainbow/pull/53
-      def self.faint_color(str)
-        presenter = Rainbow(str)
-        return presenter unless Rainbow.enabled
-        Rainbow::Presenter.new(Rainbow::StringUtils.wrap_with_sgr(presenter, [2]))
-      end
-    end
-  end
-end