eac_tools 0.55.5 → 0.55.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3253c050b8f81f650cfd1ec944cc11f7af824f4510cd3675780abd8dcce14a3d
-  data.tar.gz: a56630daf972f0a82ecadb8b714bdcd0cde14e0d8c9e705d7a795b0e922c7267
+  metadata.gz: e176be2d8f0c9e29fbc9ba3503447a80c898236928ee978f1f8e76654d9e9a72
+  data.tar.gz: 1dac337bac73121e65ac2860f120188db5346e432d482e1ee14bfe4fffb1f815
 SHA512:
-  metadata.gz: 4f2f8c718124fb9bb75cac9cc7b80b8d6bee231feb584cb48679a04a36fa43b165388826905178d98c4480a3159329936e278ae4498c3f1cf77d35b8f3cd6c64
-  data.tar.gz: a0610099510bfeb32c86dcec8024441c13a91cdcab4609dd86b24d94fb2df6e0ae9d07d7d8cb6100ba8151543218b0dd3a3f6f8f098c9c8fd1f15825fc337306
+  metadata.gz: 56d88118b427b4287d6927928c4ad0c8b86f1c237630509ded2447e31cbd591333e32fb30093eb48f3f492070d124fae570b91644bff53dbf23611c1fefdc8c5
+  data.tar.gz: 516158a86f663a07d2ed65915ca4f8434e823a7bbfbd429f83c515cb1a3a3052d10549693c50c92d78862b0ce63af8425adde0c1efab0f214e9709171d21d1bd

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.5)
-      avm (~> 0.64, >= 0.64.1)
+    eac_tools (0.55.6)
+      avm (~> 0.64, >= 0.64.2)
       avm-eac_asciidoctor_base0 (~> 0.15)
       avm-eac_generic_base0 (~> 0.11)
       avm-eac_latex_base0 (~> 0.3)
@@ -16,7 +16,7 @@ PATH
       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-git (~> 0.13, >= 0.13.1)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
 
@@ -166,12 +166,12 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.0)
-      avm (~> 0.64)
+    avm-git (0.13.1)
+      avm (~> 0.64, >= 0.64.2)
       avm-files (~> 0.6)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
-      git (~> 1.17, >= 1.17.2)
+      git (~> 1.18)
 
 PATH
   remote: sub/avm-tools
@@ -194,7 +194,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.64.1)
+    avm (0.64.2)
       aranha-parsers (~> 0.17)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
@@ -283,17 +283,15 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.1.0)
+    eac_envs-http (0.2.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_rest (0.7.3)
+      eac_envs-http (~> 0.2)
       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)

data/lib/eac_tools/version.rb

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

data/sub/avm/lib/avm/launcher/paths/logical.rb

@@ -2,13 +2,13 @@
 
 require 'avm/launcher/paths/real'
 require 'avm/launcher/stereotype'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     module Paths
       class Logical
-        include ::Comparable
-        include ::EacRubyUtils::SimpleCache
+        enable_simple_cache
 
         class << self
           def from_h(context, hash)
@@ -17,18 +17,11 @@ module Avm
           end
         end
 
-        attr_reader :context, :real, :logical, :parent_path
-
-        def initialize(context, parent_path, real, logical)
-          @context = context
-          @parent_path = parent_path
-          @real = ::Avm::Launcher::Paths::Real.new(real)
-          @logical = logical
+        common_constructor :context, :parent_path, :real, :logical do
+          self.real = ::Avm::Launcher::Paths::Real.new(real)
         end
 
-        def <=>(other)
-          [logical, real] <=> [other.logical, other.real]
-        end
+        compare_by :logical, :real
 
         def to_s
           logical

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.64.1'
+  VERSION = '0.64.2'
 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.64'
+  s.add_dependency 'avm', '~> 0.64', '>= 0.64.2'
   s.add_dependency 'avm-files', '~> 0.6'
   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_dependency 'git', '~> 1.18'
 
   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/launcher/publish_base.rb

@@ -15,6 +15,8 @@ module Avm
         CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                       local_following].freeze
 
+        DEFAULT_REMOTE_REF = 'master'
+
         REMOTE_UNAVAILABLE_MESSAGES = ['could not resolve host', 'connection timed out',
                                        'no route to host'].map(&:downcase).freeze
 
@@ -108,7 +110,7 @@ module Avm
 
         def remote_sha_uncached
           remote_fetch
-          b = sgit.git.branches["#{remote_name}/master"]
+          b = sgit.git.branches["#{remote_name}/#{remote_ref}"]
           b ? b.gcommit.sha : nil
         end
 
@@ -119,6 +121,11 @@ module Avm
         def remote_name
           ::Avm::Git::Launcher::WarpBase::TARGET_REMOTE
         end
+
+        # @return [String]
+        def remote_ref
+          DEFAULT_REMOTE_REF
+        end
       end
     end
   end

data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb

@@ -7,6 +7,23 @@ module Avm
     module LauncherStereotypes
       class GitSubrepo
         class Publish < ::Avm::Git::Launcher::PublishBase
+          # @return [Pathname]
+          def config_path
+            instance.parent.warped.to_pathname.join(
+              "./#{instance.to_parent_path}",
+              ::Avm::Git::LauncherStereotypes::GitSubrepo::CONFIG_SUBPATH
+            )
+          end
+
+          # @return [EacGit::Local::Subrepo::Config]
+          def config
+            ::EacGit::Local::Subrepo::Config.from_file(config_path)
+          end
+
+          # @return [String]
+          def remote_ref
+            config.remote_branch || super
+          end
         end
       end
     end

data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo.rb

@@ -11,9 +11,11 @@ module Avm
         require_sub __FILE__
         include Avm::Launcher::Stereotype
 
+        CONFIG_SUBPATH = '.gitrepo'
+
         class << self
           def match?(path)
-            File.exist?(path.real.subpath('.gitrepo')) && subrepo_url(path.real) != 'none'
+            File.exist?(path.real.subpath(CONFIG_SUBPATH)) && subrepo_url(path.real) != 'none'
           end
 
           def color
@@ -21,7 +23,7 @@ module Avm
           end
 
           def subrepo_url(path)
-            File.read(path.subpath('.gitrepo')).each_line do |l|
+            File.read(path.subpath(CONFIG_SUBPATH)).each_line do |l|
               m = /remote\s*=\s(.+)/.match(l)
               return m[1] if m
             end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.5
+  version: 0.55.6
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -19,7 +19,7 @@ dependencies:
         version: '0.64'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: 0.64.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.64'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: 0.64.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +255,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -262,6 +265,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement