i18n-tasks 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8450eafca8f0cbffefa8b34ff0a3418b96798310
-  data.tar.gz: f68636e26f49cc27d285ee7d23c0eb94f407ea22
+  metadata.gz: 9a4e945701c214bce20eae1f33712a492c7fc5a4
+  data.tar.gz: 6d0c3c00118605d0fa155c892303a5bd0aa9992b
 SHA512:
-  metadata.gz: 419092e4764354330ed956e7d400d250316be9cb3bba46a023affc67b9e1e01fe4dd266ffabb390e5506e31a7b35bd0225e659b551eab79848997566f640dbdb
-  data.tar.gz: ef5ff0ee61e3bf68f282eea0afd4b21a3605d82dc58f8a423f824694b5d547d2dc3718b1dadf5e19f1e12d9a5baa6b1cdb86f360ea8b085abc7e9e3ff1e63640
+  metadata.gz: 4b08ab8e84bb4854b609fb3de6029d72941663cca91afa35d08c321df38602a25b3605b6418641d72b06c08af812d951cf0ed6661ca55f645b26c12f92172869
+  data.tar.gz: c800186476d035a8a256afb7981123e879e46d744719e62f7bfe9ec61465c872193426f8222a24b4615e8e1dc92d82106201882c7e1b7c73280213a100b626ff

data/CHANGES.md

@@ -1,3 +1,7 @@
+## v0.3.2
+
+* Tasks that accept locales now accept them as the first argument(s)
+
 ## v0.3.0
 
 * i18n-tasks is a binary now (instead of rake tasks). All tasks / commands now accept various options, and there is no need for as many of them as before.

data/README.md

@@ -57,8 +57,8 @@ Add missing values, generated from the key (for base locale) or copied from the
 To add missing values to the base locale only:
 
 ```bash
-# locales argument always accepts `base` and `all` as special values
-i18n-tasks add-missing -l base
+# most task accept locales as first argument. `base` and `all` are special
+i18n-tasks add-missing base
 ```
 
 Translate missing values with Google Translate ([more below on the API key](#translation-config)).
@@ -66,7 +66,7 @@ Translate missing values with Google Translate ([more below on the API key](#tra
 ```bash
 i18n-tasks translate-missing
 # accepts from and locales options:
-i18n-tasks translate-missing -f base -l es,fr
+i18n-tasks translate-missing --from base es fr
 ```
 
 Sort the keys and write them to their respective files with `normalize`.

data/bin/i18n-tasks

@@ -28,7 +28,9 @@ if command
     cmd.send meth
   else
     opt = command[1].to_hash.merge(arguments: command[2])
-    STDERR.puts Term::ANSIColor.green "i18n-tasks: #{meth.tr('_', '-')} #{opt.reject { |k, v| v.blank? }.map { |k, v| "#{k}=#{v}" } * ' '}"
+    if ENV['VERBOSE']
+      STDERR.puts Term::ANSIColor.green "i18n-tasks: #{meth.tr('_', '-')} #{opt.reject { |k, v| v.blank? }.map { |k, v| "#{k}=#{v}" } * ' '}"
+    end
     cmd.send meth, opt
   end
 else

data/i18n-tasks.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   end
   s.license       = 'MIT'
 
-  s.files         = `git ls-files`.split($/) - %w(doc/img/i18n-tasks.gif doc/img/i18n-usages.png)
+  s.files         = `git ls-files`.split($/)
+  s.files         -= s.files.grep(%r{^doc/img/})
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']

data/lib/i18n/tasks/commands.rb

@@ -13,7 +13,7 @@ module I18n::Tasks
       on '-t', :types, 'Filter by type (types: missing_from_base, eq_base, missing_from_locale)', as: Array, delimiter: /[+:,]/, argument: true, optional: false
     end
     cmd :missing do |opt = {}|
-      opt[:locales] = locales_opt(opt[:locales])
+      opt[:locales] = locales_opt(opt[:arguments] || opt[:locales])
       terminal_report.missing_keys i18n_task.missing_keys(opt)
     end
 
@@ -29,17 +29,17 @@ module I18n::Tasks
     end
     cmd :translate_missing do |opt = {}|
       opt[:from] = base_locale if opt[:from].blank? || opt[:from] == 'base'
-      opt[:locales] = locales_opt(opt[:locale] || opt[:locales])
+      opt[:locales] = locales_opt(opt[:arguments] || opt[:locales])
       i18n_task.fill_missing_google_translate opt
     end
 
     desc 'add missing keys to the locales'
     opts do
-      on '-p', :placeholder, 'Value for empty keys (default: base value or key.humanize)', argument: true, optional: false
       on '-l', :locales, 'Only for specified locales', as: Array, delimiter: /[+:,]/, default: 'all', argument: true, optional: false
+      on '-p', :placeholder, 'Value for empty keys (default: base value or key.humanize)', argument: true, optional: false
     end
     cmd :add_missing do |opt = {}|
-      opt[:locales] = locales_opt(opt[:locale] || opt[:locales])
+      opt[:locales] = locales_opt(opt[:arguments] || opt[:locales])
       opt[:value] ||= opt.delete(:placeholder)
       opt[:value] ||= proc { |key, locale|
         # default to base value or key.humanize
@@ -66,7 +66,7 @@ module I18n::Tasks
       on '-l', :locales=, 'Only for specified locales', as: Array, delimiter: /[+:,]/, default: 'all', argument: true, optional: false
     end
     cmd :normalize do |opt = {}|
-      i18n_task.normalize_store! locales_opt(opt[:locales])
+      i18n_task.normalize_store! locales_opt(opt[:arguments] || opt[:locales])
     end
 
     desc 'remove unused keys'
@@ -74,7 +74,7 @@ module I18n::Tasks
       on '-l', :locales=, 'Only for specified locales', as: Array, delimiter: /[+:,]/, default: 'all', argument: true, optional: false
     end
     cmd :remove_unused do |opt = {}|
-      locales = locales_opt opt[:locales]
+      locales = locales_opt(opt[:arguments] || opt[:locales])
       unused_keys = i18n_task.unused_keys
       if unused_keys.present?
         terminal_report.unused_keys(unused_keys)

data/lib/i18n/tasks/commands_base.rb

@@ -1,16 +1,14 @@
 require 'ostruct'
 module I18n::Tasks
   class CommandsBase
-    def locales_opt(value, default = nil)
-      if value.is_a?(String)
-        value = value.strip.split(/\s*\+\s*/).compact.presence
-      end
-      return i18n_task.locales if value == ['all']
-      if value.present?
-        value = value.map { |v| v == 'base' ? base_locale : v }
-        value
+    def locales_opt(locales)
+      return i18n_task.locales if locales == ['all'] || locales == 'all'
+      if locales.present?
+        locales = Array(locales).map { |v| v.strip.split(/\s*[\+,:]\s*/).compact.presence if v.is_a?(String) }.flatten
+        locales = locales.map(&:presence).compact.map { |v| v == 'base' ? base_locale : v }
+        locales
       else
-        default || i18n_task.locales
+        i18n_task.locales
       end
     end
 

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - glebm
@@ -198,7 +198,6 @@ files:
 - README.md
 - Rakefile
 - bin/i18n-tasks
-- doc/img/i18n-tasks.png
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb