i18n-tasks 0.7.13 → 0.8.0

data/templates/rspec/i18n_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'i18n/tasks'
 
 describe 'I18n' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.8.0
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: slop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +205,7 @@ files:
 - i18n-tasks.gemspec
 - lib/i18n/tasks.rb
 - lib/i18n/tasks/base_task.rb
+- lib/i18n/tasks/cli.rb
 - lib/i18n/tasks/command/collection.rb
 - lib/i18n/tasks/command/commander.rb
 - lib/i18n/tasks/command/commands/data.rb
@@ -230,14 +217,11 @@ files:
 - lib/i18n/tasks/command/commands/usages.rb
 - lib/i18n/tasks/command/commands/xlsx.rb
 - lib/i18n/tasks/command/dsl.rb
-- lib/i18n/tasks/command/dsl/cmd.rb
-- lib/i18n/tasks/command/dsl/cmd_opt.rb
-- lib/i18n/tasks/command/dsl/enum_opt.rb
+- lib/i18n/tasks/command/option_parsers/enum.rb
+- lib/i18n/tasks/command/option_parsers/locale.rb
 - lib/i18n/tasks/command/options/common.rb
-- lib/i18n/tasks/command/options/enum_opt.rb
-- lib/i18n/tasks/command/options/list_opt.rb
+- lib/i18n/tasks/command/options/data.rb
 - lib/i18n/tasks/command/options/locales.rb
-- lib/i18n/tasks/command/options/trees.rb
 - lib/i18n/tasks/command_error.rb
 - lib/i18n/tasks/commands.rb
 - lib/i18n/tasks/configuration.rb
@@ -270,7 +254,6 @@ files:
 - lib/i18n/tasks/scanners/pattern_scanner.rb
 - lib/i18n/tasks/scanners/pattern_with_scope_scanner.rb
 - lib/i18n/tasks/scanners/relative_keys.rb
-- lib/i18n/tasks/slop_command.rb
 - lib/i18n/tasks/split_key.rb
 - lib/i18n/tasks/stats.rb
 - lib/i18n/tasks/string_interpolation.rb

data/lib/i18n/tasks/command/dsl/cmd.rb

@@ -1,19 +0,0 @@
-module I18n::Tasks
-  module Command
-    module DSL
-      module Cmd
-        def cmd(name, args = nil)
-          if args
-            dsl(:cmds)[name] = args
-          else
-            dsl(:cmds)[name]
-          end
-        end
-
-        def cmds
-          dsl(:cmds)
-        end
-      end
-    end
-  end
-end

data/lib/i18n/tasks/command/dsl/cmd_opt.rb

@@ -1,19 +0,0 @@
-module I18n::Tasks
-  module Command
-    module DSL
-      module CmdOpt
-        def cmd_opts(*args)
-          dsl(:cmd_opts).values_at(*args)
-        end
-
-        def cmd_opt(arg, opts = nil)
-          if opts
-            dsl(:cmd_opts)[arg] = opts
-          else
-            dsl(:cmd_opts)[arg]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/i18n/tasks/command/dsl/enum_opt.rb

@@ -1,45 +0,0 @@
-module I18n::Tasks
-  module Command
-    module DSL
-      module EnumOpt
-        def enum_opt(name, list = nil)
-          if list
-            dsl(:enum_valid)[name] = list
-          else
-            dsl(:enum_valid)[name]
-          end
-        end
-
-        DEFAULT_ENUM_OPT_DESC = proc { |valid, default|
-          I18n.t('i18n_tasks.cmd.enum_opt.desc', valid_text: valid, default_text: default)
-        }
-
-        def enum_opt_attr(short, long, valid, desc, error_msg)
-          desc ||= DEFAULT_ENUM_OPT_DESC
-          desc_proc = proc { desc.call(valid * ', ', I18n.t('i18n_tasks.cmd.args.default_text', value: valid.first)) }
-          {short: short, long: long, desc: desc_proc,
-           conf:  {default: valid.first, argument: true, optional: false},
-           parse: enum_parse_proc(:parse_enum_opt, valid, &error_msg)}
-        end
-
-        DEFAULT_LIST_OPT_DESC = proc { |valid, default|
-          I18n.t('i18n_tasks.cmd.enum_list_opt.desc', valid_text: valid, default_text: default)
-        }
-
-        def enum_list_opt_attr(short, long, valid, desc, error_msg)
-          desc ||= DEFAULT_LIST_OPT_DESC
-          desc_proc = proc { desc.call(valid * ', ', I18n.t('i18n_tasks.cmd.args.default_all')) }
-          {short: short, long: long, desc: desc_proc,
-           conf:  {as: Array, delimiter: /\s*[+:,]\s*/},
-           parse: enum_parse_proc(:parse_enum_list_opt, valid, &error_msg)}
-        end
-
-        def enum_parse_proc(method, valid, &error)
-          proc { |opt, key|
-            opt[key] = send(method, opt[key], valid, &error)
-          }
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-module I18n::Tasks
-  module Command
-    module Options
-      module EnumOpt
-        DEFAULT_ENUM_OPT_ERROR = proc { |bad, good|
-          I18n.t('i18n_tasks.cmd.enum_opt.invalid', invalid: bad, valid: good * ', ')
-        }
-
-        def parse_enum_opt(value, valid, &error_msg)
-          valid = enum_opt(valid) if Symbol === valid
-          return valid.first unless value.present?
-          if enum_opt_valid?(valid, value)
-            value
-          else
-            error_msg ||= DEFAULT_ENUM_OPT_ERROR
-            raise CommandError.new error_msg.call(value, valid)
-          end
-        end
-
-        def enum_opt_valid?(valid, value)
-          valid = enum_opt(valid) if Symbol === valid
-          valid.include?(value)
-        end
-
-        DEFAULT_ENUM_LIST_ERROR = proc { |bad, good|
-          I18n.t('i18n_tasks.cmd.enum_list_opt.invalid', invalid: bad * ', ', valid: good * ', ')
-        }
-
-        def parse_enum_list_opt(values, valid, &error_msg)
-          values  = explode_list_opt(values)
-          invalid = values - valid.map(&:to_s)
-          if invalid.empty?
-            if values.empty?
-              valid
-            else
-              values
-            end
-          else
-            error_msg ||= DEFAULT_ENUM_LIST_ERROR
-            raise CommandError.new error_msg.call(invalid, valid)
-          end
-        end
-
-        def enum_opt(*args)
-          self.class.enum_opt(*args)
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module I18n::Tasks
-  module Command
-    module Options
-      module ListOpt
-        def explode_list_opt(list_opt, delim = /\s*[,]\s*/)
-          Array(list_opt).compact.map { |v| v.strip.split(delim).compact.presence }.flatten.map(&:presence).compact
-        end
-      end
-    end
-  end
-end

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

@@ -1,81 +0,0 @@
-module I18n::Tasks
-  module Command
-    module Options
-      module Trees
-        include Command::DSL
-        format_opt = proc { |type|
-          enum_opt_attr :f, :format=, enum_opt(type),
-                        proc { |valid, default|
-                          I18n.t("i18n_tasks.cmd.args.desc.#{type}", valid_text: valid, default_text: default) },
-                        proc { |value, valid|
-                          I18n.t('i18n_tasks.cmd.errors.invalid_format', invalid: value, valid: valid * ', ') }
-        }
-
-        enum_opt :data_format, %w(yaml json keys)
-        # i18n-tasks-use t('i18n_tasks.cmd.args.desc.data_format')
-        cmd_opt :data_format, format_opt.call(:data_format)
-
-        enum_opt :out_format, ['terminal-table', *enum_opt(:data_format), 'inspect']
-        # i18n-tasks-use t('i18n_tasks.cmd.args.desc.out_format')
-        cmd_opt :out_format, format_opt.call(:out_format)
-
-        def print_forest(forest, opt, version = :show_tree)
-          format = opt[:format].to_s
-          case format
-            when 'terminal-table'
-              terminal_report.send(version, forest)
-            when 'inspect'
-              puts forest.inspect
-            when 'keys'
-              puts forest.key_names(root: true)
-            when *enum_opt(:data_format)
-              puts i18n.data.adapter_dump forest.to_hash(true), format
-          end
-        end
-
-        def opt_forest_arg_or_stdin!(opt, format = opt[:format])
-          src = opt[:arguments].try(:shift) || $stdin.read
-          parse_forest(src, format)
-        end
-
-        def opt_forests_stdin_args!(opt, num = false, format = opt[:format])
-          args = opt[:arguments] || []
-          if opt[:nostdin]
-            sources = []
-          else
-            sources = [$stdin.read]
-            num     -= 1 if num
-          end
-          if num
-            num.times { sources << args.shift }
-          else
-            sources += args
-            args.clear
-          end
-          sources.map { |src| parse_forest(src, format) }
-        end
-
-        def opt_forests_merged_stdin_args!(opt)
-          opt_forests_stdin_args!(opt).inject(i18n.empty_forest) { |result, forest|
-            result.merge! forest
-          }
-        end
-
-        def parse_forest(src, format)
-          if !src
-            raise CommandError.new(I18n.t('i18n_tasks.cmd.errors.pass_forest'))
-          end
-          if format == 'keys'
-            Data::Tree::Siblings.from_key_names parse_keys(src)
-          else
-            Data::Tree::Siblings.from_nested_hash i18n.data.adapter_parse(src, format)
-          end
-        end
-
-        def parse_keys(src)
-          explode_list_opt(src, /\s*[,\s\n]\s*/)
-        end
-      end
-    end
-  end
-end

data/lib/i18n/tasks/slop_command.rb

@@ -1,41 +0,0 @@
-module I18n::Tasks::SlopCommand
-  extend self
-
-  def slop_command(name, attr, &block)
-    proc {
-      cmd_name = name.tr('_', '-')
-      command cmd_name do
-        args = attr[:args]
-        banner "Usage: i18n-tasks #{cmd_name} [options] #{args}" if args.present?
-        desc = attr[:desc]
-        desc = desc.call if desc.respond_to?(:call)
-        description desc if desc
-        attr[:opt].try :each do |opt|
-          on *opt.values_at(:short, :long, :desc, :conf).compact.map { |v| v.respond_to?(:call) ? v.call : v }
-        end
-        run { |slop_opts, slop_args|
-          slop_opts = slop_opts.to_hash(true).reject { |k, v| v.nil? }
-          slop_opts.merge!(arguments: slop_args) unless slop_args.empty?
-          block.call name, slop_opts
-        }
-      end
-    }
-  end
-
-  def parse_opts!(opts, opts_conf, context)
-    return if !opts_conf
-    opts_conf.each do |opt_conf|
-      parse = opt_conf[:parse]
-      if parse
-        key = opt_conf[:long].to_s.sub(/=\z/, '').to_sym
-        if parse.respond_to?(:call)
-          context.instance_exec opts, key, &parse
-        elsif Symbol === parse
-          context.instance_exec do
-            send parse, opts, key
-          end
-        end
-      end
-    end
-  end
-end