i18n-tasks 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e30b4e85fe299dbf8f89391c84f5dea2d242b2
-  data.tar.gz: 9f6d31de1c84187fbad5e929c36416857f66f6e5
+  metadata.gz: 264a1871764cc205f99b56f5c303f6b174d16ee8
+  data.tar.gz: c7431a8401c9cc313c67ea03b276b627e9c950f3
 SHA512:
-  metadata.gz: a3602fac64546ce66b2b500c3f2e010f01458e1cbd0ff708cbd5e329cca144574a47003ccb8533441e033de579147fbd00c6cb84f90c509720228d2a5e407f53
-  data.tar.gz: b32c4925376a24e28cf1882d1e10168374e1c8770e3e7b43028c9820a11a2b2e59515b2b260fe4fdd03462789b0710528c779c7316155df214e11bfe75d1c8ee
+  metadata.gz: 3d5db9a5e118f6c410aa43b263835b160c101f615fe56d9fedc269b0269f5458d7398d034fdc895cd6f38e1f26eb04ecea998b1fa6317d01c745348040458a83
+  data.tar.gz: 654a287a7ffd39c309c75e9ec0456ad28f2ebac32ecf112a7e3adbcd757367a7afe092b6ebb7497f03a013471718807b1b69cb2aa7157b06f261b3a0eaab8bc6

data/README.md

@@ -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.8'
+gem 'i18n-tasks', '~> 0.9.9'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -369,13 +369,13 @@ Custom tasks can be added easily, see the examples [on the wiki](https://github.
 
 [MIT license]: /LICENSE.txt
 [travis]: https://travis-ci.org/glebm/i18n-tasks
-[badge-travis]: http://img.shields.io/travis/glebm/i18n-tasks.svg
+[badge-travis]: https://img.shields.io/travis/glebm/i18n-tasks.svg
 [coverage]: https://codeclimate.com/github/glebm/i18n-tasks
 [badge-coverage]: https://img.shields.io/codeclimate/coverage/github/glebm/i18n-tasks.svg
 [gemnasium]: https://gemnasium.com/glebm/i18n-tasks
 [badge-gemnasium]: https://gemnasium.com/glebm/i18n-tasks.svg
 [code-climate]: https://codeclimate.com/github/glebm/i18n-tasks
-[badge-code-climate]: http://img.shields.io/codeclimate/github/glebm/i18n-tasks.svg
+[badge-code-climate]: https://img.shields.io/codeclimate/github/glebm/i18n-tasks.svg
 [config]: https://github.com/glebm/i18n-tasks/blob/master/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"

data/lib/i18n/tasks/cli.rb

@@ -13,23 +13,21 @@ class I18n::Tasks::CLI
   def initialize; end
 
   def start(argv)
-    I18n.with_locale(base_task.internal_locale) do
-      auto_output_coloring do
+    auto_output_coloring do
+      begin
+        exit 1 if run(argv) == :exit_1
+      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
     end
   rescue ExecutionError => e
@@ -37,8 +35,10 @@ class I18n::Tasks::CLI
   end
 
   def run(argv)
-    name, *options = parse!(argv.dup)
-    context.run(name, *options)
+    I18n.with_locale(base_task.internal_locale) do
+      name, *options = parse!(argv.dup)
+      context.run(name, *options)
+    end
   end
 
   def context

data/lib/i18n/tasks/data/file_system_base.rb

@@ -88,7 +88,7 @@ module I18n::Tasks
         @available_locales ||= begin
           locales = Set.new
           Array(config[:read]).map do |pattern|
-            [pattern, Dir.glob(pattern % { locale: '*' })] if pattern.include?('%{locale}')
+            [pattern, Dir.glob(format(pattern, locale: '*'))] if pattern.include?('%{locale}')
           end.compact.each do |pattern, paths|
             p  = pattern.gsub('\\', '\\\\').gsub('/', '\/').gsub('.', '\.')
             p  = p.gsub(/(\*+)/) { Regexp.last_match(1) == '**' ? '.*' : '[^/]*?' }.gsub('%{locale}', '([^/.]+)')
@@ -138,7 +138,7 @@ module I18n::Tasks
 
       def read_locale(locale)
         Array(config[:read]).map do |path|
-          Dir.glob path % { locale: locale }
+          Dir.glob format(path, locale: locale)
         end.reduce(:+).map do |path|
           [path.freeze, load_file(path) || {}]
         end.map do |path, data|

data/lib/i18n/tasks/data/router/pattern_router.rb

@@ -32,7 +32,7 @@ module I18n::Tasks
           pattern, path = routes.detect { |route| route[0] =~ key }
           if pattern
             key_match = $~
-            path      = path % { locale: locale }
+            path      = format(path, locale: locale)
             path.gsub!(/\\\d+/) { |m| key_match[m[1..-1].to_i] }
             (out[path] ||= Set.new) << "#{locale}.#{key}"
           else

data/lib/i18n/tasks/logging.rb

@@ -2,6 +2,9 @@
 module I18n::Tasks::Logging
   module_function
 
+  MUTEX = Mutex.new
+  PROGRAM_NAME = File.basename($PROGRAM_NAME)
+
   def warn_deprecated(message)
     log_stderr Term::ANSIColor.yellow Term::ANSIColor.bold "#{program_name}: [DEPRECATED] #{message}"
   end
@@ -21,10 +24,15 @@ module I18n::Tasks::Logging
   end
 
   def log_stderr(*args)
-    $stderr.puts(*args)
+    MUTEX.synchronize do
+      # 1. We don't want output from different threads to get intermixed.
+      # 2. StringIO is currently not thread-safe (blows up) on JRuby:
+      # https://github.com/jruby/jruby/issues/4417
+      $stderr.puts(*args)
+    end
   end
 
   def program_name
-    @program_name ||= File.basename($PROGRAM_NAME)
+    PROGRAM_NAME
   end
 end

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

@@ -39,7 +39,7 @@ module I18n::Tasks::Scanners
             matches[:key] = strip_literal(matches[:key])
             next unless valid_key?(matches[:key])
           end
-          result << [absolute_key(key % matches, path),
+          result << [absolute_key(format(key, matches), path),
                      occurrence_from_position(path, text, match.offset(0).first)]
         end
         result
@@ -52,7 +52,7 @@ module I18n::Tasks::Scanners
 
     def configure_patterns(patterns)
       patterns.map do |(pattern, key)|
-        [pattern.is_a?(Regexp) ? pattern : Regexp.new(pattern % { key: KEY_GROUP }), key]
+        [pattern.is_a?(Regexp) ? pattern : Regexp.new(format(pattern, key: KEY_GROUP)), key]
       end
     end
   end

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

@@ -23,18 +23,14 @@ module I18n::Tasks::Scanners
       key   = super
       scope = match[1]
       if scope
-        scope_ns = scope.gsub(/[\[\]\s]+/, '').split(',').map { |arg| strip_literal(arg) } * '.'
-        "#{scope_ns}.#{key}"
+        scope_parts = extract_literal_or_array_of_literals(scope)
+        return nil if scope_parts.nil? || scope_parts.empty?
+        "#{scope_parts.join('.')}.#{key}"
       else
         key unless match[0] =~ /\A\w/
       end
     end
 
-    # also parse expressions with literals
-    def literal_re
-      /(?: (?: #{super} ) | #{expr_re} )/x
-    end
-
     # strip literals, convert expressions to #{interpolations}
     def strip_literal(val)
       if val =~ /\A\w/
@@ -49,7 +45,7 @@ module I18n::Tasks::Scanners
       /(?:
          :scope\s*=>\s* | (?# :scope => :home )
          scope:\s*        (?#    scope: :home )
-        ) (#{array_or_one_literal_re})/x
+        ) ([^\n]*)/x
     end
 
     # match code expression
@@ -59,10 +55,40 @@ module I18n::Tasks::Scanners
       /[\w():"'.\s]+/x
     end
 
-    # match +el+ or array of +el+
-    def array_or_one_literal_re(el = literal_re)
-      /#{el} |
-       \[\s* (?:#{el}\s*,\s*)* #{el} \s*\]/x
+    # extract literal or array of literals
+    # returns nil on any other input
+    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+    def extract_literal_or_array_of_literals(s)
+      literals = []
+      braces_stack = []
+      acc = []
+      consume_literal = proc do
+        acc_str = acc.join
+        if acc_str =~ literal_re
+          literals << strip_literal(acc_str)
+          acc = []
+        else
+          return nil
+        end
+      end
+      s.each_char.with_index do |c, i|
+        if c == '['
+          return nil unless braces_stack.empty?
+          braces_stack.push(i)
+        elsif c == ']'
+          break
+        elsif c == ','
+          consume_literal.call
+          break if braces_stack.empty?
+        elsif c =~ VALID_KEY_CHARS || /['":]/ =~ c
+          acc << c
+        elsif c != ' '
+          return nil
+        end
+      end
+      consume_literal.call unless acc.empty?
+      literals
     end
+    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
   end
 end

data/lib/i18n/tasks/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module I18n
   module Tasks
-    VERSION = '0.9.8'
+    VERSION = '0.9.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport