avm-git 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c465260eb218d03c56e7b83254e448b098fc0c3209a616d21a85e9145dc2dc
-  data.tar.gz: abfe98048c3d3c761dc0aea833dc7c05f48a3f0c385c9797cb68fe7d871ee401
+  metadata.gz: 3c527e07290b2c56ad8f4aeb91cdbb3b0f78223dc34c9babf50f372573555d79
+  data.tar.gz: f9cf685952de778334ce13137152065a246bbcd0b95135b627439fee1fdd2a8d
 SHA512:
-  metadata.gz: 95264dd3e496af3d28533de1b1c439672920eaef5aae55e5972f52f808647f84ea46cce84086fb13857f9d7b8e4be0b50f5065a823c9b383c7621f3a3acf691c
-  data.tar.gz: f2908fe7a9b7e6ee1ce4ca90c2a21df5e08c92a47ce37079df17b19d4a55ce6c93ddba53f99fc31930bd68809f2971cda5174a00397d72a2829684287418ac1e
+  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/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: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-03-31 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.2
   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.2
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -78,20 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement