eac_tools 0.55.1 → 0.55.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4daef05ed4a65ea9e4d8ec9922eb47d1419ba99d14ec280791f1b387c5bf68df
-  data.tar.gz: 69d71f09d7b2d97523f653f463f4c72acaf2625727ccded7aed36223a0e83637
+  metadata.gz: a5d1418c152dd790a2e5831c10b72496700195606bb8d15f69a2e4a36939b420
+  data.tar.gz: '0959271a81984ccfd30ffe65aaa5537770720443b02511a5c7a3b6464cde0003'
 SHA512:
-  metadata.gz: f1906620490db991897f7a4e7bdff752587d8935884ef5713526999119d201eb82d1a5e6011192133cd9e1e5456f3ecfb22b554ebd72e17354c6a99d63233e00
-  data.tar.gz: 6c5efd979d44070f7fd30afe7135b5e99044e0b94fafbdf017979549dda6b5cadfb9a51615e2c5ca3956475dfe3f316bcde05a75a25e81b5a8346e862b167259
+  metadata.gz: 1f781a034585d43fbf20d9c367e3b3a4f8a0eb4f608143469c267a30bc609c61ac9ee5b406cb24cc2c881a618b7acc79620a53832545b1897763c69a19e850d4
+  data.tar.gz: bfeda693a8d2af8d1741249374cd1536475a5230196c1dd69988871616be4bfc12d319e566086f8974cdc9dd3242f95c35a01b3111e617088ed8911da9f4a11e

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.1)
-      avm (~> 0.62)
+    eac_tools (0.55.3)
+      avm (~> 0.63)
       avm-eac_asciidoctor_base0 (~> 0.15)
       avm-eac_generic_base0 (~> 0.10)
       avm-eac_latex_base0 (~> 0.3)
@@ -13,23 +13,24 @@ PATH
       avm-eac_rails_base1 (~> 0.8)
       avm-eac_redmine_base0 (~> 0.18)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.29)
+      avm-eac_ruby_base1 (~> 0.29, >= 0.29.2)
       avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
       avm-eac_wordpress_base0 (~> 0.3)
       avm-tools (~> 0.145, >= 0.145.1)
-      eac_ruby_utils (~> 0.111)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.14.4)
+    aranha-parsers (0.16.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.1)
-      curb (~> 0.9, >= 0.9.11)
-      eac_ruby_utils (~> 0.106)
+      eac_ruby_utils (~> 0.112)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
-      faraday_middleware (~> 1.2)
-      nokogiri (~> 1.13, >= 1.13.9)
+      faraday-retry (~> 2.1)
+      nokogiri (~> 1.14, >= 1.14.2)
       ofx-parser (~> 1.1)
 
 PATH
@@ -118,10 +119,11 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.29.0)
-      avm (~> 0.61)
+    avm-eac_ruby_base1 (0.29.2)
+      aranha-parsers (~> 0.16)
+      avm (~> 0.63)
       avm-eac_generic_base0 (~> 0.10)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -191,14 +193,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.62.0)
-      aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.30)
+    avm (0.63.0)
+      aranha-parsers (~> 0.16)
+      eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
-      eac_docker (~> 0.5)
+      eac_docker (~> 0.6)
       eac_fs (~> 0.16)
       eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.111)
+      eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -207,10 +209,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.30.0)
+    eac_cli (0.30.1)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/eac_config
@@ -222,8 +224,8 @@ PATH
 PATH
   remote: sub/eac_docker
   specs:
-    eac_docker (0.5.0)
-      eac_ruby_utils (~> 0.104)
+    eac_docker (0.6.0)
+      eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
 PATH
@@ -244,16 +246,16 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.17.2)
+    eac_ruby_base0 (0.17.3)
       avm-eac_ruby_base1 (~> 0.29)
-      eac_cli (~> 0.30)
+      eac_cli (~> 0.30, >= 0.30.1)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.111)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.111.0)
+    eac_ruby_utils (0.112.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -263,7 +265,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -275,13 +277,16 @@ GEM
     ast (2.4.2)
     clipboard (1.3.6)
     colorize (0.8.1)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     content-type (0.0.2)
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_rest (0.6.1)
-      eac_ruby_utils (~> 0.70)
+    eac_rest (0.7.1)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.112)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-multipart (~> 1.0, >= 1.0.4)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
@@ -291,36 +296,21 @@ GEM
     eac_templates (0.3.2)
       eac_config (~> 0.11, >= 0.11.1)
       eac_ruby_utils (~> 0.102, >= 0.102.1)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
     faraday-gzip (0.1.0)
       faraday (>= 1.0)
       zlib (~> 2.1)
-    faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.1.0)
+      faraday (~> 2.0)
     filesize (0.2.0)
-    git (1.13.1)
+    git (1.17.2)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hpricot (0.8.6)
@@ -329,22 +319,22 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     minitar (0.9)
-    minitest (5.17.0)
-    multipart-post (2.2.3)
+    minitest (5.18.0)
+    multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.0-x86_64-linux)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.4)
     parallel (1.22.1)
     parseconfig (1.1.2)
-    parser (3.2.0.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.4.1)
+    rack (3.0.5)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -353,7 +343,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -376,12 +366,12 @@ 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)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
     zlib (2.1.1)
 
 PLATFORMS

data/lib/eac_tools/version.rb

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

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

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport', '>= 4.0.0'
   s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
-  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  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_middleware', '~> 1.2'
-  s.add_dependency 'nokogiri', '~> 1.13', '>= 1.13.9'
+  s.add_dependency 'faraday-retry', '~> 2.1'
+  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.2'
   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/source_address/fetch_content_error.rb

@@ -4,6 +4,12 @@ module Aranha
   module Parsers
     class SourceAddress
       class FetchContentError < ::RuntimeError
+        attr_reader :request
+
+        def initialize(msg, request)
+          super(msg)
+          @request = request
+        end
       end
     end
   end

data/sub/aranha-parsers/lib/aranha/parsers/source_address/hash_http_base.rb

@@ -3,7 +3,8 @@
 require 'aranha/parsers/source_address/fetch_content_error'
 require 'aranha/parsers/source_address/hash_http_base'
 require 'eac_ruby_utils/core_ext'
-require 'faraday_middleware'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'faraday/gzip'
 require 'yaml'
 
@@ -66,8 +67,9 @@ module Aranha
           req = faraday_request
           return req.body if req.status == 200
 
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError,
-                "Get #{url} returned #{req.status.to_i}"
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
+            "Get #{url} returned #{req.status.to_i}", req
+          )
         end
 
         def param(key, default_value)

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'addressable'
-require 'curb'
 require 'aranha/parsers/source_address/fetch_content_error'
-require 'faraday_middleware'
+require 'faraday'
+require 'faraday/retry'
 
 module Aranha
   module Parsers
@@ -46,8 +46,9 @@ module Aranha
           c = conn.get(url)
           return c.body if c.status == 200
 
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError,
-                "Get #{url} returned #{c.status.to_i}"
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
+            "Get #{url} returned #{c.status.to_i}", c
+          )
         end
 
         def serialize

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

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

data/sub/avm/avm.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'eac_cli', '~> 0.30'
+  s.add_dependency 'aranha-parsers', '~> 0.16'
+  s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_docker', '~> 0.5'
+  s.add_dependency 'eac_docker', '~> 0.6'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.111'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

data/sub/avm/lib/avm/sources/base/update.rb

@@ -33,10 +33,6 @@ module Avm
         def update_self_commit_message
           i18n_translate(__method__)
         end
-
-        def update_subs
-          subs.each { |sub| update_sub(sub) }
-        end
       end
     end
   end

data/sub/avm/lib/avm/sources/base/update_subs.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class UpdateSubs
+        enable_method_class
+
+        common_constructor :source
+
+        def result
+          source.subs.each { |sub| source.update_sub(sub) }
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/update_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class UpdateError < ::RuntimeError
+    end
+  end
+end

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

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

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

@@ -12,9 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.61'
+  s.add_dependency 'aranha-parsers', '~> 0.16'
+  s.add_dependency 'avm', '~> 0.63'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.10'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   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

@@ -103,6 +103,8 @@ module Avm
                 "https://rubygems.org/api/v1/versions/#{gem_spec.name}.json"
               ).content
             )
+          rescue ::Aranha::Parsers::SourceAddress::FetchContentError => e
+            e.request.status == 404 ? [] : raise(e)
           end
 
           def gem_version_max_uncached

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/version_file.rb

@@ -11,6 +11,8 @@ module Avm
         VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
 
         def value
+          return nil unless path.file?
+
           path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
         end
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/update.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_generic_base0/sources/base'
+require 'avm/sources/update_error'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -14,6 +15,8 @@ module Avm
 
           def update_self_content
             bundle_update.execute!
+          rescue ::EacRubyUtils::Envs::ExecutionError
+            raise ::Avm::Sources::UpdateError
           end
         end
       end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module Version
+          # @return [Avm::VersionNumber]
+          def version
+            version_file.value.if_present { |v| ::Avm::VersionNumber.new(v) }
+          end
+
+          def version=(value)
+            version_file.value = value
+          end
+
+          # @return [Avm::EacRubyBase1::Rubygems::VersionFile]
+          def version_file
+            ::Avm::EacRubyBase1::Rubygems::VersionFile.new(version_file_path)
+          end
+
+          def version_file_path
+            path.join('lib', *gem_namespace_parts, 'version.rb')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb

@@ -55,24 +55,6 @@ module Avm
         def valid?
           gemfile_path.exist? || gemspec_path.present?
         end
-
-        # @return [Avm::VersionNumber]
-        def version
-          version_file.value.if_present { |v| ::Avm::VersionNumber.new(v) }
-        end
-
-        def version=(value)
-          version_file.value = value
-        end
-
-        # @return [Avm::EacRubyBase1::Rubygems::VersionFile]
-        def version_file
-          ::Avm::EacRubyBase1::Rubygems::VersionFile.new(version_file_path)
-        end
-
-        def version_file_path
-          path.join('lib', *gem_namespace_parts, 'version.rb')
-        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.29.0'
+    VERSION = '0.29.2'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/runner_with_set.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/gems_registry'
+
 module EacCli
   class RunnerWithSet
     class << self

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.30.0'
+  VERSION = '0.30.1'
 end

data/sub/eac_docker/eac_docker.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/eac_docker/lib/eac_docker/container.rb

@@ -24,6 +24,11 @@ module EacDocker
       ).execute!.strip
     end
 
+    # @return [String]
+    def logs
+      ::EacDocker::Executables.docker.command('logs', id).execute!
+    end
+
     def on_detached
       command = ::EacDocker::Executables.docker.command(*(%w[run --detach] + run_command_args))
       self.id = command.execute!.strip

data/sub/eac_docker/lib/eac_docker/rspec/stub_image.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacDocker
+  module Rspec
+    class StubImage
+      include ::ActiveSupport::Callbacks
+      define_callbacks :on_container
+      common_constructor :image
+
+      def build_container
+        image.provide.container.temporary(true)
+      end
+
+      def container
+        raise 'internal container is blank' if internal_container.blank?
+
+        internal_container
+      end
+
+      def on_container(&block)
+        raise 'A container was already created' if internal_container.present?
+
+        build_container.on_detached do |container|
+          self.internal_container = container
+          begin
+            run_callbacks(:on_container, &block)
+          ensure
+            self.internal_container = nil
+          end
+        end
+      end
+
+      private
+
+      attr_accessor :internal_container
+    end
+  end
+end

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

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

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.29'
-  s.add_dependency 'eac_cli', '~> 0.30'
+  s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_ruby_utils', '~> 0.111'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.17.2'
+  VERSION = '0.17.3'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/immutable/hash_accessor.rb

@@ -7,35 +7,46 @@ module EacRubyUtils
   module Immutable
     class HashAccessor < ::EacRubyUtils::Immutable::BaseAccessor
       def apply(klass)
-        apply_get(klass)
-        apply_set(klass)
+        apply_plural(klass)
+        apply_singular(klass)
       end
 
       def immutable_value_get(object)
         super || {}
       end
 
-      def immutable_value_set(object, key, value)
-        duplicate_object(object) do |old_value|
-          (old_value || {}).merge(key => value)
-        end
+      def immutable_value_get_single(object, key)
+        immutable_value_get(object)[key]
+      end
+
+      def immutable_value_set(object, new_hash)
+        duplicate_object(object) { |_old_value| new_hash }
+      end
+
+      def immutable_value_set_single(object, key, value)
+        immutable_value_set(object, immutable_value_get(object).merge(key => value))
       end
 
       private
 
-      def apply_get(klass)
+      def apply_plural(klass)
         accessor = self
-        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do
-          accessor.immutable_value_get(self)
+        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do |*args|
+          case args.count
+          when 0 then next accessor.immutable_value_get(self)
+          when 1 then next accessor.immutable_value_set(self, args[0])
+          else
+            raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 0..1)"
+          end
         end
       end
 
-      def apply_set(klass)
+      def apply_singular(klass)
         accessor = self
         klass.send(:define_method, name) do |*args|
           case args.count
-          when 1 then next accessor.immutable_value_get(self, args[0])
-          when 2 then next accessor.immutable_value_set(self, *args[0..1])
+          when 1 then next accessor.immutable_value_get_single(self, args[0])
+          when 2 then next accessor.immutable_value_set_single(self, *args[0..1])
           else
             raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 1..2)"
           end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.111.0'
+  VERSION = '0.112.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/{immutable_spec.rb → immutable/array_accessor_spec.rb}

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-::RSpec.describe ::EacRubyUtils::Immutable do
+require 'eac_ruby_utils/immutable'
+
+::RSpec.describe ::EacRubyUtils::Immutable::ArrayAccessor do
   let(:stub_class) do
-    the_described_class = described_class
     ::Class.new do
-      include the_described_class
+      include ::EacRubyUtils::Immutable
 
       immutable_accessor :array_attr, type: :array
     end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/immutable/hash_accessor_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/immutable'
+
+::RSpec.describe ::EacRubyUtils::Immutable::HashAccessor do
+  let(:stub_class) do
+    ::Class.new do
+      include ::EacRubyUtils::Immutable
+
+      immutable_accessor :the_hash, type: :hash
+    end
+  end
+
+  let(:initial_instance) { stub_class.new }
+
+  it { expect(initial_instance.the_hashes).to eq({}) }
+  it { expect(initial_instance.the_hash('key_a')).to be_nil }
+
+  context 'when a single value is set' do
+    let(:change1_instance) { initial_instance.the_hash('key_a', 'A') }
+
+    before { change1_instance }
+
+    it { expect(initial_instance.the_hashes).to eq({}) }
+    it { expect(initial_instance.the_hash('key_a')).to be_nil }
+    it { expect(change1_instance.the_hashes).to eq({ 'key_a' => 'A' }) }
+    it { expect(change1_instance.the_hash('key_a')).to eq('A') }
+
+    context 'when all valuesare set' do
+      let(:change2_instance) { initial_instance.the_hashes('key_b' => 'B') }
+
+      before { change2_instance }
+
+      it { expect(change1_instance.the_hashes).to eq({ 'key_a' => 'A' }) }
+      it { expect(change1_instance.the_hash('key_a')).to eq('A') }
+      it { expect(change1_instance.the_hash('key_b')).to be_nil }
+      it { expect(change2_instance.the_hashes).to eq({ 'key_b' => 'B' }) }
+      it { expect(change2_instance.the_hash('key_a')).to be_nil }
+      it { expect(change2_instance.the_hash('key_b')).to eq('B') }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.1
+  version: 0.55.3
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.63'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.63'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.29'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -196,6 +199,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.29'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -256,14 +262,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.111'
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.111'
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -665,6 +671,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/update.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb
@@ -1191,6 +1198,7 @@ files:
 - sub/avm/lib/avm/sources/base/testing.rb
 - sub/avm/lib/avm/sources/base/update.rb
 - sub/avm/lib/avm/sources/base/update_sub.rb
+- sub/avm/lib/avm/sources/base/update_subs.rb
 - sub/avm/lib/avm/sources/base/version_bump.rb
 - sub/avm/lib/avm/sources/configuration.rb
 - sub/avm/lib/avm/sources/configuration/rubocop.rb
@@ -1200,6 +1208,7 @@ files:
 - sub/avm/lib/avm/sources/tests/performer.rb
 - sub/avm/lib/avm/sources/tests/result.rb
 - sub/avm/lib/avm/sources/tests/single.rb
+- sub/avm/lib/avm/sources/update_error.rb
 - sub/avm/lib/avm/sync.rb
 - sub/avm/lib/avm/version.rb
 - sub/avm/lib/avm/version_number.rb
@@ -1344,6 +1353,7 @@ files:
 - sub/eac_docker/lib/eac_docker/registry.rb
 - sub/eac_docker/lib/eac_docker/rspec.rb
 - sub/eac_docker/lib/eac_docker/rspec/setup.rb
+- sub/eac_docker/lib/eac_docker/rspec/stub_image.rb
 - sub/eac_docker/lib/eac_docker/version.rb
 - sub/eac_docker/spec/lib/eac_docker/executables_spec.rb
 - sub/eac_docker/spec/lib/eac_docker/images/coded_spec.rb
@@ -1825,7 +1835,8 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/directory_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb
-- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/immutable_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/immutable/array_accessor_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/immutable/hash_accessor_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/local_time_zone_spec.rb