i18n-tasks 0.9.35 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac03642fdf45424834ce7e968e70af9d602c5d5721eda666dbd38635adcf542
-  data.tar.gz: 793b43903d97f1dccead925e5128142886708b279f55f04bcd62c6b349bddead
+  metadata.gz: cde1b3151cfb69975e8512b714de8707a8ad79a7dd38ec299a282450297399f9
+  data.tar.gz: f98141b89b24a49b163823af6351476024b1a676d0b89a781c49dc3a10ffc1a7
 SHA512:
-  metadata.gz: 538b6490808142df807dcfa623e6907dd408dc9346e37b2ecbba2257350fa6dcf91b66f8b1f9338cc24fbd7f138ee5c20a7875633c26c9c06ac06dbb87e7e67a
-  data.tar.gz: f7570702d3599d229236ffd3841b33776b3bef50875b12c515b5bc3e63ace2ef2f86fd3058e957959e196c90ace5dc539a5b328a203f0e9f4460b26f3b751778
+  metadata.gz: 364b4d1d23802bfbabab3c41c7c39677f263925459f6be39c1e746e1f07221bfb487b1dbc425e8643ebacaaa20b35c3f08eb5d00fabe7237b35556a30759a67b
+  data.tar.gz: 9c7889833088afd77d439cc3517b99f01100cb507ca329ce30b36193054c5747b98e7fae2b972d006daa6c9973376da02c8c137ff26471fe758409677d7cdc02

data/README.md

@@ -1,4 +1,4 @@
-# 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)
 
 i18n-tasks helps you find and manage missing and unused translations.
 
@@ -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.35'
+gem 'i18n-tasks', '~> 0.9.36'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -435,8 +435,8 @@ Tasks that come with the gem are defined in [lib/i18n/tasks/command/commands](li
 Custom tasks can be added easily, see the examples [on the wiki](https://github.com/glebm/i18n-tasks/wiki#custom-tasks).
 
 [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

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/lib/i18n/tasks/base_task.rb

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

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

@@ -9,7 +9,7 @@ module I18n::Tasks
         include Command::DSL
 
         DATA_FORMATS = %w[yaml json keys].freeze
-        OUT_FORMATS  = ['terminal-table', *DATA_FORMATS, 'inspect'].freeze
+        OUT_FORMATS  = ['terminal-table', *DATA_FORMATS, 'inspect', 'key-values'].freeze
 
         format_arg = proc do |type, values|
           default = values.first
@@ -85,6 +85,8 @@ module I18n::Tasks
             puts forest.inspect
           when 'keys'
             puts forest.key_names(root: true)
+          when 'key-values'
+            puts forest.key_values(root: true).map { |kv| kv.join("\t") }
           when *DATA_FORMATS
             puts i18n.data.adapter_dump forest.to_hash(true), format
           end

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

@@ -2,10 +2,12 @@
 
 module I18n::Tasks::Scanners
   module RubyKeyLiterals
-    LITERAL_RE = /:?".+?"|:?'.+?'|:\w+/.freeze
+    # NOTE
+    # "#{double_quoted["hash_pattern"]}" | "#{double_quoted_pattern}" | 'single_quoted_pattern' | :symbol_pattern
+    LITERAL_RE = /:?"[^\[]+\["[^"]+"\].+"|:?".+?"|:?'.+?'|:\w+/.freeze
 
     # Match literals:
-    # * String: '', "#{}"
+    # * String: '', "#{}", "#{hash["key"]}"
     # * Symbol: :sym, :'', :"#{}"
     def literal_re
       LITERAL_RE
@@ -20,7 +22,7 @@ module I18n::Tasks::Scanners
       literal
     end
 
-    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž])/.freeze
+    VALID_KEY_CHARS = /(?:[[:word:]]|[-.?!:;À-ž\/'"\[\]])/.freeze
     VALID_KEY_RE    = /^#{VALID_KEY_CHARS}+$/.freeze
 
     def valid_key?(key)

data/lib/i18n/tasks/used_keys.rb

@@ -27,7 +27,7 @@ module I18n::Tasks
 
     ALWAYS_EXCLUDE = %w[*.jpg *.jpeg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less
                         *.yml *.json *.zip *.tar.gz *.swf *.flv *.mp3 *.wav *.flac *.webm *.mp4 *.ogg *.opus
-                        *.webp].freeze
+                        *.webp *.map].freeze
 
     # Find all keys in the source and return a forest with the keys in absolute form and their occurrences.
     #

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.35'
+    VERSION = '0.9.36'
   end
 end

data/lib/i18n/tasks.rb

@@ -43,19 +43,18 @@ module I18n
   end
 end
 
+# Per https://github.com/rails/rails/commit/0181f0edd57a2149278bd59c3519233ca1e0a413#commitcomment-60940992
+# 'active_support' must be required first even if we only use parts of it.
+require 'active_support'
+
 require 'active_support/inflector'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/array/access'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
-begin
-  # activesupport >= 3
-  require 'active_support/core_ext/object/try'
-rescue LoadError => _e
-  # activesupport ~> 2.3.2
-  require 'active_support/core_ext/try'
-end
+require 'active_support/core_ext/object/try'
+
 require 'rainbow'
 require 'erubi'
 

data/templates/config/i18n-tasks.yml

@@ -72,7 +72,7 @@ search:
   #  -
 
   ## 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)
+  ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json *.map)
   exclude:
     - app/assets/images
     - app/assets/fonts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.35
+  version: 0.9.36
 platform: ruby
 authors:
 - glebm
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -416,8 +416,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Manage localization and translation with the awesome power of static analysis
 test_files: []