avm-tools 0.129.0 → 0.129.1

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

@@ -1,55 +0,0 @@
-# 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

@@ -1,73 +0,0 @@
-# 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

@@ -1,39 +0,0 @@
-# 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
-        delegate :commit_if_change, to: :parent_scm
-
-        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

@@ -1,19 +0,0 @@
-# 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

@@ -1,11 +0,0 @@
-# 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

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

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

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

@@ -1,11 +0,0 @@
-# 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

@@ -1,21 +0,0 @@
-# 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

data/sub/avm-git/spec/lib/avm/git/commit/deploy_spec.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/commit'
-require 'avm/git/commit/deploy'
-require 'eac_ruby_utils/fs/temp'
-
-RSpec.describe ::Avm::Git::Commit::Deploy, git: true do
-  class << self
-    FROM_DEPLOY = %w[a.txt b.txt c.txt appended].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
-    NOT_FROM_DEPLOY = %w[to_be_removed].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
-
-    def check_files(from_deploy_exist)
-      if from_deploy_exist
-        check_files_exist(FROM_DEPLOY)
-        check_files_not_exist(NOT_FROM_DEPLOY)
-      else
-        check_files_not_exist(FROM_DEPLOY)
-        check_files_exist(NOT_FROM_DEPLOY)
-      end
-    end
-
-    def check_file_exist(basename)
-      it("expect \"#{basename}\" to exist") { expect(target_dir.join(basename)).to exist }
-    end
-
-    def check_file_not_exist(basename)
-      it("expect \"#{basename}\" to not exist") { expect(target_dir.join(basename)).not_to exist }
-    end
-
-    def check_files_exist(basenames)
-      basenames.each { |basename| check_file_exist(basename) }
-    end
-
-    def check_files_not_exist(basenames)
-      basenames.each { |basename| check_file_not_exist(basename) }
-    end
-  end
-
-  let(:git) { stubbed_git_local_repo }
-
-  let(:commit_sha1) do
-    git.file('a.txt').write('AAA')
-    git.file('b.txt').write('BBB')
-    git.command('add', '.').execute!
-    git.command('commit', '-m', 'First commit.').execute!
-    git.rev_parse('HEAD')
-  end
-
-  let(:appended_dir) do
-    r = ::EacRubyUtils::Fs::Temp.directory
-    r.join('appended.template').write('Needs a %%ABC%% value.')
-    r
-  end
-
-  let(:target_dir) do
-    r = ::EacRubyUtils::Fs::Temp.directory
-    ::FileUtils.touch(r.join('to_be_removed').to_path)
-    r
-  end
-
-  let(:commit) { ::Avm::Git::Commit.new(git, commit_sha1) }
-  let(:variables_source_class) do
-    ::Class.new do
-      attr_reader :abc
-
-      def initialize(abc)
-        @abc = abc
-      end
-    end
-  end
-  let(:variables_source) { variables_source_class.new('Any value') }
-  let(:target_env) { ::EacRubyUtils::Envs.local }
-  let(:instance) do
-    described_class.new(commit, target_env, target_dir).append_templatized_directory(appended_dir)
-                   .append_file_content('c.txt', 'Any content')
-                   .variables_source_set(variables_source)
-  end
-
-  after do
-    appended_dir.remove
-    target_dir.remove
-  end
-
-  context 'without run' do # rubocop:disable RSpec/EmptyExampleGroup
-    check_files(false)
-  end
-
-  context 'with run' do # rubocop:disable RSpec/EmptyExampleGroup
-    before { instance.run }
-
-    check_files(true)
-  end
-end

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/commit/diff_tree_line'
-
-RSpec.describe ::Avm::Git::Commit::DiffTreeLine, git: true do
-  include_examples 'source_target_fixtures', __FILE__ do
-    def source_data(source_file)
-      ::File.read(source_file).each_line.map do |line|
-        described_class.new(line).fields
-      end
-    end
-  end
-end

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out

@@ -1 +0,0 @@
-:000000 100644 0000000000000000000000000000000000000000 f380aec0bd8dd777edac43b11636e46cad04273a A	nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.target.yaml

@@ -1,7 +0,0 @@
----
-- src_mode: '000000'
-  dst_mode: '100644'
-  src_sha1: '0000000000000000000000000000000000000000'
-  dst_sha1: f380aec0bd8dd777edac43b11636e46cad04273a
-  status: A
-  path: nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.source.out

@@ -1 +0,0 @@
-:100644 100644 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8 4a30dfae816b984f05cfb594e0d5958bb8c387ae M	nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.target.yaml

@@ -1,7 +0,0 @@
----
-- src_mode: '100644'
-  dst_mode: '100644'
-  src_sha1: 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8
-  dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
-  status: M
-  path: nomes.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.source.out

@@ -1 +0,0 @@
-:100644 000000 10728718a2915256ab162f1e05178ebff9efa6ce 0000000000000000000000000000000000000000 D	nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.target.yaml

@@ -1,7 +0,0 @@
----
-- src_mode: '100644'
-  dst_mode: '000000'
-  src_sha1: 10728718a2915256ab162f1e05178ebff9efa6ce
-  dst_sha1: '0000000000000000000000000000000000000000'
-  status: D
-  path: nomes3.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.source.out

@@ -1,2 +0,0 @@
-:100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D	nomes.txt
-:000000 100644 0000000000000000000000000000000000000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae A	nomes2.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.target.yaml

@@ -1,13 +0,0 @@
----
-- src_mode: '100644'
-  dst_mode: '000000'
-  src_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
-  dst_sha1: '0000000000000000000000000000000000000000'
-  status: D
-  path: nomes.txt
-- src_mode: '000000'
-  dst_mode: '100644'
-  src_sha1: '0000000000000000000000000000000000000000'
-  dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
-  status: A
-  path: nomes2.txt

data/sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.source.out

@@ -1,2 +0,0 @@
-:100644 000000 4a30dfae816b984f05cfb594e0d5958bb8c387ae 0000000000000000000000000000000000000000 D	nomes2.txt
-:000000 100644 0000000000000000000000000000000000000000 10728718a2915256ab162f1e05178ebff9efa6ce A	nomes3.txt