avm-git 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b7580d391f3fe6d59e88a301e63d071c4a51d4e1e1960a876fba7bca5d625a
-  data.tar.gz: 4a62191af73ebe6fbd6b94525ac17fe05187c3ccb0855f97095fc298d5f9f527
+  metadata.gz: c4c0e911bba94f413eb588e697fc1cb9e554c234113525d54074717ac0a5f1c2
+  data.tar.gz: 270016ee525b2fc28b676506b500b0317fcecf091bb0d4c681bb54e65c78f50f
 SHA512:
-  metadata.gz: 4d065d6b802c3d7260ee0983e41a1dbf9e1f6f45c520d91f5aeae41a7c507d885a6bfa336bcb75051a8c9932950efd80d9259d0eea564bb2deb2b130e75cee19
-  data.tar.gz: a957e49c3442c886b75777a9540e30373a4adeeb748b44d2a76dcb013766e4b82d5db76f366195014e21a59ba045b2851ec0a1e0bae37fb60917ffb4ef26db8c
+  metadata.gz: 5a50ed12f4fbc5319220c03a8dd2b18cecd5b95331f65c23278a070eb7b22e04481e24196099efcb95e8dae3a82c870dc24d9a2277122e1f43de507a874edb19
+  data.tar.gz: 43ed4f6abd73fc9b70e47067d7cc91e04fef7981257ae7a1e6ac091fde237e5145b04a81708514307c2e1154b8b2d2eb31e4401f145847500d9bd38580398fb8

data/lib/avm/git/issue/complete/git_subrepos.rb

@@ -9,7 +9,7 @@ module Avm
             return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
 
             infom 'Checking Git subrepos...'
-            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
+            r = ::Avm::Git::Subrepo::Checks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
             r.check_remote = true
             r.result
           end

data/lib/avm/git/runners/base/subrepo/check.rb

@@ -26,7 +26,7 @@ module Avm
             private
 
             def subrepo_checks_uncached
-              r = ::Avm::Git::SubrepoChecks.new(local_repos)
+              r = ::Avm::Git::Subrepo::Checks.new(local_repos)
               r.check_remote = parsed.remote?
               r.fix_parent = parsed.fix_parent?
               r.add_all_subrepos if parsed.all?

data/lib/avm/git/runners/base/subrepo/fix.rb

@@ -45,7 +45,7 @@ module Avm
             end
 
             def new_check(fix_parent = false) # rubocop:disable Style/OptionalBooleanParameter
-              r = ::Avm::Git::SubrepoChecks.new(local_repos).add_all_subrepos
+              r = ::Avm::Git::Subrepo::Checks.new(local_repos).add_all_subrepos
               r.fix_parent = fix_parent
               r
             end

data/lib/avm/git/subrepo/check/parent.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Subrepo
+      class Check
+        module Parent
+          def fix_parent
+            return if parent_result.success?
+
+            info('  Fixing...')
+            self.parent_hash = expected_parent_hash
+            info_banner
+          end
+
+          private
+
+          def expected_parent_hash_uncached
+            subrepo.local.rev_parse("#{last_file_change_rev}^")
+          end
+
+          def last_file_change_rev
+            subrepo.local.command('log', '-n', '1', '--pretty=format:%H', '--',
+                                  subrepo.config_relative_path.to_path).execute!.strip
+          end
+
+          def parent_hash
+            subrepo.parent_commit_id
+          end
+
+          def parent_hash=(new_hash)
+            subrepo.config.parent_commit_id = new_hash
+            subrepo.write_config
+          end
+
+          def parent_hash_ok?
+            return false if expected_parent_hash.blank? || parent_hash.blank?
+
+            expected_parent_hash == parent_hash
+          end
+
+          def parent_result_uncached
+            ::Avm::Result.success_or_error(parent_hash_ok?,
+                                           parent_hash.presence || blank_text)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo/check/remote.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Subrepo
+      class Check
+        module Remote
+          private
+
+          def fetch_uncached
+            subrepo.command('clean').execute!
+            subrepo.command('fetch').execute!
+          end
+
+          def check_remote_disabled?
+            !check_remote?
+          end
+
+          def check_remote_disabled_result
+            ::Avm::Result.neutral('Check remote disabled')
+          end
+
+          def local_descend_remote?
+            local_id.present? && remote_id.present? && subrepo.local.descendant?(local_id,
+                                                                                 remote_id)
+          end
+
+          def local_descend_remote_result
+            ::Avm::Result.pending(remote_result_value)
+          end
+
+          def local_id_uncached
+            fetch
+            subrepo.command('branch', '--force').execute!
+            subrepo.local.rev_parse("subrepo/#{subrepo.subpath}")
+          end
+
+          def remote_descend_local?
+            local_id.present? && remote_id.present? && subrepo.local.descendant?(remote_id,
+                                                                                 local_id)
+          end
+
+          def remote_descend_local_result
+            ::Avm::Result.outdated(remote_result_value)
+          end
+
+          def remote_branches
+            ['', 'refs/heads/', 'refs/tags/'].map { |prefix| "#{prefix}#{subrepo.remote_branch}" }
+          end
+
+          # @return [String, nil]
+          def remote_id_uncached
+            subrepo.remote.ls.then do |ls_result|
+              remote_branches.lazy.map { |b| ls_result[b] }.find(&:present?) ||
+                subrepo.remote_branch
+            end
+          end
+
+          def remote_result_uncached
+            %w[check_remote_disabled same_ids local_descend_remote remote_descend_local]
+              .each do |condition|
+              return send("#{condition}_result") if send("#{condition}?")
+            end
+
+            ::Avm::Result.error(remote_result_value)
+          end
+
+          def remote_result_value
+            local_s = local_id.presence || blank_text
+            remote_s = remote_id.presence || blank_text
+
+            if local_s == remote_s
+              "[L/R=#{local_s}]"
+            else
+              "[L=#{local_s}, R=#{remote_s}]"
+            end
+          end
+
+          def same_ids?
+            local_id.present? && remote_id.present? && local_id == remote_id
+          end
+
+          def same_ids_result
+            ::Avm::Result.success(remote_result_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo/check/show_result.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Subrepo
+      class Check
+        module ShowResult
+          def show_result
+            out(subrepo.subpath.to_path.cyan)
+            out_attr('parent', parent_result.label)
+            run_fix_parent
+            out_attr('remote', remote_result.label)
+            out("\n")
+          end
+
+          def run_fix_parent
+            return unless fix_parent?
+            return unless parent_result.error?
+
+            out('|Fixing...'.white)
+            self.parent_hash = expected_parent_hash
+            out_attr('new parent', parent_result.label)
+          end
+
+          def out_attr(key, value)
+            out("|#{"#{key}=".white}#{value}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo/check.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Subrepo
+      class Check
+        require_sub __FILE__, include_modules: true
+        enable_speaker
+        enable_simple_cache
+
+        BLANK_TEXT = 'BLANK'
+
+        common_constructor :subrepo, :options
+
+        def blank_text
+          BLANK_TEXT
+        end
+
+        def check_remote?
+          options.fetch(:check_remote) ? true : false
+        end
+
+        def fix_parent?
+          options.fetch(:fix_parent) ? true : false
+        end
+
+        private
+
+        def result_uncached
+          return ::Avm::Result.error('Parent failed') if parent_result.error?
+          return ::Avm::Result.error('Remote failed') if remote_result.error?
+
+          ::Avm::Result.success('Parent and remote ok')
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo/checks.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Subrepo
+      class Checks
+        enable_speaker
+        enable_simple_cache
+        attr_accessor :check_remote, :fix_parent
+
+        common_constructor :repository
+
+        def add_all_subrepos
+          add_subrepos(
+            *repository.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+            .select(&:present?)
+          )
+        end
+
+        def add_subrepos(*subpath_list)
+          subpath_list.each do |subpath|
+            subpaths.add(subpath)
+          end
+          reset_cache
+          self
+        end
+
+        def check_options
+          { fix_parent: fix_parent, check_remote: check_remote }
+        end
+
+        def show_result
+          checks.each(&:show_result)
+          infov 'Result', result.label
+        end
+
+        private
+
+        def checks_uncached
+          subpaths.map do |subpath|
+            ::Avm::Git::Subrepo::Check.new(repository.subrepo(subpath), check_options)
+          end
+        end
+
+        def result_uncached
+          error_count = checks.count { |check| check.result.error? }
+          ::Avm::Result.success_or_error(
+            error_count.zero?,
+            "#{error_count} of #{checks.count} subrepos failed"
+          )
+        end
+
+        def subpaths
+          @subpaths ||= ::Set.new
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.22.0'
+    VERSION = '0.23.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Put here the authors
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -218,11 +218,11 @@ files:
 - lib/avm/git/scms/git_subrepo.rb
 - lib/avm/git/scms/git_subtree.rb
 - lib/avm/git/scms/provider.rb
-- lib/avm/git/subrepo_check.rb
-- lib/avm/git/subrepo_check/parent.rb
-- lib/avm/git/subrepo_check/remote.rb
-- lib/avm/git/subrepo_check/show_result.rb
-- lib/avm/git/subrepo_checks.rb
+- lib/avm/git/subrepo/check.rb
+- lib/avm/git/subrepo/check/parent.rb
+- lib/avm/git/subrepo/check/remote.rb
+- lib/avm/git/subrepo/check/show_result.rb
+- lib/avm/git/subrepo/checks.rb
 - lib/avm/git/vendor/github.rb
 - lib/avm/git/version.rb
 - locale/en.yml

data/lib/avm/git/subrepo_check/parent.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Git
-    class SubrepoCheck
-      module Parent
-        def fix_parent
-          return if parent_result.success?
-
-          info('  Fixing...')
-          self.parent_hash = expected_parent_hash
-          info_banner
-        end
-
-        private
-
-        def expected_parent_hash_uncached
-          subrepo.local.rev_parse("#{last_file_change_rev}^")
-        end
-
-        def last_file_change_rev
-          subrepo.local.command('log', '-n', '1', '--pretty=format:%H', '--',
-                                subrepo.config_relative_path.to_path).execute!.strip
-        end
-
-        def parent_hash
-          subrepo.parent_commit_id
-        end
-
-        def parent_hash=(new_hash)
-          subrepo.config.parent_commit_id = new_hash
-          subrepo.write_config
-        end
-
-        def parent_hash_ok?
-          return false if expected_parent_hash.blank? || parent_hash.blank?
-
-          expected_parent_hash == parent_hash
-        end
-
-        def parent_result_uncached
-          ::Avm::Result.success_or_error(parent_hash_ok?,
-                                         parent_hash.presence || blank_text)
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/subrepo_check/remote.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Git
-    class SubrepoCheck
-      module Remote
-        private
-
-        def fetch_uncached
-          subrepo.command('clean').execute!
-          subrepo.command('fetch').execute!
-        end
-
-        def check_remote_disabled?
-          !check_remote?
-        end
-
-        def check_remote_disabled_result
-          ::Avm::Result.neutral('Check remote disabled')
-        end
-
-        def local_descend_remote?
-          local_id.present? && remote_id.present? && subrepo.local.descendant?(local_id, remote_id)
-        end
-
-        def local_descend_remote_result
-          ::Avm::Result.pending(remote_result_value)
-        end
-
-        def local_id_uncached
-          fetch
-          subrepo.command('branch', '--force').execute!
-          subrepo.local.rev_parse("subrepo/#{subrepo.subpath}")
-        end
-
-        def remote_descend_local?
-          local_id.present? && remote_id.present? && subrepo.local.descendant?(remote_id, local_id)
-        end
-
-        def remote_descend_local_result
-          ::Avm::Result.outdated(remote_result_value)
-        end
-
-        def remote_branches
-          ['', 'refs/heads/', 'refs/tags/'].map { |prefix| "#{prefix}#{subrepo.remote_branch}" }
-        end
-
-        def remote_id_uncached
-          ls_result = subrepo.remote.ls
-          remote_branches.each do |b|
-            return ls_result[b] if ls_result[b].present?
-          end
-          nil
-        end
-
-        def remote_result_uncached
-          %w[check_remote_disabled same_ids local_descend_remote remote_descend_local]
-            .each do |condition|
-            return send("#{condition}_result") if send("#{condition}?")
-          end
-
-          ::Avm::Result.error(remote_result_value)
-        end
-
-        def remote_result_value
-          local_s = local_id.presence || blank_text
-          remote_s = remote_id.presence || blank_text
-
-          if local_s == remote_s
-            "[L/R=#{local_s}]"
-          else
-            "[L=#{local_s}, R=#{remote_s}]"
-          end
-        end
-
-        def same_ids?
-          local_id.present? && remote_id.present? && local_id == remote_id
-        end
-
-        def same_ids_result
-          ::Avm::Result.success(remote_result_value)
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/subrepo_check/show_result.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Git
-    class SubrepoCheck
-      module ShowResult
-        def show_result
-          out(subrepo.subpath.to_path.cyan)
-          out_attr('parent', parent_result.label)
-          run_fix_parent
-          out_attr('remote', remote_result.label)
-          out("\n")
-        end
-
-        def run_fix_parent
-          return unless fix_parent?
-          return unless parent_result.error?
-
-          out('|Fixing...'.white)
-          self.parent_hash = expected_parent_hash
-          out_attr('new parent', parent_result.label)
-        end
-
-        def out_attr(key, value)
-          out("|#{"#{key}=".white}#{value}")
-        end
-      end
-    end
-  end
-end

data/lib/avm/git/subrepo_check.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Git
-    class SubrepoCheck
-      require_sub __FILE__, include_modules: true
-      enable_speaker
-      enable_simple_cache
-
-      BLANK_TEXT = 'BLANK'
-
-      common_constructor :subrepo, :options
-
-      def blank_text
-        BLANK_TEXT
-      end
-
-      def check_remote?
-        options.fetch(:check_remote) ? true : false
-      end
-
-      def fix_parent?
-        options.fetch(:fix_parent) ? true : false
-      end
-
-      private
-
-      def result_uncached
-        return ::Avm::Result.error('Parent failed') if parent_result.error?
-        return ::Avm::Result.error('Remote failed') if remote_result.error?
-
-        ::Avm::Result.success('Parent and remote ok')
-      end
-    end
-  end
-end

data/lib/avm/git/subrepo_checks.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Git
-    class SubrepoChecks
-      enable_speaker
-      enable_simple_cache
-      attr_accessor :check_remote, :fix_parent
-
-      common_constructor :repository
-
-      def add_all_subrepos
-        add_subrepos(
-          *repository.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
-          .select(&:present?)
-        )
-      end
-
-      def add_subrepos(*subpath_list)
-        subpath_list.each do |subpath|
-          subpaths.add(subpath)
-        end
-        reset_cache
-        self
-      end
-
-      def check_options
-        { fix_parent: fix_parent, check_remote: check_remote }
-      end
-
-      def show_result
-        checks.each(&:show_result)
-        infov 'Result', result.label
-      end
-
-      private
-
-      def checks_uncached
-        subpaths.map do |subpath|
-          ::Avm::Git::SubrepoCheck.new(repository.subrepo(subpath), check_options)
-        end
-      end
-
-      def result_uncached
-        error_count = checks.count { |check| check.result.error? }
-        ::Avm::Result.success_or_error(
-          error_count.zero?,
-          "#{error_count} of #{checks.count} subrepos failed"
-        )
-      end
-
-      def subpaths
-        @subpaths ||= ::Set.new
-      end
-    end
-  end
-end