ehbrs-tools 0.13.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9692fcad0f7b1e05f59f98e17e1d1e5042efa22f1bd1e8ada8a2b5b2d4909e66
-  data.tar.gz: 606f3be03e5b0f54564aaa78b466e89ed498cf4a7d316e187cb6432b34cd46f6
+  metadata.gz: 802c81117166172af4ea59889f51ca8fa22e9619c3db5c3c6cea3facefd67816
+  data.tar.gz: 524a0c12d36e164f7530653ace84b229d3c90b382bd148fc2dabdf51611881e4
 SHA512:
-  metadata.gz: 4fc3d4a8dc042274ca49de459c5a18d8179cd0b2f1846016c9fcff06d909b5583aa282e645205bc502698b447ae2a8aab3bf53bfc9646e71eea23a9949c5b272
-  data.tar.gz: 48d655fe4a28192181f2e40d3f2f9041d7c3f4a41a80168446ee15ec176d54c2f5c0c4428d41fc0a5c3248f5dc3471b408c8f8d58b7ffecd5131d9040e7ef0ce
+  metadata.gz: 8704fd788c833ebd36f2c3bab048855993cba2fbe29555040027965195d698eba76d2e36d77ded10672bf50027b441af11d9732ce8bf8dde6fb821623155ea1e
+  data.tar.gz: 45fa1972f370a98e24424a55ff81b964525799512e6d288fbde84996c5d36540cf368491de00423036f327cc5470889fae2ea0fcf52f40eb29fdfc736275a797

data/lib/ehbrs/executables.rb

@@ -17,7 +17,7 @@ module Ehbrs
       {
         '-?' => %w[rar],
         '-h' => %w[unzip],
-        '-version' => %w[ffmpeg ffprobe],
+        '-version' => %w[ffmpeg],
         '--version' => %w[flips tar wit]
       }.each do |validate_arg, commands|
         commands.each do |command|

data/lib/ehbrs/runner.rb

@@ -1,16 +1,13 @@
 # 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/tools/version'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
     require_sub __FILE__
-    include ::EacCli::DefaultRunner
 
-    runner_definition do
+    runner_with :help, :subcommands do
       desc 'Tools for EHB/RS.'
       subcommands
       alt do
@@ -19,7 +16,7 @@ module Ehbrs
     end
 
     def run
-      if options.fetch('--version')
+      if parsed[:version].present?
         out(::Ehbrs::Tools::VERSION + "\n")
       else
         run_with_subcommand

data/lib/ehbrs/runner/finances.rb

@@ -1,16 +1,13 @@
 # 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 Finances < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacCli::DefaultRunner
+  class Runner
+    class Finances
       require_sub __FILE__
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Utilidades financeiras.'
         subcommands
       end

data/lib/ehbrs/runner/finances/bb_browser.rb

@@ -1,19 +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'
 require 'ehbrs/videos/extract/package'
 require 'eac_docker/images/named'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Finances < ::EacRubyUtils::Console::DocoptRunner
-      class BbBrowser < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-        require_sub __FILE__
-
-        runner_definition do
+  class Runner
+    class Finances
+      class BbBrowser
+        runner_with :help do
           desc 'Bankline para Banco do Brasil com módulo de segurança.'
         end
 

data/lib/ehbrs/runner/fs.rb

@@ -1,16 +1,13 @@
 # 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 Fs < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacCli::DefaultRunner
+  class Runner
+    class Fs
       require_sub __FILE__
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Ferramentas para o sistema de arquivos.'
         subcommands
       end

data/lib/ehbrs/runner/fs/used_space.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'ehbrs/self/observers/used_space'
 require 'filesize'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Fs < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
+    class Fs
       class UsedSpace
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+        runner_with :help do
           desc 'Verifica e anota alterações de espaço usado de um objeto de sistema de arquivos.'
           bool_opt '-c', '--check', 'Anota o espaço em disco.'
           bool_opt '-v', '--verbose', 'Verbose.'

data/lib/ehbrs/runner/google.rb

@@ -1,16 +1,13 @@
 # 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 Google < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
+    class Google
       require_sub __FILE__
-      include ::EacCli::DefaultRunner
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Utilidades Google.'
         subcommands
       end

data/lib/ehbrs/runner/google/translate.rb

@@ -2,16 +2,13 @@
 
 require 'eac_cli/default_runner'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'ehbrs/google/translate/session'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Google < ::EacRubyUtils::Console::DocoptRunner
-      class Translate < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+  class Runner
+    class Google
+      class Translate
+        runner_with :help do
           desc 'Traduz um documento com Google Translate.'
           arg_opt '-o', '--output-file', 'Salva saída em <output-file>.'
           bool_opt '-w', '--overwrite', 'Permite sobreescrever arquivo de saída.'
@@ -38,12 +35,10 @@ module Ehbrs
           session.translate(source_file)
         end
 
-        def source_file
-          options.fetch('<source-file>')
-        end
+        delegate :source_file, to: :parsed
 
         def output_file
-          options.fetch('--output-file') || default_output_file
+          parsed.output_file || default_output_file
         end
 
         def default_output_file
@@ -72,7 +67,7 @@ module Ehbrs
         def validate_output_file
           return if output_to_stdout?
           return unless ::File.exist?(output_file)
-          return if options.fetch('--overwrite')
+          return if parsed.overwrite?
 
           fatal_error "Output file \"#{output_file}\" already exists"
         end

data/lib/ehbrs/runner/self.rb

@@ -1,16 +1,13 @@
 # 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 Self < ::EacRubyUtils::Console::DocoptRunner
+  class Runner
+    class Self
       require_sub __FILE__
-      include ::EacCli::DefaultRunner
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Self utilities'
         subcommands
       end

data/lib/ehbrs/runner/self/test.rb

@@ -1,19 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
 require 'ehbrs/gems'
 require 'eac_ruby_gems_utils/tests/multiple'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Self < ::EacRubyUtils::Console::DocoptRunner
-      class Test < ::EacRubyUtils::Console::DocoptRunner
-        require_sub __FILE__
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+  class Runner
+    class Self
+      class Test
+        runner_with :help do
           desc 'Test core and local gems.'
         end
 

data/lib/ehbrs/runner/vg.rb

@@ -1,16 +1,13 @@
 # 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 Vg < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacCli::DefaultRunner
+  class Runner
+    class Vg
       require_sub __FILE__
 
-      runner_definition do
+      runner_with :help, :subcommands do
         desc 'Ferramentas para video game.'
         subcommands
       end

data/lib/ehbrs/runner/vg/ips.rb

@@ -1,19 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/runner'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/core_ext'
 require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/executables'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Vg < ::EacRubyUtils::Console::DocoptRunner
-      class Ips < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+  class Runner
+    class Vg
+      class Ips
+        runner_with :help do
           desc 'Aplica patches IPS em roms.'
           arg_opt '-o', '--output-file', ' Saída no arquivo <output-file>.'
           bool_opt '-w', '--overwrite', 'Sobrescreve o arquivo de saída se existente.'
@@ -54,7 +49,7 @@ module Ehbrs
         end
 
         def source_file
-          options.fetch('<source-file>').to_pathname
+          parsed.source_file.to_pathname
         end
 
         def start_banner
@@ -65,11 +60,11 @@ module Ehbrs
         end
 
         def ips_files
-          options.fetch('<ips-files>').map(&:to_pathname)
+          parsed.ips_files.map(&:to_pathname)
         end
 
         def output_file
-          options.fetch('--output-file').to_pathname || default_output_file
+          parsed.output_file.to_pathname || default_output_file
         end
 
         def default_output_file
@@ -98,7 +93,7 @@ module Ehbrs
 
         def validate_output_file
           return unless output_file.exist?
-          return if options.fetch('--overwrite')
+          return if parsed.overwrite?
 
           fatal_error("Arquivo de saída \"#{output_file}\" já existe")
         end

data/lib/ehbrs/runner/vg/wii.rb

@@ -1,20 +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 'eac_ruby_utils/fs/traversable'
 require 'ehbrs/vg/wii/file_move'
 require 'ehbrs/vg/wii/game_file'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Vg < ::EacRubyUtils::Console::DocoptRunner
-      class Wii < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
+  class Runner
+    class Vg
+      class Wii
         include ::EacRubyUtils::Fs::Traversable
 
-        runner_definition do
+        runner_with :help do
           desc 'Manipulação de imagens de jogo Wii.'
           bool_opt '-R', '--recursive', 'Busca arquivos recursivamente.'
           bool_opt '-d', '--dump', 'Mostra todos os atributos do jogo.'
@@ -25,7 +22,7 @@ module Ehbrs
 
         def run
           infov 'Recursive?', traverser_new.recursive?
-          options.fetch('<paths>').each do |path|
+          parsed.paths.each do |path|
             traverser_check_path(path)
           end
         end
@@ -33,11 +30,11 @@ module Ehbrs
         private
 
         def confirm?
-          options.fetch('--confirm')
+          parsed.confirm?
         end
 
         def dump(game)
-          return unless options.fetch('--dump')
+          return unless parsed.dump?
 
           game.properties.each do |name, value|
             infov "  * #{name}", value
@@ -54,11 +51,11 @@ module Ehbrs
         end
 
         def move_arg
-          options.fetch('--move')
+          parsed.move
         end
 
         def traverser_recursive
-          options.fetch('--recursive')
+          parsed.recursive
         end
 
         def traverser_check_file(path)

data/lib/ehbrs/runner/videos.rb

@@ -1,23 +1,16 @@
 # frozen_string_literal: true
 
-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 Runner
+    class Videos
       require_sub __FILE__
 
-      DOC = <<~DOCOPT
-        Video tools for EHB/RS.
-
-        Usage:
-          __PROGRAM__ [options] __SUBCOMMANDS__
-          __PROGRAM__ -h | --help
-
-        Options:
-          -h --help             Show this screen.
-      DOCOPT
+      runner_with :help, :subcommands do
+        desc 'Video tools for EHB/RS.'
+        subcommands
+      end
     end
   end
 end

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

@@ -1,20 +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/extract/package'
 
 module Ehbrs
-  class Runner < ::EacRubyUtils::Console::DocoptRunner
-    class Videos < ::EacRubyUtils::Console::DocoptRunner
-      class Extract < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
+  class Runner
+    class Videos
+      class Extract
         require_sub __FILE__
 
         DEFAULT_QUALITIES = %w[1080 720 web webrip hdtv].freeze
 
-        runner_definition do
+        runner_with :help do
           desc 'Extrai arquivos de seriados.'
           arg_opt '-d', '--dir', 'Extraí para diretório.'
           bool_opt '-D', '--delete', 'Remove o pacote após o processamento.'
@@ -26,20 +23,20 @@ module Ehbrs
           start_banner
           packages.each do |package|
             infov 'Package', package
-            package.run(options.fetch('--delete'))
+            package.run(parsed.delete?)
           end
         end
 
         private
 
         def packages_uncached
-          options.fetch('<packages>').map do |p|
+          parsed.packages?.map do |p|
             ::Ehbrs::Videos::Extract::Package.new(p, target_dir, qualities)
           end
         end
 
         def qualities_uncached
-          (options.fetch('--qualities').to_s.split(',') + DEFAULT_QUALITIES).uniq
+          (parsed.qualities.to_s.split(',') + DEFAULT_QUALITIES).uniq
         end
 
         def start_banner
@@ -49,11 +46,11 @@ module Ehbrs
         end
 
         def target_dir_uncached
-          options.fetch('--dir').if_present(&:to_pathname) || default_target_dir
+          parsed.dir.if_present(&:to_pathname) || default_target_dir
         end
 
         def default_target_dir
-          r = options.fetch('<packages>').first.to_pathname.basename('.*')
+          r = parsed.packages.first.to_pathname.basename('.*')
           return r unless r.exist?
 
           r = r.basename_sub { |b| "#{b}_extract" }