eac_tools 0.65.0 → 0.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a797b3de79a663eae4d7dc4c3cdc600756b13f53386dbcd88fb4732b195eeb
-  data.tar.gz: 263a4b784e9cb99e1a9c023efdd2f048d4b83dfb73247300f6fe92db97c76dd7
+  metadata.gz: 8723a175022efba79f604084a0180cbeaf95a4f2505c3eeb40c5bb6e305f3a24
+  data.tar.gz: 64b727ef144842f33fb362a51677c595ec12b9703ec68b7ddc686c93f4429f65
 SHA512:
-  metadata.gz: ad1076587dc04620251e5a391e0c169467aaaae2db7c725589322abad1f84c2c14e53056f07db414549e80864b3775e18105d1c3a25a7e2db2fb6c3adcaa97c8
-  data.tar.gz: f38150d6c56ceb13ff86d8c921fa6867a3cb65e4f36050f2fcf790558832f0b4d1641f7fefdc125a276b1cab512538668b8d30396ff5c0bf50cfc5cb0c43c3bc
+  metadata.gz: 5a546f59fb7e0e70180a13ec0cf47a8901b413e017ca5c3118dd6e4485e11dd10d88d1b8e0b49070a1c55972ad51e9ae0b53d8e0d46ea354072e75adbb05d19b
+  data.tar.gz: 185f2fe7167b8f6b338cae914d2763758bd41e9f3aa7b79bcd56131beaab4e96f83dfcf6a2a512ec69afca44063cb58004a4814eeca6c16da19be24c5cff579a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.65.0)
+    eac_tools (0.65.1)
       avm (~> 0.71)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
@@ -13,22 +13,22 @@ PATH
       avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       avm-eac_webapp_base0 (~> 0.17)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
       avm-tools (~> 0.147)
-      eac_ruby_utils (~> 0.115)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.17.1)
+    aranha-parsers (0.18.0)
       activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.3)
-      eac_envs-http (~> 0.3)
-      eac_ruby_utils (~> 0.112)
-      nokogiri (~> 1.14, >= 1.14.2)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_envs-http (~> 0.3, >= 0.3.1)
+      eac_ruby_utils (~> 0.116)
+      nokogiri (~> 1.14, >= 1.14.4)
       ofx-parser (~> 1.1)
 
 PATH
@@ -117,11 +117,12 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.30.2)
-      aranha-parsers (~> 0.17, >= 0.17.1)
-      avm (~> 0.67, >= 0.67.1)
+    avm-eac_ruby_base1 (0.30.3)
+      aranha-parsers (~> 0.18)
+      avm (~> 0.71)
       avm-eac_generic_base0 (~> 0.12)
-      eac_ruby_utils (~> 0.112)
+      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -226,6 +227,18 @@ PATH
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
+PATH
+  remote: sub/eac_envs-http
+  specs:
+    eac_envs-http (0.3.2)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.116)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (~> 0.1)
+      faraday-multipart (~> 1.0, >= 1.0.4)
+      faraday-retry (~> 2.1)
+
 PATH
   remote: sub/eac_fs
   specs:
@@ -261,7 +274,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.115.0)
+    eac_ruby_utils (0.116.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler
@@ -295,14 +308,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.3.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-follow_redirects (~> 0.3)
-      faraday-gzip (~> 0.1)
-      faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.1)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
@@ -335,7 +340,7 @@ GEM
     minitest (5.18.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.4-x86_64-linux)
+    nokogiri (1.15.0-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -413,6 +418,7 @@ DEPENDENCIES
   eac_cli!
   eac_config!
   eac_docker!
+  eac_envs-http!
   eac_fs!
   eac_git!
   eac_rest!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.65.0'
+  VERSION = '0.65.1'
 end

data/sub/aranha-parsers/aranha-parsers.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'activesupport', '>= 4.0.0'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.3'
-  s.add_dependency 'eac_envs-http', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.2'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
+  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.4'
   s.add_dependency 'ofx-parser', '~> 1.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -9,20 +9,25 @@ module Aranha
   module Parsers
     class Base
       class << self
+        # @deprecated Use {#from_string} instead.
+        # @param content [String]
+        # @return [Aranha::Parsers::Base]
         def from_content(content)
+          from_string(content)
+        end
+
+        # @param string [String]
+        # @return [Aranha::Parsers::Base]
+        def from_string(string)
           ::EacRubyUtils::Fs::Temp.on_file do |path|
             ::File.open(path.to_s, 'w:UTF-8') do |f|
-              f.write content.dup.force_encoding('UTF-8')
+              f.write string.dup.force_encoding('UTF-8')
             end
             r = new(path.to_path)
             r.content
             r
           end
         end
-
-        def parse_content(content)
-          from_content(content).data
-        end
       end
 
       LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'

data/sub/aranha-parsers/lib/aranha/parsers/html/base.rb

@@ -19,6 +19,20 @@ module Aranha
             @fields << Field.new(name, type, xpath)
           end
 
+          # @param node [Nokogiri::XML::Node]
+          # @return [Aranha::Parsers::Html::Base]
+          def from_node(node)
+            from_string(node.to_html)
+          end
+
+          # @param haystack [String]
+          # @param needle [String]
+          # @return [String]
+          def xpath_ends_with(haystack, needle)
+            "substring(#{haystack}, string-length(#{haystack}) - string-length(#{needle}) + 1) " \
+              "= #{needle}"
+          end
+
           Field = Struct.new(:name, :type, :xpath)
         end
 

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

@@ -27,16 +27,16 @@ module Aranha
               raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
             end
 
+            # @param node [Nokogiri::XML::Node]
+            # @param xpath [String]
+            # @return [String]
             def string_value(node, xpath)
-              if node.at_xpath(xpath)
-                sanitize_string(node.at_xpath(xpath).text)
-              else
-                ''
-              end
+              found = node_value(node, xpath)
+              found ? sanitize_string(found.text) : ''
             end
 
             def string_recursive_value(node, xpath, required = true)
-              root = node.at_xpath(xpath)
+              root = node_value(node, xpath)
               if root.blank?
                 return nil unless required
 

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

@@ -11,13 +11,13 @@ module Aranha
           require_sub __FILE__, include_modules: true
 
           def array_value(node, xpath)
-            r = node.xpath(xpath).map { |n| n.text.strip }
+            r = node_set_value(node, xpath).map { |n| n.text.strip }
             r.join('|')
           end
 
           def join_value(node, xpath)
             m = ''
-            node.xpath(xpath).each do |n|
+            node_set_value(node, xpath).each do |n|
               m << n.text.strip
             end
             m
@@ -27,6 +27,20 @@ module Aranha
             m = /(\d+) m/.match(join_value(node, xpath))
             m ? m[1].to_i : nil
           end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::NodeSet]
+          def node_set_value(node, xpath)
+            node.xpath(xpath)
+          end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::Node]
+          def node_value(node, xpath)
+            node.at_xpath(xpath)
+          end
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.17.1'
+    VERSION = '0.18.0'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'aranha-parsers', '~> 0.18'
+  s.add_dependency 'avm', '~> 0.71'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
 require 'eac_cli/speaker'
-require 'aranha/parsers/source_address'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
 require 'avm/eac_ruby_base1/launcher/gem'
+require 'eac_envs/http/request'
+require 'eac_envs/http/response'
 
 module Avm
   module EacRubyBase1
@@ -97,14 +97,13 @@ module Avm
             gem_version_max.present? && ::Gem::Version.new(gem_spec.version) < gem_version_max
           end
 
+          # @return [Array]
           def gem_versions_uncached
-            ::JSON.parse!(
-              ::Aranha::Parsers::SourceAddress.detect_sub(
-                "https://rubygems.org/api/v1/versions/#{gem_spec.name}.json"
-              ).content
-            )
-          rescue ::Aranha::Parsers::SourceAddress::FetchContentError => e
-            e.request.status == 404 ? [] : raise(e)
+            ::EacEnvs::Http::Request.new
+              .url("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
+              .response.body_data_or_raise
+          rescue EacEnvs::Http::Response => e
+            e.status == 404 ? [] : raise(e)
           end
 
           def gem_version_max_uncached

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.30.2'
+    VERSION = '0.30.3'
   end
 end

data/sub/eac_envs-http/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/eac_envs-http/eac_envs-http.gemspec

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_envs/http/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_envs-http'
+  s.version     = EacEnvs::Http::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_fs', '~> 0.16'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
+  s.add_dependency 'faraday', '~> 2.7', '>= 2.7.4'
+  s.add_dependency 'faraday-follow_redirects', '~> 0.3'
+  s.add_dependency 'faraday-gzip', '~> 0.1'
+  s.add_dependency 'faraday-multipart', '~> 1.0', '>= 1.0.4'
+  s.add_dependency 'faraday-retry', '~> 2.1'
+
+  s.add_development_dependency 'aranha-parsers', '~> 0.17'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
+end

data/sub/eac_envs-http/lib/eac_envs/http/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacEnvs
+  module Http
+    class Error < ::RuntimeError
+    end
+  end
+end

data/sub/eac_envs-http/lib/eac_envs/http/request/body_field.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_envs/http/request/body_field_value'
+require 'eac_ruby_utils/core_ext'
+require 'faraday/multipart/file_part'
+
+module EacEnvs
+  module Http
+    class Request
+      class BodyField
+        class << self
+          # @return [Array<EacEnvs::Http::Request::BodyField>]
+          def list_from_enumerable(enum)
+            hash = {}
+            enum.each do |v|
+              hash[v[0]] ||= []
+              hash[v[0]] << v[1]
+            end
+            list_from_hash(hash)
+          end
+
+          # @return [Array<EacEnvs::Http::Request::BodyField>]
+          def list_from_hash(hash)
+            hash.map { |k, v| new(k, v) }
+          end
+        end
+
+        common_constructor :key, :values do
+          self.key = key.to_s
+          self.values = (values.is_a?(::Array) ? values.to_a : [values])
+                        .map { |v| ::EacEnvs::Http::Request::BodyFieldValue.new(v) }
+        end
+
+        # @return [String]
+        def hash_key
+          key
+        end
+
+        # @return [Array]
+        def hash_value
+          values.map(&:to_faraday)
+        end
+
+        # @return [Boolean]
+        def with_file?
+          values.any?(&:file?)
+        end
+      end
+    end
+  end
+end

data/sub/eac_envs-http/lib/eac_envs/http/request/body_field_value.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'eac_ruby_utils/core_ext'
+require 'faraday'
+require 'faraday/multipart'
+
+module EacEnvs
+  module Http
+    class Request
+      class BodyFieldValue
+        common_constructor :value
+
+        def to_faraday
+          return value unless file?
+
+          ::Faraday::Multipart::FilePart.new(value, file_mime_type)
+        end
+
+        # @return [Boolean]
+        def file?
+          value.is_a?(::File)
+        end
+
+        # @return [String]
+        def file_mime_type
+          ::EacFs::FileInfo.new(value.path).mime_type
+        end
+      end
+    end
+  end
+end

data/sub/eac_envs-http/lib/eac_envs/http/request/body_fields.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_envs/http/request/body_field'
+
+module EacEnvs
+  module Http
+    class Request
+      class BodyFields
+        common_constructor :source_body
+
+        # @return [Hash, nil]
+        def to_h
+          fields.if_present do |v|
+            v.each_with_object({}) { |e, a| a[e.hash_key] = e.hash_value }
+          end
+        end
+
+        # @return [Array<EacEnvs::Http::Request::BodyField>, nil]
+        def fields
+          source_body.if_present do |v|
+            next nil unless v.is_a?(::Enumerable)
+
+            if v.is_a?(::Hash)
+              ::EacEnvs::Http::Request::BodyField.list_from_hash(v)
+            else
+              ::EacEnvs::Http::Request::BodyField.list_from_enumerable(v)
+            end
+          end
+        end
+
+        # @return [Boolean]
+        def with_file?
+          fields.if_present(false) { |v| v.any?(&:with_file?) }
+        end
+      end
+    end
+  end
+end

data/sub/eac_envs-http/lib/eac_envs/http/request/faraday_connection.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'faraday'
+require 'faraday/follow_redirects'
+require 'faraday/gzip'
+require 'faraday/multipart'
+require 'faraday/retry'
+
+module EacEnvs
+  module Http
+    class Request
+      class FaradayConnection
+        enable_method_class
+        common_constructor :request
+
+        SETUPS = %i[multipart authorization follow_redirect gzip retry].freeze
+
+        # @return [Faraday::Connection]
+        def result
+          ::Faraday.default_connection_options[:headers] = {}
+          ::Faraday::Connection.new(connection_options) do |conn|
+            SETUPS.each { |setup| send("setup_#{setup}", conn) }
+          end
+        end
+
+        private
+
+        # @return [Boolean]
+        def body_with_file?
+          request.body_fields.with_file?
+        end
+
+        # @return [Hash]
+        def connection_options
+          {
+            request: { params_encoder: Faraday::FlatParamsEncoder },
+            ssl: { verify: request.ssl_verify? }
+          }
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_authorization(conn)
+          request.auth.if_present do |v|
+            conn.request :authorization, :basic, v.username, v.password
+          end
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_follow_redirect(conn)
+          conn.response :follow_redirects if request.follow_redirect?
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_gzip(conn)
+          conn.request :gzip
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_multipart(conn)
+          if body_with_file?
+            conn.request :multipart, flat_encode: true
+          else
+            conn.request :url_encoded
+          end
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_retry(conn)
+          conn.request :retry if request.retry?
+        end
+      end
+    end
+  end
+end

data/sub/eac_envs-http/lib/eac_envs/http/request.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'eac_envs/http/response'
+require 'eac_ruby_utils/core_ext'
+
+module EacEnvs
+  module Http
+    class Request
+      BOOLEAN_MODIFIERS = %w[follow_redirect retry ssl_verify].freeze
+      COMMON_MODIFIERS = %w[auth body_data response_body_data_proc url verb].freeze
+      HASH_MODIFIERS = %w[header].freeze
+      MODIFIERS = COMMON_MODIFIERS + BOOLEAN_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
+
+      enable_immutable
+      immutable_accessor(*BOOLEAN_MODIFIERS, type: :boolean)
+      immutable_accessor(*COMMON_MODIFIERS, type: :common)
+      immutable_accessor(*HASH_MODIFIERS, type: :hash)
+
+      enable_listable
+      lists.add_symbol :verb, :get, :delete, :options, :post, :put
+
+      def basic_auth(username, password)
+        auth(::Struct.new(:username, :password).new(username, password))
+      end
+
+      # @return [EacEnvs::Http::Request::BodyFields]
+      def body_fields
+        @body_fields ||= ::EacEnvs::Http::Request::BodyFields.new(body_data)
+      end
+
+      # @return [Faraday::Response]
+      def faraday_response
+        conn = faraday_connection
+        conn.send(sanitized_verb, url) do |req|
+          req.headers = conn.headers.merge(headers)
+          sanitized_body_data.if_present { |v| req.body = v }
+        end
+      end
+
+      def response
+        ::EacEnvs::Http::Response.new(self)
+      end
+
+      # @return [Symbol]
+      def sanitized_verb
+        verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }
+      end
+
+      private
+
+      def sanitized_body_data
+        body_fields.to_h || body_data
+      end
+
+      require_sub __FILE__, require_dependency: true
+    end
+  end
+end