eac_tools 0.55.4 → 0.55.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75bcf2f6a769a25493968518304b38335efd0d21224bcfec4eb8dd5a8b400332
-  data.tar.gz: 8cb40df71049275a69e8f2b7d2d84dfcfd50409ec9d13ae17ac5db190c65639c
+  metadata.gz: 3253c050b8f81f650cfd1ec944cc11f7af824f4510cd3675780abd8dcce14a3d
+  data.tar.gz: a56630daf972f0a82ecadb8b714bdcd0cde14e0d8c9e705d7a795b0e922c7267
 SHA512:
-  metadata.gz: 0bf07860c18f56f51eaf88a6eb127d9a913634b8c98ecb390dabe76b3157efebc63d2308b1cc8976fbf268c03fb737658fbff27db012fe61443f55deab3486a3
-  data.tar.gz: 9ee0740def2a18d0a89ad44fbb3b2b13a21cd979306f667dd47a8450a45df0aab957f89008cb51da967cfcf4cc352cb7a52c90b32c2bc58de0a706cad834e9d8
+  metadata.gz: 4f2f8c718124fb9bb75cac9cc7b80b8d6bee231feb584cb48679a04a36fa43b165388826905178d98c4480a3159329936e278ae4498c3f1cf77d35b8f3cd6c64
+  data.tar.gz: a0610099510bfeb32c86dcec8024441c13a91cdcab4609dd86b24d94fb2df6e0ae9d07d7d8cb6100ba8151543218b0dd3a3f6f8f098c9c8fd1f15825fc337306

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.4)
-      avm (~> 0.64)
+    eac_tools (0.55.5)
+      avm (~> 0.64, >= 0.64.1)
       avm-eac_asciidoctor_base0 (~> 0.15)
-      avm-eac_generic_base0 (~> 0.10)
+      avm-eac_generic_base0 (~> 0.11)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.9)
       avm-eac_rails_base1 (~> 0.8)
-      avm-eac_redmine_base0 (~> 0.18)
+      avm-eac_redmine_base0 (~> 0.18, >= 0.18.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.29, >= 0.29.2)
       avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
@@ -23,7 +23,7 @@ PATH
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.16.0)
+    aranha-parsers (0.17.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.1)
       eac_ruby_utils (~> 0.112)
@@ -47,9 +47,9 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.10.0)
-      avm (~> 0.61)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+    avm-eac_generic_base0 (0.11.0)
+      avm (~> 0.64, >= 0.64.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_latex_base0
@@ -100,15 +100,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.18.0)
-      avm (~> 0.57)
-      avm-eac_generic_base0 (~> 0.8)
+    avm-eac_redmine_base0 (0.18.1)
+      avm (~> 0.64, >= 0.64.1)
+      avm-eac_generic_base0 (~> 0.11)
       avm-eac_rails_base1 (~> 0.8)
-      avm-eac_ubuntu_base0 (~> 0.3)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
-      eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.109)
+      eac_rest (~> 0.7, >= 0.7.2)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -129,9 +129,9 @@ PATH
 PATH
   remote: sub/avm-eac_ubuntu_base0
   specs:
-    avm-eac_ubuntu_base0 (0.4.0)
-      avm (~> 0.57)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_ubuntu_base0 (0.4.1)
+      avm (~> 0.64)
+      eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
 PATH
@@ -194,11 +194,11 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.64.0)
-      aranha-parsers (~> 0.16)
+    avm (0.64.1)
+      aranha-parsers (~> 0.17)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
-      eac_docker (~> 0.6)
+      eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
@@ -225,7 +225,7 @@ PATH
 PATH
   remote: sub/eac_docker
   specs:
-    eac_docker (0.6.0)
+    eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
@@ -283,7 +283,13 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_rest (0.7.1)
+    eac_envs-http (0.1.0)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-multipart (~> 1.0, >= 1.0.4)
+    eac_rest (0.7.2)
+      eac_envs-http (~> 0.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
       faraday (~> 2.7, >= 2.7.4)
@@ -311,7 +317,7 @@ GEM
     faraday-retry (2.1.0)
       faraday (~> 2.0)
     filesize (0.2.0)
-    git (1.17.2)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)

data/lib/eac_tools/version.rb

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

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

@@ -9,6 +9,34 @@ module Aranha
       module Node
         class Default < ::Aranha::Parsers::Html::Node::Base
           module NumericSupport
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
+            def decimal_comma_value(node, xpath)
+              parse_decimal_comma(node, xpath, true)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
+            def decimal_comma_optional_value(node, xpath)
+              parse_decimal_comma(node, xpath, false)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
+            def decimal_dot_value(node, xpath)
+              parse_decimal_dot(node, xpath, true)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
+            def decimal_dot_optional_value(node, xpath)
+              parse_decimal_dot(node, xpath, false)
+            end
+
             def integer_value(node, xpath)
               r = string_value(node, xpath)
               return nil if r.blank?
@@ -33,12 +61,20 @@ module Aranha
               parse_float(node, xpath, false)
             end
 
+            # @deprecated Use {#decimal_dot_value} instead.
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
             def us_decimal_value(node, xpath)
-              parse_us_decimal(node, xpath, true)
+              decimal_dot_value(node, xpath)
             end
 
+            # @deprecated Use {#decimal_dot_optional_value} instead.
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
             def us_decimal_optional_value(node, xpath)
-              parse_us_decimal(node, xpath, false)
+              decimal_dot_optional_value(node, xpath)
             end
 
             private
@@ -53,15 +89,38 @@ module Aranha
               end
             end
 
-            def parse_us_decimal(node, xpath, required)
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @param separator [String]
+            # @param delimiter [String]
+            # @return [Float, nil]
+            def parse_decimal(node, xpath, required, separator, delimiter)
               s = string_value(node, xpath)
-              m = /\d+(?:[\.\,](\d+))?/.match(s)
+              m = /\d+(?:[#{::Regexp.quote(separator + delimiter)}](\d+))?/.match(s)
               if m
-                m[0].delete(',').to_f
+                m[0].delete(delimiter).to_f
               elsif required
-                raise "US decimal value not found in \"#{s}\""
+                raise "decimal [Separator=\"#{separator}, Delimiter=\"#{delimiter}\"] value not " \
+                  "found in \"#{s}\""
               end
             end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @return [Float, nil]
+            def parse_decimal_dot(node, xpath, required)
+              parse_decimal(node, xpath, required, '.', ',')
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @return [Float, nil]
+            def parse_decimal_comma(node, xpath, required)
+              parse_decimal(node, xpath, required, ',', '.')
+            end
           end
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/sub/avm/avm.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.16'
+  s.add_dependency 'aranha-parsers', '~> 0.17'
   s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_docker', '~> 0.6'
+  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.112'

data/sub/avm/lib/avm/docker/image.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/version'
+require 'avm/entries/jobs/with_variables_source'
 require 'eac_ruby_utils/core_ext'
 require 'eac_docker/images/templatized'
 require 'eac_docker/registry'
@@ -8,6 +9,8 @@ require 'eac_docker/registry'
 module Avm
   module Docker
     class Image < ::EacDocker::Images::Templatized
+      prepend ::Avm::Entries::Jobs::WithVariablesSource
+
       DEFAULT_REGISTRY_NAME = 'local'
 
       class << self
@@ -41,14 +44,6 @@ module Avm
         ::EacDocker::Executables.docker.command.append(['push', tag]).system!
       end
 
-      def read_entry(path, options = {})
-        method = path.gsub('.', '_')
-        return send(method) if respond_to?(path, true)
-        return instance.read_entry(path, options) if respond_to?(:instance)
-
-        raise "Method \"#{method}\" not found for entry \"#{path}\""
-      end
-
       def run(instance)
         run_run(instance) if container_exist?(instance)
       end

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

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

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.61'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb

@@ -18,6 +18,12 @@ module Avm
           files.each { |file| file_apply(file) }
         end
 
+        # @param file [Pathname]
+        # @return [Boolean]
+        def match?(file)
+          super(file) || !file.exist?
+        end
+
         def file_apply(file)
           file.write(string_apply(file.read))
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -11,7 +11,6 @@ module Avm
       class DockerImage < ::Avm::Instances::DockerImage
         enable_simple_cache
 
-        BASE_IMAGE = 'ubuntu:20.04'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
         INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.18.0'
+    VERSION = '0.18.1'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template

@@ -1,9 +1,5 @@
 FROM '%%base_image%%'
 USER root
-RUN apt-get update -y
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo tzdata git apt-utils
-RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
-RUN dpkg-reconfigure --frontend noninteractive tzdata
 
 # Redmine / Código-fonte
 RUN echo '%%redmine_source_git_id%%' '%%redmine_user_home%%/redmine_source_git_id'

data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm', '~> 0.64'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'avm-eac_ubuntu_base0'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/sub/avm-eac_ubuntu_base0/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template

@@ -1,6 +1,7 @@
 FROM ubuntu:20.04
 
 # Base system update
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y
 RUN apt-get dist-upgrade -y
 

data/sub/eac_docker/lib/eac_docker/images/templatized.rb

@@ -35,8 +35,12 @@ module EacDocker
 
       protected
 
+      def variables_source
+        self
+      end
+
       def write_in_provide_dir
-        template.apply(self, provide_dir)
+        template.apply(variables_source, provide_dir)
       end
 
       private

data/sub/eac_docker/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.4
+  version: 0.55.5
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.64'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.64.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.64'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.64.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: avm-eac_latex_base0
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +167,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -168,6 +177,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement