ehbrs-tools 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78056d7a130e8950f026ebe3cf1665570287c56b1786c90d5d5b534d27ce2e2
-  data.tar.gz: e1ddc5d688b88dccc0e744763972c67558d75e403e8d25b26c9c16b8318ebd59
+  metadata.gz: 63748225b0c7e543d9294367c0cc6dae66a1d7c3c8c1149894e2a966516095c1
+  data.tar.gz: 2145d3e7fed0cae5ebaa838c318b106576021947937a6e7935394e63a0a8fc80
 SHA512:
-  metadata.gz: 86648f427adaa4a9b107f12b650332b281455652597c1ab1fc232ca49842b79524c9d2c27ed4077f3e18e03fc63f56e5e7a56963bce5b5ad3699eaea2aa04f30
-  data.tar.gz: b09cbfad7a04969b3cdd4bb616c9ca0de828b654633e0bc3473b9a893923546b30f058541b57132ae5cb8924506a720aa4427d983564088aa4d84894ee4f053e
+  metadata.gz: 0c275d490fd1df345bb785c4bc2d3a04701ee1105bbd3705538dc287865b5c1cfd6b817be7a53c11028ca70068f8bc0d792c753bf4e594f4691b0980b03f680f
+  data.tar.gz: 6e5e0e9fe837702e4b3839263fcf7922757a8c6ac42818ef66273184a41320ca43c0dd6b6accb83682f836d52b3026913c5840422baa3ed56004c58234a19e0e

data/Gemfile.lock

@@ -1,241 +1,237 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.35.0)
-      avm-tools (~> 0.145, >= 0.145.1)
-      eac_cli (~> 0.30, >= 0.30.1)
-      eac_ruby_utils (~> 0.112)
-      ehbrs_ruby_utils (~> 0.21)
+    ehbrs-tools (0.36.0)
+      avm-tools (~> 0.156)
+      eac_cli (~> 0.38)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+      ehbrs_ruby_utils (~> 0.33)
       filesize (~> 0.2)
       inifile (~> 3.0)
       os (~> 1.1, >= 1.1.4)
       telegram-bot-ruby (~> 0.23)
 
-PATH
-  remote: sub/eac_cli
-  specs:
-    eac_cli (0.30.1)
-      colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.112)
-
-PATH
-  remote: sub/eac_docker
-  specs:
-    eac_docker (0.6.0)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
-
-PATH
-  remote: sub/eac_rest
-  specs:
-    eac_rest (0.7.0)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-multipart (~> 1.0, >= 1.0.4)
-
-PATH
-  remote: sub/eac_ruby_base0
-  specs:
-    eac_ruby_base0 (0.17.3)
-      avm-eac_ruby_base1 (~> 0.29)
-      eac_cli (~> 0.30, >= 0.30.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-
-PATH
-  remote: sub/eac_ruby_utils
-  specs:
-    eac_ruby_utils (0.112.0)
-      activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.1)
-      bundler
-      filesize (~> 0.2)
-      net-ssh (~> 4.2)
-
-PATH
-  remote: sub/eac_templates
-  specs:
-    eac_templates (0.3.2)
-      eac_config (~> 0.11, >= 0.11.1)
-      eac_ruby_utils (~> 0.102, >= 0.102.1)
-
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.21.0)
-      aranha (~> 0.19)
-      aranha-parsers (~> 0.15)
-      avm (~> 0.62)
+    ehbrs_ruby_utils (0.33.0)
+      aranha (~> 0.19, >= 0.19.2)
+      aranha-parsers (~> 0.21)
+      aranha-selenium (~> 0.7)
+      avm (~> 0.79)
+      dentaku (~> 3.5, >= 3.5.1)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
+      eac_rest (~> 0.10)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+      eac_templates (~> 0.5)
       taglib-ruby (~> 1.1, >= 1.1.3)
       ultimate_lyrics (~> 0.1, >= 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.2)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha (0.19.0)
-      aranha-parsers (~> 0.15)
+    aranha (0.19.2)
+      aranha-parsers (~> 0.18)
       aranha-selenium (~> 0.5)
-      eac_ruby_utils (~> 0.112)
-    aranha-parsers (0.15.0)
+      eac_ruby_utils (~> 0.116)
+    aranha-parsers (0.21.0)
       activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.1)
-      eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-gzip (~> 0.1)
-      nokogiri (~> 1.14)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_envs-http (~> 0.4)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      nokogiri (~> 1.15, >= 1.15.2)
       ofx-parser (~> 1.1)
-    aranha-selenium (0.5.0)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+    aranha-selenium (0.7.0)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
       selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
-    avm (0.62.0)
-      aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.30)
-      eac_config (~> 0.12)
-      eac_docker (~> 0.5)
+    avm (0.80.0)
+      aranha-parsers (~> 0.21)
+      eac_cli (~> 0.38)
+      eac_config (~> 0.14, >= 0.14.1)
+      eac_docker (~> 0.7)
       eac_fs (~> 0.16)
-      eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.111)
-      eac_templates (~> 0.3, >= 0.3.2)
+      eac_git (~> 0.14, >= 0.14.1)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+      eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
-    avm-eac_generic_base0 (0.10.0)
-      avm (~> 0.61)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
-    avm-eac_ruby_base1 (0.29.0)
-      avm (~> 0.61)
-      avm-eac_generic_base0 (~> 0.10)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
-    avm-eac_ubuntu_base0 (0.4.0)
-      avm (~> 0.57)
-      eac_ruby_utils (~> 0.109)
-      eac_templates (~> 0.3, >= 0.3.2)
-    avm-files (0.6.0)
-      avm (~> 0.52)
-      eac_cli (~> 0.28)
-      eac_fs (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.106)
-      eac_templates (~> 0.3, >= 0.3.2)
-    avm-git (0.12.0)
-      avm (~> 0.61)
-      avm-files (~> 0.6)
-      eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
-      git (~> 1.13, >= 1.13.1)
-    avm-tools (0.145.1)
-      aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.62)
-      avm-eac_ruby_base1 (~> 0.29)
-      avm-eac_ubuntu_base0 (~> 0.4)
-      avm-files (~> 0.6)
-      avm-git (~> 0.12)
+    avm-eac_generic_base0 (0.12.1)
+      avm (~> 0.79)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    avm-eac_ruby_base1 (0.32.1)
+      aranha-parsers (~> 0.21)
+      avm (~> 0.80)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
+      eac_envs-http (~> 0.4, >= 0.4.1)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    avm-eac_ubuntu_base0 (0.5.0)
+      avm (~> 0.77)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      eac_templates (~> 0.5)
+    avm-files (0.6.2)
+      avm (~> 0.67, >= 0.67.1)
+      eac_cli (~> 0.30, >= 0.30.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
+      eac_templates (~> 0.5)
+    avm-git (0.13.4)
+      avm (~> 0.79)
+      avm-files (~> 0.6, >= 0.6.2)
+      eac_git (~> 0.14, >= 0.14.1)
+      eac_ruby_utils (~> 0.119, >= 0.119.1)
+      git (~> 1.18)
+    avm-tools (0.156.0)
+      aranha-parsers (~> 0.21)
+      avm (~> 0.80)
+      avm-eac_ruby_base1 (~> 0.32, >= 0.32.1)
+      avm-eac_ubuntu_base0 (~> 0.5)
+      avm-files (~> 0.6, >= 0.6.2)
+      avm-git (~> 0.13, >= 0.13.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.14)
-      eac_ruby_base0 (~> 0.17, >= 0.17.2)
-      eac_templates (~> 0.3, >= 0.3.2)
-      git (~> 1.13, >= 1.13.1)
-      ruby-progressbar (~> 1.11)
+      eac_git (~> 0.14, >= 0.14.1)
+      eac_ruby_base0 (~> 0.19)
+      eac_templates (~> 0.5)
+      git (~> 1.18)
+      ruby-progressbar (~> 1.13)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.1.1)
     childprocess (3.0.0)
     clipboard (1.3.6)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     content-type (0.0.2)
       parslet (~> 2.0)
     curb (0.9.11)
+    dentaku (3.5.1)
+      concurrent-ruby
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
     dry-inflector (1.0.0)
-    eac_config (0.12.0)
-      addressable (~> 2.8, >= 2.8.1)
-      eac_ruby_utils (~> 0.107)
+    eac_cli (0.38.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.14)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    eac_config (0.14.1)
+      addressable (~> 2.8, >= 2.8.5)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    eac_docker (0.7.0)
+      eac_ruby_utils (~> 0.112)
+      eac_templates (~> 0.3, >= 0.3.2)
+    eac_envs-http (0.4.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.119, >= 0.119.1)
+      faraday (~> 2.7, >= 2.7.10)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (~> 0.1)
+      faraday-multipart (~> 1.0, >= 1.0.4)
+      faraday-retry (~> 2.2)
     eac_fs (0.16.0)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.14.0)
-      eac_ruby_utils (~> 0.107)
+    eac_git (0.14.1)
+      eac_ruby_utils (~> 0.112)
       parseconfig (~> 1.1, >= 1.1.2)
+    eac_rest (0.10.0)
+      eac_envs-http (~> 0.4, >= 0.4.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.119, >= 0.119.1)
+    eac_ruby_base0 (0.19.0)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      eac_cli (~> 0.35)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.117)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    faraday (2.7.4)
+    eac_ruby_utils (0.119.2)
+      activesupport (>= 4, < 7)
+      addressable (~> 2.8, >= 2.8.5)
+      bundler
+      filesize (~> 0.2)
+      net-ssh (~> 4.2)
+    eac_templates (0.5.0)
+      eac_config (~> 0.12)
+      eac_ruby_utils (~> 0.112)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
     faraday-gzip (0.1.0)
       faraday (>= 1.0)
       zlib (~> 2.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
+    faraday-retry (2.2.0)
+      faraday (~> 2.0)
     filesize (0.2.0)
-    git (1.13.1)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.6)
     minitar (0.9)
-    minitest (5.17.0)
+    minitest (5.20.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.1-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.4)
-    parallel (1.22.1)
+    parallel (1.23.0)
     parseconfig (1.1.2)
-    parser (3.2.0.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
     parslet (2.0.0)
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (3.0.4.1)
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rchardet (1.8.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -250,7 +246,7 @@ GEM
     rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
     ruby-filemagic (0.7.3)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     selenium-webdriver (3.142.7)
@@ -273,22 +269,16 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.12)
     zlib (2.1.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  eac_cli!
-  eac_docker!
-  eac_rest!
-  eac_ruby_base0!
-  eac_ruby_gem_support (~> 0.3)
-  eac_ruby_utils!
-  eac_templates!
+  eac_ruby_gem_support (~> 0.5.1)
   ehbrs-tools!
   ehbrs_ruby_utils!
 
 BUNDLED WITH
-   2.3.26
+   2.4.19

data/lib/ehbrs/telegram/message_sending.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/immutable'
 require 'telegram/bot'
 
 module Ehbrs
   module Telegram
     class MessageSending
-      include ::EacRubyUtils::Immutable
+      acts_as_immutable
       immutable_accessor :bot_token, :message
       immutable_accessor :recipient_id, type: :array
 

data/lib/ehbrs/tools/core_ext.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require 'ehbrs/patches'
 require 'eac_ruby_base0/core_ext'

data/lib/ehbrs/tools/runner/cooking_book/build.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs/cooking_book/build'
+require 'ehbrs_ruby_utils/cooking_book/build'
 require 'os'
 
 module Ehbrs
@@ -25,7 +25,7 @@ module Ehbrs
           private
 
           def build_uncached
-            ::Ehbrs::CookingBook::Build.new(
+            ::EhbrsRubyUtils::CookingBook::Build.new(
               runner_context.call(:project), target_dir: parsed.target_dir
             )
           end

data/lib/ehbrs/tools/runner/cooking_book.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'ehbrs/cooking_book/project'
+require 'ehbrs_ruby_utils/cooking_book/project'
 
 module Ehbrs
   module Tools
@@ -24,7 +24,7 @@ module Ehbrs
         end
 
         def project_uncached
-          ::Ehbrs::CookingBook::Project.new(source_dir)
+          ::EhbrsRubyUtils::CookingBook::Project.new(source_dir)
         end
       end
     end

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

@@ -2,8 +2,8 @@
 
 require 'eac_cli/core_ext'
 require 'eac_fs/traversable'
-require 'ehbrs/vg/wii/file_move'
-require 'ehbrs/vg/wii/game_file'
+require 'ehbrs_ruby_utils/vg/wii/file_move'
+require 'ehbrs_ruby_utils/vg/wii/game_file'
 
 module Ehbrs
   module Tools
@@ -45,7 +45,7 @@ module Ehbrs
           def move(game)
             return if move_arg.blank?
 
-            file_move = ::Ehbrs::Vg::Wii::FileMove.new(game, game.format(move_arg))
+            file_move = ::EhbrsRubyUtils::Vg::Wii::FileMove.new(game, game.format(move_arg))
             infov '  * Target path',
                   file_move.target.to_s.colorize(file_move.change? ? :light_white : :light_black)
             file_move.run if confirm?
@@ -60,7 +60,7 @@ module Ehbrs
           end
 
           def traverser_check_file(path)
-            game = ::Ehbrs::Vg::Wii::GameFile.new(path)
+            game = ::EhbrsRubyUtils::Vg::Wii::GameFile.new(path)
             return unless game.valid?
 
             infom game.wit_path

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

@@ -61,10 +61,6 @@ module Ehbrs
             end
 
             def data_uncached
-              ::JSON.parse(raw_content)
-            end
-
-            def raw_content
               runner_context.call(:instance).http_request('/videos/files/export').body
             end
           end

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

@@ -24,7 +24,7 @@ module Ehbrs
               infom "Uploading \"#{type}\" files list..."
               files_list_path = send("#{type}_files_list")
               infov 'Path', files_list_path
-              process_response(upload_request(files_list_path))
+              process_response(files_list_path)
             end
 
             def upload_request(files_list_path)
@@ -40,16 +40,11 @@ module Ehbrs
               )
             end
 
-            def process_response(response)
-              infov 'Response status', response.status
-              if response.status == 200
-                pp ::JSON.parse(response.body)
-              else
-                error_file = '/tmp/ehbrsutils.html'
-                ::File.write(error_file, response.body)
-                system('firefox', error_file)
-                fatal_error('Retornou com status de erro: ' + error_file)
-              end
+            def process_response(files_list_path)
+              upload_request(files_list_path).body
+            rescue ::EhbrsRubyUtils::WebUtils::RequestError => e
+              system('firefox', e.body_file_path.to_path)
+              fatal_error('Retornou com erro: ' + e.message)
             end
 
             def series_files_list_uncached

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.35.0'
+    VERSION = '0.36.0'
   end
 end