eac_tools 0.64.0 → 0.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514082c79fd68acecc065cb4bfcac5debaa5e114e3a53e64962888d0b2cb2ebd
-  data.tar.gz: bdbc2be06b220888e839844b9562fed56431c3dd5b70ebc771a18ab5a6809ca1
+  metadata.gz: 8723a175022efba79f604084a0180cbeaf95a4f2505c3eeb40c5bb6e305f3a24
+  data.tar.gz: 64b727ef144842f33fb362a51677c595ec12b9703ec68b7ddc686c93f4429f65
 SHA512:
-  metadata.gz: e6674ee3ea87209102c847f980c389666c0bc02d5e82252bc962beb86cebfa58f0bfcd8ff498ee4bdb7db79b56238953c11f1e02d40f3fa43342589a8ab5d1c6
-  data.tar.gz: 203ae1b9a4a08408f276adf59c5dd4ba0fab61137653200a5c71f3b0620afca96b5b0500b0ec9fe7762e1fcaeed11a4d77b84e6bc46756a89c03b69f454bda46
+  metadata.gz: 5a546f59fb7e0e70180a13ec0cf47a8901b413e017ca5c3118dd6e4485e11dd10d88d1b8e0b49070a1c55972ad51e9ae0b53d8e0d46ea354072e75adbb05d19b
+  data.tar.gz: 185f2fe7167b8f6b338cae914d2763758bd41e9f3aa7b79bcd56131beaab4e96f83dfcf6a2a512ec69afca44063cb58004a4814eeca6c16da19be24c5cff579a

data/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.64.0)
-      avm (~> 0.70)
+    eac_tools (0.65.1)
+      avm (~> 0.71)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
-      avm-eac_postgresql_base0 (~> 0.5)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
       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.146)
-      eac_ruby_utils (~> 0.114)
+      avm-tools (~> 0.147)
+      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
@@ -67,9 +67,9 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.5.0)
-      avm (~> 0.70)
-      eac_ruby_utils (~> 0.114)
+    avm-eac_postgresql_base0 (0.5.1)
+      avm (~> 0.71)
+      eac_ruby_utils (~> 0.115)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -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
@@ -173,9 +174,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.146.0)
+    avm-tools (0.147.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
-      avm (~> 0.70)
+      avm (~> 0.71)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       avm-files (~> 0.6, >= 0.6.2)
@@ -191,14 +192,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.70.0)
+    avm (0.71.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
       eac_cli (~> 0.33)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.115)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -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.114.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.64.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/avm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'eac_ruby_utils', '~> 0.115'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/data/package.rb

@@ -46,7 +46,7 @@ module Avm
       end
 
       # @param id [Symbol]
-      # @return [Avm::Data::Unit]
+      # @return [Avm::Data::UnitWithCommands]
       def unit(identifier)
         units[identifier.to_sym] || raise("No unit found with identifier \"#{identifier}\"")
       end

data/sub/avm/lib/avm/data/unit.rb

@@ -6,72 +6,43 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Data
     class Unit
-      include ::Avm::Data::Callbacks
-
+      acts_as_abstract(
+        do_clear: [],
+        do_dump: [:dump_path],
+        do_load: [:dump_path],
+        dump_path_extension: []
+      )
       enable_speaker
+      include ::Avm::Data::Callbacks
 
-      %w[dump load].each do |action|
-        method_name = "#{action}_command"
-        class_eval <<~CODE, __FILE__, __LINE__ + 1
-          # Should be overrided.
-          # @return [EacRubyUtils::Envs::Command]
-          def #{method_name}
-            fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
-          end
-        CODE
-      end
-
-      def extension
-        singleton_class.const_get('EXTENSION')
-      rescue NameError
-        ''
-      end
-
-      def name
-        self.class
-      end
-
-      def load_from_directory(directory, identifier)
-        load(unit_on_directory_path(directory, identifier))
-      end
-
-      def dump_to_directory(directory, identifier)
-        dump(unit_on_directory_path(directory, identifier))
+      # @param dump_path [Pathname]
+      # @return [void]
+      def clear
+        run_callbacks(:dump) { do_clear }
       end
 
-      def dump(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def dump(dump_path)
         run_callbacks :dump do
-          infom "Dumping unit \"#{name}\" to \"#{data_path}\"..."
-          do_dump(data_path)
+          infom "Dumping unit \"#{name}\" to \"#{dump_path}\"..."
+          do_dump(dump_path)
         end
       end
 
-      # @return [Struct(:key, :subpath), nil]
-      def installation_files_data
-        nil
-      end
-
-      def load(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def load(dump_path)
         run_callbacks :load do
-          infom "Loading unit \"#{name}\" from \"#{data_path}\"..."
-          do_load(data_path)
+          clear
+          infom "Loading unit \"#{name}\" from \"#{dump_path}\"..."
+          do_load(dump_path)
         end
       end
 
-      protected
-
-      def do_dump(data_path)
-        dump_command.execute!(output_file: data_path)
-      end
-
-      def do_load(data_path)
-        load_command.execute!(input_file: data_path)
-      end
-
-      private
-
-      def unit_on_directory_path(directory, identifier)
-        ::File.join(directory, "#{identifier}#{extension}")
+      # @return [String]
+      def name
+        self.class.name
       end
     end
   end

data/sub/avm/lib/avm/data/unit_with_commands.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/data/callbacks'
+require 'avm/data/unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class UnitWithCommands < ::Avm::Data::Unit
+      acts_as_abstract
+
+      abstract_method :dump_command
+      abstract_method :load_command
+
+      # @return [String]
+      def dump_path_extension
+        singleton_class.const_get('EXTENSION')
+      rescue NameError
+        ''
+      end
+
+      def load_from_directory(directory, identifier)
+        load(unit_on_directory_path(directory, identifier))
+      end
+
+      def dump_to_directory(directory, identifier)
+        dump(unit_on_directory_path(directory, identifier))
+      end
+
+      # @return [Struct(:key, :subpath), nil]
+      def installation_files_data
+        nil
+      end
+
+      protected
+
+      def do_dump(data_path)
+        dump_command.execute!(output_file: data_path)
+      end
+
+      def do_load(data_path)
+        load_command.execute!(input_file: data_path)
+      end
+
+      private
+
+      def unit_on_directory_path(directory, identifier)
+        ::File.join(directory, "#{identifier}#{dump_path_extension}")
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/instances/data/files_unit.rb

@@ -17,8 +17,6 @@ module Avm
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        before_load :clear
-
         # @return [Pathname]
         def files_path
           fs_path_subpath
@@ -33,8 +31,7 @@ module Avm
           instance_command('tar', '-xzf', '-', '-C', files_path)
         end
 
-        def clear
-          infom "Removing all files under #{files_path}..."
+        def do_clear
           instance_command('mkdir', '-p', files_path).execute!
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
         end

data/sub/avm/lib/avm/instances/data/unit.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'avm/data/unit'
+require 'avm/data/unit_with_commands'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module Data
-      class Unit < ::Avm::Data::Unit
+      class Unit < ::Avm::Data::UnitWithCommands
         common_constructor :instance
 
         # @return [Pathname]
         def data_default_dump_path
           instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
-            "#{b}_#{identifier}#{extension}"
+            "#{b}_#{identifier}#{dump_path_extension}"
           end
         end
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.70.0'
+  VERSION = '0.71.0'
 end

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.70'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'avm', '~> 0.71'
+  s.add_dependency 'eac_ruby_utils', '~> 0.115'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb

@@ -12,10 +12,7 @@ module Avm
         TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
           "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
-        before_load :clear
-
-        def clear
-          info 'Clearing database (Dropping all tables)...'
+        def do_clear
           ts = tables
           if ts.empty?
             info 'Database has no tables'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   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/avm-tools/avm-tools.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'avm', '~> 0.70'
+  s.add_dependency 'avm', '~> 0.71'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'