avm-tools 0.113.1 → 0.113.2

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

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/ruby'
+
+module Avm
+  module Git
+    class RevisionTest
+      enable_simple_cache
+      enable_speaker
+      common_constructor :git, :sha1, :options
+
+      def banner
+        infov 'Revision to test', sha1
+        ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
+          revision_banner
+        end
+      end
+
+      def successful_label
+        successful?.to_s.send((successful? ? :green : :red))
+      end
+
+      def to_s
+        sha1
+      end
+
+      def successful?
+        successful
+      end
+
+      private
+
+      def checkout_revision
+        infom 'Checking out revision...'
+        git.execute!('checkout', sha1)
+      end
+
+      def commit_uncached
+        ::Avm::Git::Commit.new(git, sha1)
+      end
+
+      def git_absolute_path
+        ::File.expand_path(git.to_s)
+      end
+
+      def revision_banner
+        infov '* Subject', commit.subject
+        infov '* Success?', successful_label
+        infov '* STDOUT', stdout_cache.content_path
+        infov '* STDERR', stderr_cache.content_path
+      end
+
+      def root_cache
+        fs_cache.child(git_absolute_path.parameterize, sha1,
+                       options.fetch(:test_command).to_s.parameterize)
+      end
+
+      def run_test
+        infom "Running test command \"#{::Shellwords.join(test_command_args)}\"" \
+          " on \"#{git_absolute_path}\"..."
+        result = ::EacRubyUtils::Ruby.on_clean_environment { test_command.execute }
+        infom 'Test done'
+        write_result_cache(result)
+      end
+
+      def stdout_cache
+        root_cache.child('stdout')
+      end
+
+      def stderr_cache
+        root_cache.child('stderr')
+      end
+
+      def successful_cache
+        root_cache.child('successful')
+      end
+
+      def successful_uncached
+        if options.fetch(:no_cache) || !successful_cache.cached?
+          checkout_revision
+          run_test
+        end
+        successful_cache.read == 'true'
+      end
+
+      def test_command
+        ::EacRubyUtils::Envs.local.command(*test_command_args).chdir(git.to_s)
+      end
+
+      def test_command_args
+        r = ::Shellwords.split(options.fetch(:test_command).to_s)
+        return r if r.any?
+
+        raise 'No command found'
+      end
+
+      def write_result_cache(result)
+        stdout_cache.write(result[:stdout])
+        stderr_cache.write(result[:stderr])
+        successful_cache.write(result[:exit_code].zero? ? 'true' : 'false')
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/change_tracker.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangeTracker
+          common_constructor :git_scm, :message
+          attr_reader :starting_commit
+          delegate :git_repo, to: :git_scm
+
+          def start
+            raise 'Repository is dirty' if git_repo.dirty?
+
+            self.starting_commit = git_repo.head
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit, nil]
+          def stop
+            git_scm.commit_dirty
+            return nil if starting_commit == git_repo.head
+
+            git_scm.reset_and_commit(starting_commit, message)
+          end
+
+          private
+
+          attr_writer :starting_commit
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/commit.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          common_constructor :git_scm, :git_commit do
+            git_commit.assert_argument(::EacGit::Local::Commit, 'git_commit')
+          end
+          delegate :git_repo, to: :git_scm
+
+          # @return [Array<Pathname>]
+          def changed_files
+            git_commit.changed_files.map { |cf| cf.path.to_pathname }
+          end
+
+          # @param other [Avm::Git::Scms::Git::Commit]
+          # @return [Avm::Git::Scms::Git::Commit]
+          def merge_with(other)
+            validate_clean_and_head
+            raise 'Implemented for only if other is parent' unless
+            other.git_commit == git_commit.parent
+
+            git_scm.reset_and_commit(other.git_commit.parent, other.git_commit.raw_body)
+          end
+
+          def reword(new_message)
+            validate_clean_and_head
+
+            git_repo.command('commit', '--amend', '-m', new_message).execute!
+            self.class.new(git_scm, git_repo.head)
+          end
+
+          # @param path [Pathname]
+          # @return [TrueClass,FalseClass]
+          def scm_file?(path)
+            %w[.gitrepo .gitmodules].any? { |file| file.include?(path.basename.to_path) }
+          end
+
+          private
+
+          def validate_clean_and_head
+            raise 'Implemented for only if repository is no dirty' if git_repo.dirty?
+            raise 'Implemented for only if self is HEAD' unless
+            git_commit == git_repo.head
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git_subrepo'
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        require_sub __FILE__
+        include ::Comparable
+
+        COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
+
+        def <=>(other)
+          git_repo <=> other.git_repo
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commitize(source)
+          if source.is_a?(::Avm::Git::Scms::Git::Commit)
+            return source if source.git_repo == self
+
+            raise 'Not same Git repository'
+          end
+          git_repo.commitize(source).if_present do |v|
+            ::Avm::Git::Scms::Git::Commit.new(self, v)
+          end
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commit_dirty(message = nil)
+          return nil unless git_repo.dirty?
+
+          git_repo.command('add', '.').execute!
+          git_repo.command('commit', '-m',
+                           message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
+          commitize(git_repo.head)
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit,nil]
+        def commit_if_change(message = nil)
+          tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+          tracker.start
+          yield
+          tracker.stop
+        end
+
+        def git_repo
+          @git_repo ||= ::EacGit::Local.new(path)
+        end
+
+        # @return [Avm::Git::Scms::Git::Commit]
+        def reset_and_commit(commit_to_reset, message)
+          git_repo.command('reset', '--soft', commitize(commit_to_reset).git_commit.id).execute!
+          commit_dirty(message)
+        end
+
+        # @return [Enumerable<Avm::Git::Scms::GitSubrepo>]
+        def subs
+          git_repo.subrepos.map do |subrepo|
+            ::Avm::Git::Scms::GitSubrepo.new(subrepo.subpath.expand_path(path))
+          end
+        end
+
+        def valid?
+          path.join('.git').exist?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubrepo < ::Avm::Scms::Base
+        def commit_if_change(_message)
+          nyi
+        end
+
+        def update
+          git_subrepo.command('clean').execute!
+          git_subrepo.command('pull').execute!
+        end
+
+        # @return [EacGit::Local]
+        def git_repo
+          @git_repo ||= ::EacGit::Local.find(path)
+        end
+
+        # @return [EacGit::Local::Subrepo]
+        def git_subrepo
+          @git_subrepo ||= git_repo.subrepo(subpath)
+        end
+
+        # @return [Pathname]
+        def subpath
+          path.expand_path.relative_path_from(git_repo.root_path.expand_path)
+        end
+
+        def valid?
+          path.join('.gitrepo').file?
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/provider.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git'
+require 'avm/git/scms/git_subrepo'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Provider
+        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo].freeze
+
+        def all
+          SCMS
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# 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/sub/avm-git/lib/avm/git/subrepo_check/remote.rb

@@ -0,0 +1,89 @@
+# 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/sub/avm-git/lib/avm/git/subrepo_check/show_result.rb

@@ -0,0 +1,32 @@
+# 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/sub/avm-git/lib/avm/git/subrepo_check.rb

@@ -0,0 +1,38 @@
+# 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/sub/avm-git/lib/avm/git/subrepo_checks.rb

@@ -0,0 +1,59 @@
+# 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/sub/avm-git/lib/avm/git/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    VERSION = '0.3.0'
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    require_sub __FILE__
+
+    DEFAULT_REMOTE_NAME = 'origin'
+  end
+end

data/sub/avm-git/spec/lib/avm/git/auto_commit_path_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit_path'
+
+RSpec.describe ::Avm::Git::AutoCommitPath, git: true do
+  let(:git) { stubbed_git_local_repo }
+
+  describe '#class_name' do
+    {
+      'app/models/mynamespace/the_class.rb' => 'Mynamespace::TheClass',
+      'lib/ruby/lib/cliutils/eac_redmine_base0/activity.rb' => 'Cliutils::EacRedmineBase0::Activity'
+    }.each do |relative_path, expected_class_name|
+      context "when path is \"#{relative_path}\"" do
+        let(:path) { git.root_path.join(relative_path) }
+        let(:instance) { described_class.new(git, path) }
+
+        it { expect(instance.class_name).to eq(expected_class_name) }
+      end
+    end
+  end
+end