ehbrs-tools 0.28.2 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27cfd6fd70b80a51d74091e516bcd784cafe2ed0150de7424e865213ef2a6397
-  data.tar.gz: '099eae7fd47b2b34f11417228a16f838033b4dfa3b725bc16363c2a23ccc6ce6'
+  metadata.gz: 644c4ba64fc1a688a62d35b89e6aadb311239b33611e782556931a6b3cf185b5
+  data.tar.gz: a8f8e6f90cdf1746b0996b0c1330f86559ba7bcf62c57df7015103a48a946043
 SHA512:
-  metadata.gz: caf38bb6c3ae4c907aa20761ef390b8ef3371e150ad512758813c8c411c7d24d10c33abf2a263904875c96cd90dc00987ba6127d0b5ef5452f9581594b96e878
-  data.tar.gz: 14096bf6312bde96792b427a71b5eddc03bc044b8fbd11a56e7513b6a72fb517641a0b53a2ce8f01ada21433bb376871af1aa8f6c3bb2cec30bd4ea734cd9ec0
+  metadata.gz: b6fb53198617263ae78fab68ebeae06ab0cb311c2353675defe9dc857d07fff5c93eb237b970910d2f7aa520521b342a74477908ad88dcaf4eb5f6122b00952d
+  data.tar.gz: c41b33ff7bcac502642466954e89ede742a2aca4a7cde650602476ac1bf3602f7756972c12593e346ff274744c3512a16a5604bf60de5ff22616bd242cc80984

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.28.2)
+    ehbrs-tools (0.28.3)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
@@ -20,11 +20,12 @@ PATH
 PATH
   remote: vendor/aranha-parsers
   specs:
-    aranha-parsers (0.8.5)
+    aranha-parsers (0.10.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.7)
       curb (~> 0.9.10)
       eac_ruby_utils (~> 0.74)
+      faraday_middleware
       httpclient (~> 2.8, >= 2.8.3)
       nokogiri (~> 1.12, >= 1.12.4)
       ofx-parser (~> 1.1.0)
@@ -61,7 +62,7 @@ PATH
 PATH
   remote: vendor/eac_fs
   specs:
-    eac_fs (0.5.0)
+    eac_fs (0.7.0)
       content-type
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
@@ -69,7 +70,7 @@ PATH
 PATH
   remote: vendor/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.12.0)
+    eac_ruby_base0 (0.13.1)
       eac_cli (~> 0.22, >= 0.22.2)
       eac_fs (~> 0.3)
       eac_ruby_gems_utils (~> 0.9.6, ~> 0.9)
@@ -78,14 +79,14 @@ PATH
 PATH
   remote: vendor/eac_ruby_gems_utils
   specs:
-    eac_ruby_gems_utils (0.9.6)
-      bundler (~> 2.2, >= 2.2.17)
+    eac_ruby_gems_utils (0.9.8)
+      bundler
       eac_ruby_utils (~> 0.70)
 
 PATH
   remote: vendor/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.76.0)
+    eac_ruby_utils (0.79.0)
       activesupport (>= 4.0)
       addressable (~> 2.6)
       filesize
@@ -101,7 +102,7 @@ PATH
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.12.1)
+    ehbrs_ruby_utils (0.12.2)
       aranha-parsers (~> 0.8, >= 0.8.5)
       avm (~> 0.3, >= 0.3.2)
       eac_fs (~> 0.5)
@@ -130,10 +131,11 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     asciidoctor (2.0.16)
     ast (2.4.2)
-    avm (0.5.0)
+    avm (0.8.0)
+      eac_cli (~> 0.23, >= 0.23.1)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
-      eac_ruby_utils (~> 0.68)
+      eac_ruby_utils (~> 0.77)
       eac_templates (~> 0.1, >= 0.1.1)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.3, >= 1.3.1)
@@ -144,13 +146,43 @@ GEM
       eac_ruby_utils (~> 0.63)
       os
       rouge (~> 3.26)
+    avm-eac_rails_base1 (0.1.2)
+      avm-eac_webapp_base0 (~> 0.1)
+      eac_ruby_utils (~> 0.68)
+    avm-eac_redmine_base0 (0.3.0)
+      avm-eac_rails_base1 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.2)
+      curb (~> 0.9.10)
+      eac_fs (~> 0.4)
+      eac_ruby_utils (~> 0.68)
+    avm-eac_ruby_base1 (0.1.0)
+      avm (~> 0.6)
+      eac_ruby_utils (~> 0.76)
+    avm-eac_ubuntu_base0 (0.2.0)
+      avm (~> 0.7)
+      eac_ruby_utils (~> 0.77, >= 0.77.1)
+      eac_templates (~> 0.2)
     avm-eac_webapp_base0 (0.1.1)
       avm (~> 0.1)
       eac_ruby_utils (~> 0.68)
-    avm-tools (0.108.0)
+    avm-files (0.2.0)
+      avm (~> 0.6)
+      eac_fs (~> 0.5)
+      eac_ruby_utils (~> 0.76)
+      eac_templates (~> 0.2)
+    avm-git (0.1.0)
+      avm-files (~> 0.1)
+      eac_git (~> 0.9)
+      eac_ruby_utils (~> 0.76)
+    avm-tools (0.111.0)
       aranha-parsers (~> 0.4)
       avm (~> 0.1)
       avm-eac_asciidoctor_base0
+      avm-eac_redmine_base0 (~> 0.3)
+      avm-eac_ruby_base1 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.2)
+      avm-files (~> 0.1)
+      avm-git (~> 0.1)
       clipboard (~> 1.3, >= 1.3.3)
       curb (~> 0.9.10)
       eac_ruby_base0 (~> 0.7, >= 0.7.2)
@@ -174,7 +206,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
     dry-inflector (0.2.1)
-    eac_git (0.8.0)
+    eac_git (0.9.0)
       eac_ruby_utils (~> 0.74)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_ruby_gem_support (0.4.0)
@@ -202,12 +234,14 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
     filesize (0.2.0)
     git (1.9.1)
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.3.1)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
@@ -220,14 +254,14 @@ GEM
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
-    os (1.1.1)
+    os (1.1.4)
     parallel (1.21.0)
     parseconfig (1.1.2)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rchardet (1.8.0)
@@ -245,7 +279,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -279,7 +313,7 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-linux

data/lib/ehbrs/tools/runner/fs/selected.rb

@@ -45,7 +45,7 @@ module Ehbrs
           end
 
           def build_dir_uncached
-            parsed.build_dir.if_present(&:to_pathname)
+            parsed.build_dir.if_nil(&:to_pathname)
           end
 
           def run_build?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/fs/traversable'
+require 'eac_fs/traversable'
 require 'ehbrs/vg/wii/file_move'
 require 'ehbrs/vg/wii/game_file'
 
@@ -10,7 +10,7 @@ module Ehbrs
     class Runner
       class Vg
         class Wii
-          include ::EacRubyUtils::Fs::Traversable
+          include ::EacFs::Traversable
 
           runner_with :help do
             desc 'Manipulação de imagens de jogo Wii.'

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

@@ -11,7 +11,7 @@ module Ehbrs
       class Videos
         class Series
           class Rename
-            include ::EacRubyUtils::Fs::Traversable
+            include ::EacFs::Traversable
 
             runner_with :help do
               desc 'Renomeia arquivos de séries.'

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.28.2'
+    VERSION = '0.28.3'
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/fs/traversable'
+require 'eac_fs/traversable'
 require 'eac_ruby_utils/core_ext'
 require 'ehbrs/videos/unsupported/file'
 
@@ -8,7 +8,7 @@ module Ehbrs
   module Videos
     module Unsupported
       class Search
-        include ::EacRubyUtils::Fs::Traversable
+        include ::EacFs::Traversable
         enable_speaker
         enable_simple_cache
 

data/vendor/aranha-parsers/aranha-parsers.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '~> 2.7'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.74'
+  s.add_dependency 'faraday_middleware'
   s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.3'
   s.add_dependency 'nokogiri', '~> 1.12', '>= 1.12.4'
   s.add_dependency 'ofx-parser', '~> 1.1.0'

data/vendor/aranha-parsers/lib/aranha/parsers/base.rb

@@ -11,7 +11,9 @@ module Aranha
       class << self
         def from_content(content)
           ::EacRubyUtils::Fs::Temp.on_file do |path|
-            path.write(content)
+            ::File.open(path.to_s, 'w:UTF-8') do |f|
+              f.write content.force_encoding('UTF-8')
+            end
             r = new(path.to_path)
             r.content
             r

data/vendor/aranha-parsers/lib/aranha/parsers/html/node/default/numeric_support.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/html/node/base'
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Parsers
+    module Html
+      module Node
+        class Default < ::Aranha::Parsers::Html::Node::Base
+          module NumericSupport
+            def integer_value(node, xpath)
+              r = string_value(node, xpath)
+              return nil if r.blank?
+
+              m = /\d+/.match(r)
+              raise "Integer not found in \"#{r}\"" unless m
+
+              m[0].to_i
+            end
+
+            def integer_optional_value(node, xpath)
+              r = string_value(node, xpath)
+              m = /\d+/.match(r)
+              m ? m[0].to_i : nil
+            end
+
+            def float_value(node, xpath)
+              parse_float(node, xpath, true)
+            end
+
+            def float_optional_value(node, xpath)
+              parse_float(node, xpath, false)
+            end
+
+            def us_decimal_value(node, xpath)
+              parse_us_decimal(node, xpath, true)
+            end
+
+            def us_decimal_optional_value(node, xpath)
+              parse_us_decimal(node, xpath, false)
+            end
+
+            private
+
+            def parse_float(node, xpath, required)
+              s = string_value(node, xpath)
+              m = /\d+(?:[\.\,](\d+))?/.match(s)
+              if m
+                m[0].delete('.').tr(',', '.').to_f
+              elsif required
+                raise "Float value not found in \"#{s}\""
+              end
+            end
+
+            def parse_us_decimal(node, xpath, required)
+              s = string_value(node, xpath)
+              m = /\d+(?:[\.\,](\d+))?/.match(s)
+              if m
+                m[0].delete(',').to_f
+              elsif required
+                raise "US decimal value not found in \"#{s}\""
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/html/node/default/string_support.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/html/node/base'
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Parsers
+    module Html
+      module Node
+        class Default < ::Aranha::Parsers::Html::Node::Base
+          module StringSupport
+            def quoted_value(node, xpath)
+              s = string_value(node, xpath)
+              return '' unless s
+
+              m = /\"([^\"]+)\"/.match(s)
+              return m[1] if m
+
+              ''
+            end
+
+            def regxep(node, xpath, pattern)
+              s = string_value(node, xpath)
+              m = pattern.match(s)
+              return m if m
+
+              raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
+            end
+
+            def string_value(node, xpath)
+              if node.at_xpath(xpath)
+                sanitize_string(node.at_xpath(xpath).text)
+              else
+                ''
+              end
+            end
+
+            def string_recursive_value(node, xpath, required = true)
+              root = node.at_xpath(xpath)
+              if root.blank?
+                return nil unless required
+
+                raise "No node found (Xpath: #{xpath})"
+              end
+              result = string_recursive(root)
+              return result if result.present?
+              return nil unless required
+
+              raise "String blank (Xpath: #{xpath})"
+            end
+
+            def string_recursive_optional_value(node, xpath)
+              string_recursive_value(node, xpath, false)
+            end
+
+            private
+
+            def sanitize_string(obj)
+              obj.to_s.tr("\u00A0", ' ').strip
+            end
+
+            def string_recursive(node)
+              return sanitize_string(node.text) if node.is_a?(::Nokogiri::XML::Text)
+
+              s = ''
+              node.children.each do |child|
+                child_s = string_recursive(child)
+                s += ' ' + child_s if child_s.present?
+              end
+              sanitize_string(s)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/html/node/default.rb

@@ -1,71 +1,14 @@
 # frozen_string_literal: true
 
 require 'aranha/parsers/html/node/base'
+require 'eac_ruby_utils/core_ext'
 
 module Aranha
   module Parsers
     module Html
       module Node
         class Default < ::Aranha::Parsers::Html::Node::Base
-          def string_value(node, xpath)
-            if node.at_xpath(xpath)
-              sanitize_string(node.at_xpath(xpath).text)
-            else
-              ''
-            end
-          end
-
-          def string_recursive_value(node, xpath, required = true)
-            root = node.at_xpath(xpath)
-            if root.blank?
-              return nil unless required
-
-              raise "No node found (Xpath: #{xpath})"
-            end
-            result = string_recursive(root)
-            return result if result.present?
-            return nil unless required
-
-            raise "String blank (Xpath: #{xpath})"
-          end
-
-          def string_recursive_optional_value(node, xpath)
-            string_recursive_value(node, xpath, false)
-          end
-
-          def quoted_value(node, xpath)
-            s = string_value(node, xpath)
-            return '' unless s
-
-            m = /\"([^\"]+)\"/.match(s)
-            return m[1] if m
-
-            ''
-          end
-
-          def integer_value(node, xpath)
-            r = string_value(node, xpath)
-            return nil if r.blank?
-
-            m = /\d+/.match(r)
-            raise "Integer not found in \"#{r}\"" unless m
-
-            m[0].to_i
-          end
-
-          def integer_optional_value(node, xpath)
-            r = string_value(node, xpath)
-            m = /\d+/.match(r)
-            m ? m[0].to_i : nil
-          end
-
-          def float_value(node, xpath)
-            parse_float(node, xpath, true)
-          end
-
-          def float_optional_value(node, xpath)
-            parse_float(node, xpath, false)
-          end
+          require_sub __FILE__, include_modules: true
 
           def array_value(node, xpath)
             r = node.xpath(xpath).map { |n| n.text.strip }
@@ -84,41 +27,6 @@ module Aranha
             m = /(\d+) m/.match(join_value(node, xpath))
             m ? m[1].to_i : nil
           end
-
-          def regxep(node, xpath, pattern)
-            s = string_value(node, xpath)
-            m = pattern.match(s)
-            return m if m
-
-            raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
-          end
-
-          private
-
-          def parse_float(node, xpath, required)
-            s = string_value(node, xpath)
-            m = /\d+(?:[\.\,](\d+))?/.match(s)
-            if m
-              m[0].delete('.').tr(',', '.').to_f
-            elsif required
-              raise "Float value not found in \"#{s}\""
-            end
-          end
-
-          def sanitize_string(obj)
-            obj.to_s.tr("\u00A0", ' ').strip
-          end
-
-          def string_recursive(node)
-            return sanitize_string(node.text) if node.is_a?(::Nokogiri::XML::Text)
-
-            s = ''
-            node.children.each do |child|
-              child_s = string_recursive(child)
-              s += ' ' + child_s if child_s.present?
-            end
-            sanitize_string(s)
-          end
         end
       end
     end

data/vendor/aranha-parsers/lib/aranha/parsers/json/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/base'
+require 'json'
+
+module Aranha
+  module Parsers
+    module Json
+      class Base < ::Aranha::Parsers::Base
+        def data
+          default_data
+        end
+
+        def default_data
+          ::JSON.parse(content)
+        end
+      end
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/json.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Parsers
+    module Json
+      require_sub __FILE__
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/source_address/http_get.rb

@@ -3,6 +3,7 @@
 require 'addressable'
 require 'curb'
 require 'aranha/parsers/source_address/fetch_content_error'
+require 'faraday_middleware'
 
 module Aranha
   module Parsers
@@ -32,11 +33,18 @@ module Aranha
           source
         end
 
+        def final_url
+          content unless @final_url
+          @final_url
+        end
+
         def content
-          c = ::Curl::Easy.new(url)
-          c.follow_location = true
-          curl_perform(c)
-          return c.body_str if c.status.to_i == 200
+          conn = ::Faraday.new do |f|
+            f.request :retry # retry transient failures
+            f.response :follow_redirects # follow redirects
+          end
+          c = conn.get(url)
+          return c.body if c.status == 200
 
           raise ::Aranha::Parsers::SourceAddress::FetchContentError,
                 "Get #{url} returned #{c.status.to_i}"
@@ -45,17 +53,6 @@ module Aranha
         def serialize
           url
         end
-
-        private
-
-        def curl_perform(curl)
-          unless curl.perform
-            raise(::Aranha::Parsers::SourceAddress::FetchContentError,
-                  "Curl perform failed (URL: #{url})")
-          end
-        rescue Curl::Err::CurlError => e
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError, "CURL error: #{e.class.name}"
-        end
       end
     end
   end

data/vendor/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.8.5'
+    VERSION = '0.10.0'
   end
 end

data/vendor/eac_fs/lib/eac_fs/patches/object/fs_cache.rb

@@ -5,10 +5,12 @@ require 'eac_fs/patches/module/fs_cache'
 class Object
   # @return [EacFs::Cache]
   def fs_cache
-    self.class.fs_cache.child(fs_cache_object_id)
+    oid = fs_cache_object_id
+    oid = [oid.to_s] unless oid.is_a?(::Enumerable)
+    oid.inject(self.class.fs_cache) { |a, e| a.child(e.to_s) }
   end
 
-  # @return [String]
+  # @return [String, Array<String>]
   def fs_cache_object_id
     raise 'Abstract method hit'
   end