eac_tools 0.55.2 → 0.55.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f422d1a69e178f4f0643f72beb0c158f48c2ded6e611953f7c2ee64c8c23aad2
-  data.tar.gz: 33310a5babdc387e1087e5b32a3b40eb9ddc551dd9be0fa1109874debd509029
+  metadata.gz: 75bcf2f6a769a25493968518304b38335efd0d21224bcfec4eb8dd5a8b400332
+  data.tar.gz: 8cb40df71049275a69e8f2b7d2d84dfcfd50409ec9d13ae17ac5db190c65639c
 SHA512:
-  metadata.gz: 2ebc2f2627a4c1d3b36c8149fb9689ba453d4d83e35de12dfb6bd0725b87c8468446c3ed7f20753f60e914910b53ca06e881ff3fbd7eb4514b962632f12a34ab
-  data.tar.gz: ee550bf4b5ccc5c7996a2e816f24a5fe7861e47a2c8c23e2f86c6c455b64651d3de8190b8b0ce6d3ccf1b570a517e5d1af7d3611a7303242872d65b342604985
+  metadata.gz: 0bf07860c18f56f51eaf88a6eb127d9a913634b8c98ecb390dabe76b3157efebc63d2308b1cc8976fbf268c03fb737658fbff27db012fe61443f55deab3486a3
+  data.tar.gz: 9ee0740def2a18d0a89ad44fbb3b2b13a21cd979306f667dd47a8450a45df0aab957f89008cb51da967cfcf4cc352cb7a52c90b32c2bc58de0a706cad834e9d8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.2)
-      avm (~> 0.62)
+    eac_tools (0.55.4)
+      avm (~> 0.64)
       avm-eac_asciidoctor_base0 (~> 0.15)
       avm-eac_generic_base0 (~> 0.10)
       avm-eac_latex_base0 (~> 0.3)
@@ -13,9 +13,10 @@ 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, >= 0.29.1)
+      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-git (~> 0.13)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
 
@@ -119,9 +120,9 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.29.1)
+    avm-eac_ruby_base1 (0.29.2)
       aranha-parsers (~> 0.16)
-      avm (~> 0.62)
+      avm (~> 0.63)
       avm-eac_generic_base0 (~> 0.10)
       eac_ruby_utils (~> 0.112)
 
@@ -165,12 +166,12 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.12.0)
-      avm (~> 0.61)
+    avm-git (0.13.0)
+      avm (~> 0.64)
       avm-files (~> 0.6)
-      eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
-      git (~> 1.13, >= 1.13.1)
+      eac_git (~> 0.14, >= 0.14.1)
+      eac_ruby_utils (~> 0.112)
+      git (~> 1.17, >= 1.17.2)
 
 PATH
   remote: sub/avm-tools
@@ -193,14 +194,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.62.0)
-      aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.30)
+    avm (0.64.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_git (~> 0.14, >= 0.14.1)
+      eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -239,8 +240,8 @@ PATH
 PATH
   remote: sub/eac_git
   specs:
-    eac_git (0.14.0)
-      eac_ruby_utils (~> 0.107)
+    eac_git (0.14.1)
+      eac_ruby_utils (~> 0.112)
       parseconfig (~> 1.1, >= 1.1.2)
 
 PATH
@@ -265,7 +266,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.2)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -334,7 +335,7 @@ GEM
     parslet (2.0.0)
     public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.4.2)
+    rack (3.0.7)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -348,7 +349,7 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,19 +12,18 @@ 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_git', '~> 0.14', '>= 0.14.1'
+  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'
   s.add_dependency 'minitar', '~> 0.9'
 
-  s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'
   s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.24'
   s.add_development_dependency 'avm-git', '~> 0.7'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm/lib/avm/scms/base.rb

@@ -29,6 +29,13 @@ module Avm
         self.class.name.demodulize
       end
 
+      # @return [Pathname]
+      def relative_path_from_parent_scm
+        parent_scm.if_present(nil) do |v|
+          path.relative_path_from(v.path)
+        end
+      end
+
       # @return [Enumerable<Avm::Scms::Base>]
       def subs
         raise_abstract_method __method__

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.64.0'
 end

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

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale,template}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.16'
-  s.add_dependency 'avm', '~> 0.62'
+  s.add_dependency 'avm', '~> 0.63'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 

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.1'
+    VERSION = '0.29.2'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.61'
+  s.add_dependency 'avm', '~> 0.64'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
-  s.add_dependency 'git', '~> 1.13', '>= 1.13.1'
+  s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'git', '~> 1.17', '>= 1.17.2'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'avm/git/scms/git/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          common_constructor :scm, :parent_commit do
+            # parent_commit.assert_argument(::Avm::Git::Scms::Git::Commit, 'parent_commit')
+          end
+
+          delegate :deploy_to_env_path, :fixup?, :id, :merge_with, :reword, :scm_file?, :subject,
+                   :to_s, to: :parent_commit
+
+          # @return [Array<Pathname>]
+          def changed_files
+            parent_commit.changed_files.map do |cf|
+              cf.relative_path_from(scm.relative_path_from_parent_scm)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git_sub_base/commit'
+require 'avm/scms/base'
+require 'avm/scms/interval'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          # @return [Array<Avm::Git::Scms::GitSubBase::Commit>]
+          def commits
+            parent_interval.commits.map do |parent_commit|
+              Avm::Git::Scms::GitSubBase::Commit.new(scm, parent_commit)
+            end
+          end
+
+          # @return [Avm::Git::Scms::Git::Interval]
+          def parent_interval
+            scm.parent_scm.interval(from, to)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git_sub_base.rb

@@ -9,8 +9,17 @@ module Avm
       class GitSubBase < ::Avm::Scms::Base
         enable_abstract_methods
 
-        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
+        delegate :changed_files, :commit_if_change, :current_milestone_base_commit,
                  :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
+
+        # @param from [Avm::Git::Scms::Git::Commit]
+        # @param to [Avm::Git::Scms::Git::Commit]
+        # @return [Avm::Git::Scms::GitSubBase::Interval]
+        def interval(from, to)
+          ::Avm::Git::Scms::GitSubBase::Interval.new(self, from, to)
+        end
+
+        require_sub __FILE__
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.12.0'
+    VERSION = '0.13.0'
   end
 end

data/sub/eac_git/eac_git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,vendor}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.107'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'parseconfig', '~> 1.1', '>= 1.1.2'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'

data/sub/eac_git/lib/eac_git/local/remote.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacGit
   class Local
     class Remote
-      NO_SUCH_REMOTE_CODE = 128
+      NO_SUCH_REMOTE_CODE = 512
 
       enable_simple_cache
       include ::EacGit::RemoteLike

data/sub/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.2
+  version: 0.55.4
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-03-21 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.64'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.64'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ dependencies:
         version: '0.29'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -201,7 +201,7 @@ dependencies:
         version: '0.29'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +236,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: avm-git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -671,6 +685,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
@@ -921,6 +936,8 @@ files:
 - sub/avm-git/lib/avm/git/scms/git/milestones.rb
 - sub/avm-git/lib/avm/git/scms/git/run_commit.rb
 - sub/avm-git/lib/avm/git/scms/git_sub_base.rb
+- sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb
+- sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb
 - sub/avm-git/lib/avm/git/scms/git_subrepo.rb
 - sub/avm-git/lib/avm/git/scms/git_subtree.rb
 - sub/avm-git/lib/avm/git/scms/provider.rb
@@ -1197,6 +1214,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
@@ -1206,6 +1224,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