ehbrs-tools 0.42.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17103baebd9aeaadd439e2f9d655af21e97ce4e5e717e4d95220cef79eb5822e
-  data.tar.gz: 41818ac788289578893d8f4c3717e848029c59d9a43ed2c60f2c99fd8db8a8db
+  metadata.gz: b67647b3e8bbe1427b85caf7f2c724b55220ca3e8697e779b94c6f4690467987
+  data.tar.gz: '09a70c265230d7f2c7ca356fe066bcf6ed5fec92c3ad1e1f6d9a68398e84fc6c'
 SHA512:
-  metadata.gz: cdb1007d0ad9b51d7833bf82914e9f1c64082a43c08f6dc5fadab0301ed20d9feccca382e00ecdafc052b3f7d3063693143db976ae4c92ea614365b736e0277d
-  data.tar.gz: 9c39e8cda2a8bf90ffa4cf96bedeab2fbbca4bca8c48961636b32d3017fd60b208e29787d3899b11c4d314ce5ed00aa34e7240926c06435555c5ff25b68e8f34
+  metadata.gz: 50f4b112d1d55f4efb3e36676f2b38b17a85c4a2f00e206f71a6e0e9cdbfed10248fafae1fd863a6d6702bb22b1055b5f70ba6aac3c85b9f7bf751fcea02f9d6
+  data.tar.gz: a2ec31deaaf51ad578114f0a648660154ebacde92f85188ef94fecb95cc3d1170382c9cf410b8da6bb0405271faed88075be4ca04573551366ec82a16284263d

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.42.0)
+    ehbrs-tools (0.43.0)
       avm-files (~> 0.7)
+      avm-tools (~> 0.161)
       eac_cli (~> 0.42)
+      eac_fs (~> 0.18)
       eac_ruby_base0 (~> 0.19)
       eac_ruby_utils (~> 0.122)
       ehbrs_ruby_utils (~> 0.44)
@@ -12,33 +14,24 @@ PATH
       telegram-bot-ruby (~> 0.23)
 
 PATH
-  remote: sub/aranha-selenium
+  remote: sub/eac_fs
   specs:
-    aranha-selenium (0.11.0)
-      eac_fs (~> 0.17)
-      eac_ruby_utils (~> 0.122)
-      eac_templates (~> 0.7)
-      selenium-webdriver (~> 3.142, >= 3.142.7)
-
-PATH
-  remote: sub/eac_cli
-  specs:
-    eac_cli (0.42.0)
-      colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14, >= 0.14.2)
+    eac_fs (0.18.0)
+      content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.122)
-      tty-table (~> 0.12)
+      ruby-filemagic (~> 0.7, >= 0.7.3)
 
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.44.0)
+    ehbrs_ruby_utils (0.44.1)
       aranha (~> 0.19, >= 0.19.2)
       aranha-parsers (~> 0.22)
-      aranha-selenium (~> 0.11)
+      aranha-selenium (~> 0.11, >= 0.11.1)
       avm (~> 0.92)
+      avm-eac_rails_base0 (~> 0.11, >= 0.11.1)
       dentaku (~> 3.5, >= 3.5.2)
-      eac_fs (~> 0.17)
+      eac_fs (~> 0.18)
       eac_rest (~> 0.12)
       eac_ruby_utils (~> 0.122)
       eac_templates (~> 0.7)
@@ -56,8 +49,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aranha (0.19.2)
       aranha-parsers (~> 0.18)
       aranha-selenium (~> 0.5)
@@ -69,6 +62,11 @@ GEM
       eac_ruby_utils (~> 0.119, >= 0.119.2)
       nokogiri (~> 1.15, >= 1.15.4)
       ofx-parser (~> 1.1)
+    aranha-selenium (0.11.1)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.122)
+      eac_templates (~> 0.7)
+      selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
     avm (0.92.0)
       eac_cli (~> 0.41)
@@ -82,27 +80,55 @@ GEM
     avm-eac_generic_base0 (0.13.0)
       avm (~> 0.90)
       eac_ruby_utils (~> 0.121)
+    avm-eac_postgresql_base0 (0.5.3)
+      avm (~> 0.85)
+      eac_ruby_utils (~> 0.121)
+    avm-eac_rails_base0 (0.11.1)
+      avm-eac_rails_base1 (~> 0.10)
+      eac_ruby_utils (~> 0.121)
+    avm-eac_rails_base1 (0.10.0)
+      avm (~> 0.81)
+      avm-eac_ruby_base1 (~> 0.33)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
     avm-eac_ruby_base1 (0.34.1)
       avm (~> 0.92)
       avm-eac_generic_base0 (~> 0.13)
       eac_envs-http (~> 0.5, >= 0.5.1)
       eac_ruby_utils (~> 0.122)
+    avm-eac_ubuntu_base0 (0.5.1)
+      avm (~> 0.86, >= 0.86.2)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
+    avm-eac_webapp_base0 (0.19.0)
+      avm (~> 0.90)
+      avm-eac_generic_base0 (~> 0.13)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      avm-files (~> 0.7)
+      eac_ruby_utils (~> 0.121)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
     avm-files (0.7.0)
       avm (~> 0.84, >= 0.84.2)
       eac_cli (~> 0.40)
       eac_fs (~> 0.17)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
+    avm-tools (0.161.0)
+      avm (~> 0.86, >= 0.86.1)
+      clipboard (~> 1.3, >= 1.3.6)
+      eac_ruby_base0 (~> 0.19)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.2.0)
     childprocess (3.0.0)
+    clipboard (1.4.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
-    concurrent-ruby (1.3.2)
+    concurrent-ruby (1.3.3)
     content-type (0.0.2)
       parslet (~> 2.0)
     dentaku (3.5.2)
@@ -110,7 +136,12 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
+    eac_cli (0.42.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.122)
+      tty-table (~> 0.12)
     eac_config (0.14.2)
       addressable (~> 2.8, >= 2.8.6)
       eac_ruby_utils (~> 0.121)
@@ -125,10 +156,6 @@ GEM
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
       faraday-retry (~> 2.2)
-    eac_fs (0.17.0)
-      content-type (~> 0.0, >= 0.0.2)
-      eac_ruby_utils (~> 0.120)
-      ruby-filemagic (~> 0.7, >= 0.7.3)
     eac_rest (0.12.0)
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
@@ -169,6 +196,7 @@ GEM
       faraday (~> 2.0)
     filesize (0.2.0)
     hpricot (0.8.6)
+    htmlbeautifier (1.4.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -176,7 +204,7 @@ GEM
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.23.1)
+    minitest (5.24.1)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
     nokogiri (1.15.6-x86_64-linux)
@@ -185,18 +213,18 @@ GEM
       hpricot (>= 0.6)
     os (1.1.4)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.6)
     rainbow (3.1.1)
     regexp_parser (2.9.2)
-    rexml (3.2.9)
+    rexml (3.3.1)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -204,7 +232,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -226,9 +254,9 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
-    rubocop-rails (2.25.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -238,8 +266,8 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -278,16 +306,15 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
     zlib (2.1.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aranha-selenium!
-  eac_cli!
-  eac_ruby_gem_support (~> 0.9)
+  eac_fs!
+  eac_ruby_gem_support (~> 0.10)
   ehbrs-tools!
   ehbrs_ruby_utils!
 

data/lib/ehbrs/tools/executables.rb

@@ -16,7 +16,8 @@ module Ehbrs
         private
 
         {
-          '--version' => %w[flips]
+          '--version' => %w[flips],
+          '-V' => %w[xdelta3]
         }.each do |validate_arg, commands|
           commands.each do |command|
             define_method("#{command}_uncached") do

data/lib/ehbrs/tools/runner/vg/{ips.rb → patch.rb}

@@ -2,13 +2,14 @@
 
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/fs/temp'
-require 'ehbrs/tools/executables'
+require 'ehbrs/tools/vg/patches/applier_factory'
+require 'ehbrs/tools/vg/patches/temp_files'
 
 module Ehbrs
   module Tools
     class Runner
       class Vg
-        class Ips
+        class Patch
           runner_with :help do
             desc 'Aplica patches IPS em roms.'
             arg_opt '-o', '--output-file', ' Saída no arquivo <output-file>.'
@@ -29,21 +30,14 @@ module Ehbrs
           def on_temp_files
             ::EacRubyUtils::Fs::Temp.on_file do |input|
               ::EacRubyUtils::Fs::Temp.on_file do |output|
-                yield TempFiles.new(source_file, input, output)
+                yield ::Ehbrs::Tools::Vg::Patches::TempFiles.new(source_file, input, output)
               end
             end
           end
 
           def run_patch(source_path, ips_path, output_path)
-            command = ::Ehbrs::Tools::Executables.flips.command
-                        .append(['--apply', ips_path, source_path, output_path])
-
-            command.system!
-
-            return if output_path.exist?
-
-            fatal_error("\"#{command}\" exited without error, but output file \"#{output_path}\"" \
-                        'does not exist')
+            ::Ehbrs::Tools::Vg::Patches::ApplierFactory.new(ips_path)
+              .apply(source_path, output_path)
           end
 
           def run_patches
@@ -105,35 +99,6 @@ module Ehbrs
 
             fatal_error("Arquivo de saída \"#{output_file}\" já existe")
           end
-
-          class TempFiles
-            common_constructor :initial, :temp0, :temp1
-
-            def input
-              swaped? ? temp0 : initial
-            end
-
-            def move_result_to(dest)
-              return unless swaped?
-
-              ::FileUtils.mv(temp0.to_path, dest.to_path)
-            end
-
-            def output
-              temp1
-            end
-
-            def swap
-              temp0_current = temp0
-              self.temp0 = temp1
-              self.temp1 = temp0_current
-              @swaped = true
-            end
-
-            def swaped?
-              @swaped ? true : false
-            end
-          end
         end
       end
     end

data/lib/ehbrs/tools/runner.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/tools/runner'
 require 'eac_ruby_base0/runner'
 require 'ehbrs/tools/application'
 
@@ -16,6 +17,12 @@ module Ehbrs
       def application
         ::Ehbrs::Tools.application
       end
+
+      def extra_available_subcommands
+        {
+          'avm' => ::Avm::Tools::Runner
+        }
+      end
     end
   end
 end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.42.0'
+    VERSION = '0.43.0'
   end
 end

data/lib/ehbrs/tools/vg/patches/applier_factory.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_fs/core_ext'
+require 'ehbrs/tools/vg/patches/ips_applier'
+require 'ehbrs/tools/vg/patches/vcdiff_applier'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        class ApplierFactory
+          APPLIERS_BY_TYPE = {
+            'IPS patch file' => ::Ehbrs::Tools::Vg::Patches::IpsApplier,
+            'VCDIFF binary diff' => ::Ehbrs::Tools::Vg::Patches::VcdiffApplier
+          }.freeze
+
+          enable_simple_cache
+          common_constructor :patch_path do
+            self.patch_path = patch_path.to_pathname
+          end
+          delegate :apply, to: :applier_instance
+
+          # @return [String]
+          def patch_type
+            patch_path.info.description
+          end
+
+          protected
+
+          # @return [Class]
+          def applier_class_uncached
+            APPLIERS_BY_TYPE.fetch(patch_type)
+          end
+
+          # @return [Object]
+          def applier_instance_uncached
+            applier_class.new(patch_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg/patches/base_applier.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        class BaseApplier
+          acts_as_abstract
+          common_constructor :patch_path
+
+          # @param source_path [Pathname]
+          # @param output_path [Pathname]
+          # @raise [RuntimeError] Se o arquivo de saída não é criado.
+          def apply(source_path, output_path)
+            source_path = source_path.to_pathname
+            output_path = output_path.to_pathname
+            command(source_path, output_path).system!
+
+            return if output_path.exist?
+
+            fatal_error("Applier returned without error, but output file \"#{output_path}\"" \
+                        'does not exist')
+          end
+
+          # @param source_path [Pathname]
+          # @param output_path [Pathname]
+          # @return [EacRubyUtils::Envs::Command]
+          def command(source_path, output_path)
+            raise_abstract_method __method__, source_path, output_path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg/patches/ips_applier.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs/tools/executables'
+require 'ehbrs/tools/vg/patches/base_applier'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        class IpsApplier < ::Ehbrs::Tools::Vg::Patches::BaseApplier
+          # @param source_path [Pathname]
+          # @param output_path [Pathname]
+          # @return [EacRubyUtils::Envs::Command]
+          def command(source_path, output_path)
+            ::Ehbrs::Tools::Executables.flips.command
+              .append(['--apply', patch_path, source_path, output_path])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg/patches/temp_files.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        class TempFiles
+          common_constructor :initial, :temp0, :temp1
+
+          def input
+            swaped? ? temp0 : initial
+          end
+
+          def move_result_to(dest)
+            return unless swaped?
+
+            ::FileUtils.mv(temp0.to_path, dest.to_path)
+          end
+
+          def output
+            temp1
+          end
+
+          def swap
+            temp0_current = temp0
+            self.temp0 = temp1
+            self.temp1 = temp0_current
+            @swaped = true
+          end
+
+          def swaped?
+            @swaped ? true : false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg/patches/vcdiff_applier.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs/tools/executables'
+require 'ehbrs/tools/vg/patches/base_applier'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        class VcdiffApplier < ::Ehbrs::Tools::Vg::Patches::BaseApplier
+          # @param source_path [Pathname]
+          # @param output_path [Pathname]
+          # @return [EacRubyUtils::Envs::Command]
+          def command(source_path, output_path)
+            ::Ehbrs::Tools::Executables.xdelta3.command
+              .append(['-d', '-s', source_path, patch_path, output_path])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg/patches.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    module Vg
+      module Patches
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/vg.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Ehbrs
+  module Tools
+    module Vg
+      require_sub __FILE__
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-09 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-files
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: avm-tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.161'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.161'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.42'
+- !ruby/object:Gem::Dependency
+  name: eac_fs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_base0
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 description: 
 email: 
 executables:
@@ -195,7 +223,7 @@ files:
 - lib/ehbrs/tools/runner/telegram.rb
 - lib/ehbrs/tools/runner/telegram/send_message.rb
 - lib/ehbrs/tools/runner/vg.rb
-- lib/ehbrs/tools/runner/vg/ips.rb
+- lib/ehbrs/tools/runner/vg/patch.rb
 - lib/ehbrs/tools/runner/vg/ps2.rb
 - lib/ehbrs/tools/runner/vg/ps2/rename.rb
 - lib/ehbrs/tools/runner/vg/wii.rb
@@ -221,6 +249,13 @@ files:
 - lib/ehbrs/tools/runner/web_utils/videos/download.rb
 - lib/ehbrs/tools/runner/web_utils/videos/upload.rb
 - lib/ehbrs/tools/version.rb
+- lib/ehbrs/tools/vg.rb
+- lib/ehbrs/tools/vg/patches.rb
+- lib/ehbrs/tools/vg/patches/applier_factory.rb
+- lib/ehbrs/tools/vg/patches/base_applier.rb
+- lib/ehbrs/tools/vg/patches/ips_applier.rb
+- lib/ehbrs/tools/vg/patches/temp_files.rb
+- lib/ehbrs/tools/vg/patches/vcdiff_applier.rb
 - lib/ehbrs/user_dirs.rb
 - template/ehbrs/cooking_book/build/base_page/layout.html.erb
 - template/ehbrs/cooking_book/build/index_page/inner.html.erb