avm-git 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447507fccfbdccc90a778e94ea7dbc81e2600cab181994857ee1e2644d80ca9a
-  data.tar.gz: cf78b8c4eb61432fc10369703fdb2309fca8e4c30fb92c2dc507262c30d8c070
+  metadata.gz: 3c527e07290b2c56ad8f4aeb91cdbb3b0f78223dc34c9babf50f372573555d79
+  data.tar.gz: f9cf685952de778334ce13137152065a246bbcd0b95135b627439fee1fdd2a8d
 SHA512:
-  metadata.gz: 2d54484f2a54ca4a8a315e47044f0450acbb74b8f95f39cf9ff2c803600cc7a4d1b08209d3ccb66a3da9070fefb846b71cc3d0cdd8b497e438b76a4bedc1d47e
-  data.tar.gz: ea4c503d46c43fce7d44b38e69792a16c6b380a5a448fbd7e959cbb2e7348123f809ac3b9a52c090a670edca80c98e3ba21ab5157327b8d3a608037b4f8c5f1b
+  metadata.gz: 2685abcc268908517117700c16217f2bd928e0eadb0564f81e7702dd20a7a0fef4273178ebbe7c9baf4b12c93e7c5b0bd2e7e2e1773c6b97d9d1d3d8d2b063ba
+  data.tar.gz: f72d76691c1d21a09fbcb7e2c9f73f802f168734e34575e5c7e3a55f2401005d99b6492739f9a467e7fea30ce13d611f64e1b1a19b41f78ca344c3a474321f2b

data/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/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/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/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/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/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/lib/avm/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.64'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.64.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.64'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.64.2
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,46 +61,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,8 @@ files:
 - lib/avm/git/scms/git/milestones.rb
 - lib/avm/git/scms/git/run_commit.rb
 - lib/avm/git/scms/git_sub_base.rb
+- lib/avm/git/scms/git_sub_base/commit.rb
+- lib/avm/git/scms/git_sub_base/interval.rb
 - lib/avm/git/scms/git_subrepo.rb
 - lib/avm/git/scms/git_subtree.rb
 - lib/avm/git/scms/provider.rb