i18n-tasks 0.9.23 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b90d77c0efd6c17b2b659fd19de47f5e6f2a8352f5d0eede4fa0525d481f2ac
-  data.tar.gz: 15f983188ee4dc5124823f318d947842d89f3df78890452d62092abdb0ea4836
+  metadata.gz: e43145655fa3f1bfe8346745641fbab0cbcdc6d4fce7644360f47dc22c2d1c57
+  data.tar.gz: 3ec016b5aca6502d4a8cc73e9f1850e6d87a6469e631d27a2b9710538b696e34
 SHA512:
-  metadata.gz: c5c4c4f9210a7e25dec136bac40fda0575afff686aeb58614f2b2f4bafdd8b9e2f18bd4bf4b9b99b94409a6a34340ee0be009d6fad85361b691e8f6ff5d1266a
-  data.tar.gz: bb6d10a390f885e884861caf5c669c29239566e613554a17fd263cd8e89d3bdeb64fc554e7cd61d6ced403568a736dfa15bce159206cd65e0af84d19a5078fc2
+  metadata.gz: dc3f0df2e53aef54e7fa0d1953c3d448a4ccc57c8a04f60b1494ea3500b8b98d7473548683c62f5c36795a3bd20eab16ee4d2a898f2de6ca21b6cfd64d7dd67f
+  data.tar.gz: d744f48d0b9572e93906cddce55004eadd8a8aa867f6ca436540bedb989274077a641d83c28b5a034adb1a7106d70a2cbac069301d2febcd32eb25e44c674ab8

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.23'
+gem 'i18n-tasks', '~> 0.9.24'
 ```
 
 Copy the default [configuration file](#configuration):
@@ -87,8 +87,9 @@ Translate missing values with Google Translate ([more below on the API key](#goo
 
 ```console
 $ i18n-tasks translate-missing
+
 # accepts from and locales options:
-$ i18n-tasks translate-missing --from base es fr
+$ i18n-tasks translate-missing --from=base es fr
 ```
 
 ### DeepL Pro Translate missing keys
@@ -96,9 +97,10 @@ $ i18n-tasks translate-missing --from base es fr
 Translate missing values with DeepL Pro Translate ([more below on the API key](#deepl-translation-config)).
 
 ```console
-$ i18n-tasks translate-missing
+$ i18n-tasks translate-missing --backend=deepl
+
 # accepts from and locales options:
-$ i18n-tasks translate-missing --backend deepl --from en
+$ i18n-tasks translate-missing --backend=deepl --from=en fr nl
 ```
 
 ### Find usages
@@ -385,7 +387,7 @@ translation:
 
 `i18n-tasks irb` starts an IRB session in i18n-tasks context. Type `guide` for more information.
 
-### Import / export to a CSV spreadsheet
+## Import / export to a CSV spreadsheet
 
 See [i18n-tasks wiki: CSV import and export tasks](https://github.com/glebm/i18n-tasks/wiki/Custom-CSV-import-and-export-tasks).
 

data/config/locales/en.yml

@@ -53,12 +53,10 @@ en:
         tree_filter: filter tree by key pattern
         tree_merge: merge trees
         tree_mv_key: rename/merge/remove the keys matching the given pattern
-        tree_rename_key: rename tree node
         tree_set_value: set values of keys, optionally match a pattern
         tree_subtract: tree A minus the keys in tree B
         tree_translate: Google Translate a tree to root locales
         unused: show unused translations
-        xlsx_report: save missing and unused translations to an Excel file
       encourage:
       - Good job!
       - Well done!
@@ -75,12 +73,10 @@ en:
           other: 'unknown types: %{invalid}. valid: %{valid}.'
         pass_forest: pass locale forest
     common:
-      base_value: Base Value
       continue_q: Continue?
       key: Key
       locale: Locale
       n_more: "%{count} more"
-      type: Type
       value: Value
     data_stats:
       text: >-

data/config/locales/ru.yml

@@ -50,12 +50,10 @@ ru:
         tree_filter: фильтровать дерево по ключу
         tree_merge: объединенить деревья
         tree_mv_key: переименованить / объединить / удалить ключи соответствующие заданному шаблону
-        tree_rename_key: переименовать узел дерева
         tree_set_value: заменить значения ключей
         tree_subtract: дерево A минус ключи в дереве B
         tree_translate: Перевести дерево при помощи Google Translate на язык корневых узлов
         unused: показать неиспользуемые переводы
-        xlsx_report: сохранить недостающие и неиспользуемые переводы в Excel-файл
       encourage:
       - Хорошая работа!
       - Отлично!
@@ -72,12 +70,10 @@ ru:
           other: 'Неизвестные типы: %{invalid}. Типы: %{valid}.'
         pass_forest: Передайте дерево
     common:
-      base_value: Исходное значение
       continue_q: Продолжить?
       key: Ключ
       locale: Язык
       n_more: ещё %{count}
-      type: Тип
       value: Значение
     data_stats:
       text: >-

data/i18n-tasks.gemspec

@@ -37,16 +37,16 @@ TEXT
 
   s.add_dependency 'activesupport', '>= 4.0.2'
   s.add_dependency 'ast', '>= 2.1.0'
-  s.add_dependency 'deepl-rb', '>= 2.1.0'
-  s.add_dependency 'easy_translate', '>= 0.5.1'
   s.add_dependency 'erubi'
-  s.add_dependency 'highline', '>= 1.7.3'
+  s.add_dependency 'highline', '>= 2.0.0'
   s.add_dependency 'i18n'
   s.add_dependency 'parser', '>= 2.2.3.0'
   s.add_dependency 'rainbow', '>= 2.2.2', '< 4.0'
   s.add_dependency 'terminal-table', '>= 1.5.1'
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'deepl-rb', '>= 2.1.0'
+  s.add_development_dependency 'easy_translate', '>= 0.5.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'rubocop', '~> 0.53.0'

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

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks/cli'
 require 'i18n/tasks/reports/terminal'
-require 'i18n/tasks/reports/spreadsheet'
 
 module I18n::Tasks
   module Command
@@ -33,10 +32,6 @@ module I18n::Tasks
         @terminal_report ||= I18n::Tasks::Reports::Terminal.new(i18n)
       end
 
-      def spreadsheet_report
-        @spreadsheet_report ||= I18n::Tasks::Reports::Spreadsheet.new(i18n)
-      end
-
       delegate :base_locale, :locales, :t, to: :i18n
     end
   end

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

@@ -40,12 +40,7 @@ module I18n::Tasks
 
         def translate_missing(opt = {})
           missing    = i18n.missing_diff_forest opt[:locales], opt[:from]
-          translated = case opt[:backend]
-                       when 'deepl'
-                         i18n.deepl_translate_forest missing, opt[:from]
-                       when 'google'
-                         i18n.google_translate_forest missing, opt[:from]
-                       end
+          translated = i18n.translate_forest missing, from: opt[:from], backend: opt[:backend].to_sym
           i18n.data.merge! translated
           log_stderr t('i18n_tasks.translate_missing.translated', count: translated.leaves.count)
           print_forest translated, opt

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

@@ -10,11 +10,11 @@ module I18n::Tasks
         cmd :tree_translate,
             pos:  '[tree (or stdin)]',
             desc: t('i18n_tasks.cmd.desc.tree_translate'),
-            args: [:locale_to_translate_from, arg(:data_format).from(1)]
+            args: [:locale_to_translate_from, arg(:data_format).from(1), :translation_backend]
 
         def tree_translate(opts = {})
           forest = forest_pos_or_stdin!(opts)
-          print_forest i18n.google_translate_forest(forest, opts[:from]), opts
+          print_forest i18n.translate_forest(forest, from: opts[:from], backend: opts[:backend].to_sym), opts
         end
 
         cmd :tree_merge,
@@ -41,24 +41,6 @@ module I18n::Tasks
           print_forest forest, opts
         end
 
-        cmd :tree_rename_key,
-            pos:  'KEY_PATTERN NAME [tree (or stdin)]',
-            desc: t('i18n_tasks.cmd.desc.tree_rename_key'),
-            args: [['-k', '--key KEY_PATTERN', t('i18n_tasks.cmd.args.desc.key_pattern_to_rename')],
-                   ['-n', '--name NAME', t('i18n_tasks.cmd.args.desc.new_key_name')],
-                   :data_format]
-
-        def tree_rename_key(opt = {})
-          warn_deprecated 'Use tree-mv instead.'
-          key    = arg_or_pos! :key, opt
-          name   = arg_or_pos! :name, opt
-          forest = forest_pos_or_stdin! opt
-          fail CommandError, 'pass full key to rename (-k, --key)' if key.blank?
-          fail CommandError, 'pass new name (-n, --name)' if name.blank?
-          forest.rename_each_key!(key, name)
-          print_forest forest, opt
-        end
-
         arg :all_locales,
             '-a',
             '--all-locales',

data/lib/i18n/tasks/commands.rb

@@ -9,7 +9,6 @@ require 'i18n/tasks/command/commands/eq_base'
 require 'i18n/tasks/command/commands/data'
 require 'i18n/tasks/command/commands/tree'
 require 'i18n/tasks/command/commands/meta'
-require 'i18n/tasks/command/commands/xlsx'
 require 'i18n/tasks/command/commander'
 
 module I18n::Tasks
@@ -22,7 +21,6 @@ module I18n::Tasks
     include Command::Commands::Data
     include Command::Commands::Tree
     include Command::Commands::Meta
-    include Command::Commands::XLSX
 
     require 'highline/import'
   end

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

@@ -32,20 +32,6 @@ module I18n::Tasks::Data::Tree
       self
     end
 
-    def rename_each_key!(full_key_pattern, new_key_tpl)
-      pattern_re = I18n::Tasks::KeyPatternMatching.compile_key_pattern(full_key_pattern)
-      nodes do |node|
-        next if node.full_key(root: true) !~ pattern_re
-        new_key = new_key_tpl.gsub('%{key}', node.key)
-        if node.parent == parent
-          rename_key(node.key, new_key)
-        else
-          node.parent.children.rename_key(node.key, new_key)
-        end
-      end
-      self
-    end
-
     # @param from_pattern [Regexp]
     # @param to_pattern [Regexp]
     # @param root [Boolean]

data/lib/i18n/tasks/translation.rb

@@ -7,16 +7,17 @@ module I18n::Tasks
   module Translation
     # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
     # @param [String] from locale
+    # @param [:deepl, :google] backend
     # @return [I18n::Tasks::Tree::Siblings] translated forest
-    def deepl_translate_forest(forest, from)
-      Translators::DeeplTranslator.new(self).translate_forest(forest, from)
-    end
-
-    # @param [I18n::Tasks::Tree::Siblings] forest to translate to the locales of its root nodes
-    # @param [String] from locale
-    # @return [I18n::Tasks::Tree::Siblings] translated forest
-    def google_translate_forest(forest, from)
-      Translators::GoogleTranslator.new(self).translate_forest(forest, from)
+    def translate_forest(forest, from:, backend: :google)
+      case backend
+      when :deepl
+        Translators::DeeplTranslator.new(self).translate_forest(forest, from)
+      when :google
+        Translators::GoogleTranslator.new(self).translate_forest(forest, from)
+      else
+        fail CommandError, "invalid backend: #{backend}"
+      end
     end
   end
 end

data/lib/i18n/tasks/translators/deepl_translator.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-require 'deepl'
 require 'i18n/tasks/translators/base_translator'
 
 module I18n::Tasks::Translators
   class DeeplTranslator < BaseTranslator
     def initialize(*)
+      begin
+        require 'deepl'
+      rescue LoadError
+        raise ::I18n::Tasks::CommandError, "Add gem 'deepl-rb' to your Gemfile to use this command"
+      end
       super
       configure_api_key!
     end

data/lib/i18n/tasks/translators/google_translator.rb

@@ -1,10 +1,18 @@
 # frozen_string_literal: true
 
-require 'easy_translate'
 require 'i18n/tasks/translators/base_translator'
 
 module I18n::Tasks::Translators
   class GoogleTranslator < BaseTranslator
+    def initialize(*)
+      begin
+        require 'easy_translate'
+      rescue LoadError
+        raise ::I18n::Tasks::CommandError, "Add gem 'easy_translate' to your Gemfile to use this command"
+      end
+      super
+    end
+
     protected
 
     def translate_values(list, **options)

data/lib/i18n/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Tasks
-    VERSION = '0.9.23'
+    VERSION = '0.9.24'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 0.9.24
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: deepl-rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: easy_translate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +156,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: deepl-rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: easy_translate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +286,6 @@ files:
 - lib/i18n/tasks/command/commands/missing.rb
 - lib/i18n/tasks/command/commands/tree.rb
 - lib/i18n/tasks/command/commands/usages.rb
-- lib/i18n/tasks/command/commands/xlsx.rb
 - lib/i18n/tasks/command/dsl.rb
 - lib/i18n/tasks/command/option_parsers/enum.rb
 - lib/i18n/tasks/command/option_parsers/locale.rb
@@ -320,7 +319,6 @@ files:
 - lib/i18n/tasks/rainbow_utils.rb
 - lib/i18n/tasks/references.rb
 - lib/i18n/tasks/reports/base.rb
-- lib/i18n/tasks/reports/spreadsheet.rb
 - lib/i18n/tasks/reports/terminal.rb
 - lib/i18n/tasks/scanners/file_scanner.rb
 - lib/i18n/tasks/scanners/files/caching_file_finder.rb

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module I18n::Tasks
-  module Command
-    module Commands
-      module XLSX
-        include Command::Collection
-
-        cmd :xlsx_report,
-            pos:  '[locale...]',
-            desc: t('i18n_tasks.cmd.desc.xlsx_report'),
-            args: [:locales,
-                   ['-p', '--path PATH', 'Destination path', default: 'tmp/i18n-report.xlsx']]
-
-        def xlsx_report(opt = {})
-          begin
-            require 'axlsx'
-          rescue LoadError
-            message = %(For spreadsheet report please add axlsx gem to Gemfile:\ngem 'axlsx', '~> 2.0')
-            log_stderr Rainbow(message).red.bright
-            exit 1
-          end
-          spreadsheet_report.save_report opt[:path], opt.except(:path)
-        end
-      end
-    end
-  end
-end

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

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'i18n/tasks/reports/base'
-require 'fileutils'
-
-module I18n::Tasks::Reports
-  class Spreadsheet < Base
-    def save_report(path, _opts)
-      path = path.presence || 'tmp/i18n-report.xlsx'
-      p = Axlsx::Package.new
-      p.use_shared_strings = true # see #159
-      add_missing_sheet p.workbook
-      add_unused_sheet p.workbook
-      add_eq_base_sheet p.workbook
-      FileUtils.mkpath(File.dirname(path))
-      p.serialize(path)
-      $stderr.puts Rainbow("Saved to #{path}").green
-    end
-
-    private
-
-    def add_missing_sheet(wb) # rubocop:disable Metrics/AbcSize
-      forest = collapse_missing_tree! task.missing_keys
-      wb.styles do |s|
-        type_cell = s.add_style alignment: { horizontal: :center }
-        locale_cell = s.add_style alignment: { horizontal: :center }
-        regular_style = s.add_style
-        wb.add_worksheet(name: missing_title(forest)) do |sheet|
-          sheet.page_setup.fit_to width: 1
-          sheet.add_row [I18n.t('i18n_tasks.common.type'), I18n.t('i18n_tasks.common.locale'),
-                         I18n.t('i18n_tasks.common.key'), I18n.t('i18n_tasks.common.base_value')]
-          style_header sheet
-          forest.keys do |key, node|
-            locale = format_locale(node.root.data[:locale])
-            type = node.data[:type]
-            sheet.add_row [missing_type_info(type)[:summary], locale, key, task.t(key)],
-                          styles: [type_cell, locale_cell, regular_style, regular_style]
-          end
-        end
-      end
-    end
-
-    def add_eq_base_sheet(wb)
-      keys = task.eq_base_keys.root_key_values(true)
-      add_locale_key_value_table wb, keys, name: eq_base_title(keys)
-    end
-
-    def add_unused_sheet(wb)
-      keys = task.unused_keys.root_key_values(true)
-      add_locale_key_value_table wb, keys, name: unused_title(keys)
-    end
-
-    def add_locale_key_value_table(wb, keys, worksheet_opts = {})
-      wb.add_worksheet worksheet_opts do |sheet|
-        sheet.add_row [I18n.t('i18n_tasks.common.locale'), I18n.t('i18n_tasks.common.key'),
-                       I18n.t('i18n_tasks.common.value')]
-        style_header sheet
-        keys.each do |locale_k_v|
-          sheet.add_row locale_k_v
-        end
-      end
-    end
-
-    def style_header(sheet)
-      border_bottom = sheet.workbook.styles.add_style(border: { style: :thin, color: '000000', edges: [:bottom] })
-      sheet.rows.first.style = border_bottom
-    end
-  end
-end