avm 0.5.0 → 0.6.0

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

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/result'
-require 'eac_ruby_utils/core_ext'
-
-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,89 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/result'
-require 'eac_ruby_utils/core_ext'
-
-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,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-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,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-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,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/subrepo_check'
-require 'eac_ruby_utils/core_ext'
-
-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

data/lib/avm/git.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Git
-    DEFAULT_REMOTE_NAME = 'origin'
-  end
-end