ehbrs-tools 0.15.0 → 0.16.0

data/lib/ehbrs/runner/videos/probe.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'ehbrs_ruby_utils/videos/container/file'
 require 'eac_ruby_utils/yaml'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
+    class Videos
       class Probe
-        runner_with :output_file
-
-        runner_definition do
+        runner_with :help, :output_file do
           desc 'FFProbe em um arquivo de vídeo.'
           pos_arg :file_path
         end

data/lib/ehbrs/runner/videos/series.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Series < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
+  class Runner
+    class Videos
+      class Series
         require_sub __FILE__
 
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Ferramentas para seriados.'
           subcommands
         end

data/lib/ehbrs/runner/videos/series/rename.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 require 'ehbrs/videos/series/rename/file'
 require 'ehbrs/videos/series/rename/file/options'
 require 'ehbrs/videos/series/rename/results_builder'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Series < ::EacRubyUtils::Console::DocoptRunner
-        class Rename < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
+  class Runner
+    class Videos
+      class Series
+        class Rename
           include ::EacRubyUtils::Fs::Traversable
 
-          runner_definition do
+          runner_with :help do
             desc 'Renomeia arquivos de séries.'
             bool_opt '-r', '--recursive', 'Recursivo.'
             bool_opt '-c', '--confirm', 'Confirmação a renomeação.'
@@ -43,11 +40,11 @@ module Ehbrs
           end
 
           def paths
-            options.fetch('<paths>').if_present(['.'])
+            parsed.paths.if_present(['.'])
           end
 
           def traverser_recursive
-            options.fetch('--recursive')
+            parsed.recursive
           end
 
           def traverser_check_file(path)
@@ -55,7 +52,7 @@ module Ehbrs
           end
 
           def series_file_options_uncached
-            ::Ehbrs::Videos::Series::Rename::File::Options.new(options)
+            ::Ehbrs::Videos::Series::Rename::File::Options.new(parsed)
           end
 
           def show_results

data/lib/ehbrs/runner/videos/unsupported.rb

@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 require 'ehbrs/videos/unsupported/check_set'
 require 'ehbrs/videos/unsupported/search'
 require 'ehbrs/videos/unsupported/profiles'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Unsupported < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
+  class Runner
+    class Videos
+      class Unsupported
         PROFILES = %w[philco samsung].freeze
 
-        runner_definition do
+        runner_with :help do
           desc 'Procura e converte vídeos não suportados pelas TVs de EHB/RS.'
           bool_opt '-f', '--fix', 'Converte vídeos para o formato apropriado.'
           arg_opt '-p', '--profiles', "Seleciona os perfis (#{PROFILES.join(', ')})."
@@ -41,17 +37,17 @@ module Ehbrs
         end
 
         def paths
-          options.fetch('<paths>')
+          parsed.paths
         end
 
         def file_options
           { file_check_set: file_check_set, track_check_set: track_check_set,
-            fix: options.fetch('--fix') }
+            fix: parsed.fix? }
         end
 
         def profiles_uncached
-          options.fetch('--profiles').if_present(PROFILES) { |v| v.split(',').map(&:strip) }
-                 .map { |name| profile_class(name).instance }
+          parsed.profiles.if_present(PROFILES) { |v| v.split(',').map(&:strip) }
+                .map { |name| profile_class(name).instance }
         end
 
         def profile_class(profile_name)

data/lib/ehbrs/runner/web_utils.rb

@@ -1,25 +1,23 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'ehbrs_ruby_utils/web_utils/instance'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class WebUtils < ::EacRubyUtils::Console::DocoptRunner
-      runner_with
+  class Runner
+    class WebUtils
       require_sub __FILE__
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Ferramentas para EHB/RS Utils.'
-        pos_arg :'instance-id'
+        pos_arg :instance_id
         subcommands
       end
 
       private
 
       def instance_uncached
-        ::EhbrsRubyUtils::WebUtils::Instance.by_id(options.fetch('<instance-id>'))
+        ::EhbrsRubyUtils::WebUtils::Instance.by_id(parsed.instance_id)
       end
     end
   end

data/lib/ehbrs/runner/web_utils/videos.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class WebUtils < ::EacRubyUtils::Console::DocoptRunner
-      class Videos < ::EacRubyUtils::Console::DocoptRunner
-        runner_with
+  class Runner
+    class WebUtils
+      class Videos
         require_sub __FILE__
 
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Ferramentas de vídeos para EHB/RS Utils.'
           subcommands
         end

data/lib/ehbrs/runner/web_utils/videos/download.rb

@@ -2,16 +2,13 @@
 
 require 'eac_cli/core_ext'
 require 'ehbrs_ruby_utils/web_utils/videos/file'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class WebUtils < ::EacRubyUtils::Console::DocoptRunner
-      class Videos < ::EacRubyUtils::Console::DocoptRunner
-        class Download < ::EacRubyUtils::Console::DocoptRunner
-          runner_with
-
-          runner_definition do
+  class Runner
+    class WebUtils
+      class Videos
+        class Download
+          runner_with :help do
             desc 'Importa informações de arquivos de vídeo de uma instância EHB/RS Utils.'
             bool_opt '-c', '--confirm', 'Confirma as mudanças'
           end
@@ -32,12 +29,12 @@ module Ehbrs
 
           def process_rename_file(file)
             infov "  * #{file.new_path}", file.original_path
-            file.rename if options.fetch('--confirm')
+            file.rename if parsed.confirm?
           end
 
           def process_delete_file(file)
             infov "  * #{file.new_path}", 'REMOVE'
-            file.remove if options.fetch('--confirm')
+            file.remove if parsed.confirm?
           end
 
           def files_uncached
@@ -57,7 +54,7 @@ module Ehbrs
           end
 
           def raw_content
-            context(:instance).http_request('/videos/files/export').body
+            runner_context.call(:instance).http_request('/videos/files/export').body
           end
         end
       end

data/lib/ehbrs/runner/web_utils/videos/upload.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'ehbrs_ruby_utils/web_utils/videos/files_list'
 require 'json'
 require 'yaml'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class WebUtils < ::EacRubyUtils::Console::DocoptRunner
-      class Videos < ::EacRubyUtils::Console::DocoptRunner
-        class Upload < ::EacRubyUtils::Console::DocoptRunner
-          runner_with
-
-          runner_definition do
+  class Runner
+    class WebUtils
+      class Videos
+        class Upload
+          runner_with :help do
             desc 'Exporta informações de arquivos de vídeo para uma instância EHB/RS Utils.'
             bool_opt '-P', '--no-ffprobe', 'Não recupera dados com "ffprobe".'
           end
@@ -30,7 +27,7 @@ module Ehbrs
           end
 
           def upload_request(files_list_path)
-            context(:instance).http_request(
+            runner_context.call(:instance).http_request(
               '/videos/files/import',
               method: :put,
               body: {
@@ -65,8 +62,8 @@ module Ehbrs
           def write_files_list(file_class, read_entry)
             files_list = ::EhbrsRubyUtils::WebUtils::Videos::FilesList.new(
               file_class,
-              context(:instance).read_entry(read_entry),
-              ffprobe: !options.fetch('--no-ffprobe')
+              runner_context.call(:instance).read_entry(read_entry),
+              ffprobe: !parsed.no_ffprobe?
             )
             infov 'Files found', files_list.data.fetch(:files).count
             files_list.write_to

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.15.0'
+    VERSION = '0.16.0'
   end
 end

data/lib/ehbrs/videos/series/rename/file/options.rb

@@ -6,21 +6,11 @@ module Ehbrs
       module Rename
         class File
           class Options
-            def initialize(docopt_runner_options)
-              @options = docopt_runner_options
-            end
-
-            %w[kernel confirm recursive extension].each do |method|
-              class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      def #{method}
-        @options.fetch('--#{method}')
-      end
-              RUBY_EVAL
-            end
+            common_constructor :options
+            delegate :kernel, :confirm, :recursive, :extension, to: :options
 
             def episode_increment
-              r = @options.fetch('--episode-increment')
-              r.present? ? r.to_i : 0
+              options.episode_increment.if_present(0, &:to_i)
             end
           end
         end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.45'
+  s.add_dependency 'eac_ruby_utils', '~> 0.50'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

data/vendor/eac_cli/lib/eac_cli/definition.rb

@@ -8,6 +8,10 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     require_sub __FILE__
+
+    SUBCOMMAND_NAME_ARG = 'subcommand'
+    SUBCOMMAND_ARGS_ARG = 'subcommand_args'
+
     attr_accessor :description
     attr_accessor :options_argument
 
@@ -50,15 +54,27 @@ module EacCli
     end
 
     def pos_arg(name, arg_options = {})
-      positional << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+      raise 'Positional arguments are blocked' if positional_arguments_blocked?
+
+      pos_set << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
     end
 
     def positional
-      @positional ||= []
+      pos_set.to_a
+    end
+
+    def positional_arguments_blocked?
+      pos_set.any? { |e| e.optional? || e.repeat? }
     end
 
     def subcommands
-      positional << ::EacCli::Definition::PositionalArgument.new('subcommand', subcommand: true)
+      pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
+      pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
+                                                              optional: true, repeat: true)
+    end
+
+    def subcommands?
+      pos_set.any?(&:subcommand?)
     end
 
     def options_first(enable = true)
@@ -68,5 +84,11 @@ module EacCli
     def options_first?
       @options_first ? true : false
     end
+
+    private
+
+    def pos_set
+      @pos_set ||= []
+    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -5,19 +5,35 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class BaseOption
+      DEFAULT_REQUIRED = false
+
+      enable_listable
+      lists.add_symbol :option, :optional, :usage, :required
       attr_reader :short, :long, :description, :options
 
       def initialize(short, long, description, options = {})
         @short = short
         @long = long
         @description = description
-        @options = options.with_indifferent_access
+        @options = options.symbolize_keys
+        @options.assert_valid_keys(::EacCli::Definition::BaseOption.lists.option.values)
       end
 
       def identifier
         long.to_s.variableize.to_sym
       end
 
+      def required?
+        return true if options.key?(:required) && options.fetch(:required)
+        return false if options.key?(:optional) && options.fetch(:optional)
+
+        DEFAULT_REQUIRED
+      end
+
+      def to_s
+        "#{self.class.name.demodulize}[#{identifier}]"
+      end
+
       def show_on_usage?
         options[:usage]
       end

data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb

@@ -5,22 +5,26 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     class PositionalArgument
-      common_constructor :name, :options, default: [{}]
+      enable_listable
+      lists.add_symbol :option, :optional, :repeat, :subcommand
+      common_constructor :name, :options, default: [{}] do
+        options.assert_valid_keys(self.class.lists.option.values)
+      end
 
       def identifier
         name.to_s.variableize.to_sym
       end
 
       def optional?
-        options[:optional]
+        options[OPTION_OPTIONAL]
       end
 
       def repeat?
-        options[:repeat]
+        options[OPTION_REPEAT]
       end
 
       def subcommand?
-        options[:subcommand]
+        options[OPTION_SUBCOMMAND]
       end
     end
   end