ehbrs-tools 0.13.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a216d21cdcdb218151fbfd96d21d4b378ae35c4071d222707178c48a6f4ad69
-  data.tar.gz: dec260f1e8ffceb7eaa91fb4052b136d8222525c473e348abd897e86d0ba4e00
+  metadata.gz: c933ef15a718774ec5c1a1f2d4915da05a21d76df979e12a901ed036b9794877
+  data.tar.gz: 4b942fb2711d4a9dfc3ff5f89b1ed73167124b0f3974ab1f023ddd3e68724538
 SHA512:
-  metadata.gz: 000fb54ab3abd785846e2d05802a7d12752109be7a2ac2314ea7804bcc90a4f98f3ee443dd693c6cba1687333c32d2832387f17acc9e32e44a6fb1cb22e23954
-  data.tar.gz: 8b060bb61da97a62b3fd1648060fb667ea9ed074fd719c194806d15469bae413031f663df10877b0099d109a4d78544f8e3148b842d36841e68f0140daa99b15
+  metadata.gz: 5a07de2b1b7ec7208b46b14b19e84a69e43a2c3c1d9b29b2e8cebbb253324efbff9390464a26c2d6289542bf5cc41aac08ca5cf64a26a103f5d1ae8b7c2f6d82
+  data.tar.gz: e456a371d70caa2e7bf9a8c34adc950f413e4673dce6f0666b7eed406cf184ae9a042d9cb7e3e7a7fd306f7eaf7ccbd6304c7e778ae925f1999e2f09e3e995e6

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,29 +1,22 @@
 # frozen_string_literal: true
 
-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__
-    enable_console_speaker
 
-    DOC = <<~DOCOPT
-      Tools for EHB/RS.
-
-      Usage:
-        __PROGRAM__ [options] __SUBCOMMANDS__
-        __PROGRAM__ --version
-        __PROGRAM__ -h | --help
-
-      Options:
-        -h --help             Show this screen.
-        -V --version          Show version.
-    DOCOPT
+    runner_with :help, :subcommands do
+      desc 'Tools for EHB/RS.'
+      subcommands
+      alt do
+        bool_opt '-V', '--version', 'Show version.'
+      end
+    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 UsedSpace < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+  class Runner
+    class Fs
+      class UsedSpace
+        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.'
@@ -22,7 +21,7 @@ module Ehbrs
         end
 
         def check?
-          options.fetch('--check')
+          parsed.check
         end
 
         private
@@ -40,11 +39,11 @@ module Ehbrs
         end
 
         def paths_uncached
-          options.fetch('<paths>').map { |path| path_class.new(self, path) }
+          parsed.paths.map { |path| path_class.new(self, path) }
         end
 
         def verbose?
-          options.fetch('--verbose')
+          parsed.verbose
         end
 
         class PathBase

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