eac_tools 0.93.0 → 0.94.0

data/sub/avm-git/lib/avm/git/runners/base/revisions_test.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/git/revision_test'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        class RevisionsTest
+          runner_with :help do
+            desc 'Test multiple revisions until a error is found.'
+            arg_opt '-c', '--command', 'Command to test instance.'
+            bool_opt '-n', '--no-cache', 'Does not use cache.'
+          end
+
+          def run
+            fatal_error('Repository is dirty') if runner_context.call(:git).dirty?
+
+            return_to_branch_on_end do
+              infov 'Revisions found', revisions.count
+              if revision_with_error
+                warn("First revision with error: #{revision_with_error}")
+              else
+                success('No error found in revisions')
+              end
+            end
+          end
+
+          private
+
+          def return_to_branch_on_end
+            current_branch = runner_context.call(:git).current_branch
+            yield
+          ensure
+            infom "Returning to original branch \"#{current_branch}\""
+            runner_context.call(:git).execute!('checkout', current_branch)
+          end
+
+          def revision_with_error_uncached
+            revision_with_error = nil
+            revisions.each do |revision|
+              revision.banner
+              unless revision.successful?
+                revision_with_error = revision
+                break
+              end
+            end
+            revision_with_error
+          end
+
+          def revisions_uncached
+            runner_context.call(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
+              .each_line.map(&:strip).reverse.map do |sha1|
+              ::Avm::Git::RevisionTest.new(runner_context.call(:git), sha1, test_revision_options)
+            end
+          end
+
+          def test_revision_options
+            { test_command: parsed.command, no_cache: parsed.no_cache? }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        class Subrepo
+          class Check
+            runner_with :help do
+              desc 'Check status of subrepos.'
+              bool_opt '-a', '--all', 'Select all subrepos.'
+              bool_opt '-f', '--fix-parent', 'Fix parent SHA1.'
+              bool_opt '-n', '--no-error', 'Do not exit with error if check fails.'
+              bool_opt '-r', '--remote', 'Check subrepos remote.'
+              pos_arg :subrepos, repeat: true, optional: true
+            end
+
+            def run
+              subrepo_checks.show_result
+              return if parsed.no_error?
+              return unless subrepo_checks.result.error?
+
+              fatal_error 'Failed'
+            end
+
+            private
+
+            def subrepo_checks_uncached
+              r = ::Avm::Git::SubrepoChecks.new(local_repos)
+              r.check_remote = parsed.remote?
+              r.fix_parent = parsed.fix_parent?
+              r.add_all_subrepos if parsed.all?
+              r.add_subrepos(*parsed.subrepos)
+              r
+            end
+
+            def local_repos_uncached
+              ::EacGit::Local.new(runner_context.call(:git))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/runners/base/subrepo/clone.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        class Subrepo
+          class Clone
+            runner_with :help do
+              desc 'Clone git-subrepo repositories.'
+              arg_opt '-b', '--branch', 'Branch.'
+              arg_opt '-d', '--parent-dir', 'Target path\'s parent directory.'
+              pos_arg :url
+              pos_arg :target_path, optional: true
+            end
+
+            def run
+              start_banner
+              clean
+              clone
+            end
+
+            private
+
+            def start_banner
+              infov 'URL', url
+              infov 'Subpath', target_path
+              infov 'Branch', branch
+            end
+
+            def clean
+              infom 'Cleaning...'
+              git.command('subrepo', 'clean', '--all', '--force').system!
+            end
+
+            def clone
+              infom 'Cloning...'
+              infov 'Clone arguments', clone_args
+              git.command(*clone_args).system!
+            end
+
+            delegate :branch, :url, to: :parsed
+
+            def git_uncached
+              ::EacGit::Local.new('.')
+            end
+
+            def clone_args
+              ['subrepo'] + branch.if_present([]) { |v| ['--branch', v] } +
+                if ::File.exist?(target_path)
+                  ['init', target_path, '--remote', url]
+                else
+                  ['clone', url, target_path, '--message', clone_message, '--force']
+                end
+            end
+
+            def clone_message
+              "Subrepo \"#{target_path}\" (#{url})."
+            end
+
+            def repos_name_from_url
+              %r{/([^/]+)\z}.if_match(url, false) { |m| m[1].gsub(/\.git\z/, '') }
+            end
+
+            def target_path
+              parsed.target_path || target_path_from_parent_dir ||
+                fatal_error('No target path specified')
+            end
+
+            def target_path_from_parent_dir
+              return nil unless parsed.parent_dir && repos_name_from_url
+
+              ::File.join(parsed.parent_dir, repos_name_from_url)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/git/scms/git'
+require 'avm/git/subrepo_checks'
+require 'avm/scms/auto_commit/rules/unique'
+require 'avm/scms/auto_commit/for_file'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        class Subrepo
+          class Fix
+            runner_with :help do
+              desc 'Fix git-subrepos\' parent property.'
+            end
+
+            def run
+              loop do
+                break if fix
+
+                amend_each
+                rebase_fixup
+              end
+            end
+
+            private
+
+            def amend_each
+              infov 'Dirty files', local_repos.dirty_files.count
+              local_repos.dirty_files.each do |file|
+                infov '  * Ammending', file.path
+                ::Avm::Scms::AutoCommit::ForFile.new(
+                  git_scm, file.path,
+                  [::Avm::Scms::AutoCommit::Rules::Unique.new]
+                ).run
+              end
+            end
+
+            def fix
+              infom 'Checking/fixing...'
+              c = new_check(true)
+              c.show_result
+              !c.result.error?
+            end
+
+            # @return [Avm::Git::Scms::Git]
+            def git_scm_uncached
+              ::Avm::Git::Scms::Git.new(runner_context.call(:git).root_path)
+            end
+
+            def new_check(fix_parent = false) # rubocop:disable Style/OptionalBooleanParameter
+              r = ::Avm::Git::SubrepoChecks.new(local_repos).add_all_subrepos
+              r.fix_parent = fix_parent
+              r
+            end
+
+            def local_repos_uncached
+              ::EacGit::Local.new(runner_context.call(:git))
+            end
+
+            def rebase_fixup
+              local_repos.command('rebase', '-i', 'origin/master', '--autosquash').envvar(
+                'GIT_SEQUENCE_EDITOR', 'true'
+              ).or(
+                local_repos.command('rebase', '--continue').envvar('GIT_SEQUENCE_EDITOR', 'true')
+              ).system!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/runners/base/subrepo.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        class Subrepo
+          require_sub __FILE__
+          runner_with :help, :subcommands do
+            desc 'Git-subrepo (https://github.com/ingydotnet/git-subrepo) utilities.'
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/git/launcher/base'
+
+module Avm
+  module Git
+    module Runners
+      class Base
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Git utilities for AVM.'
+          arg_opt '-C', '--path', 'Path to Git repository.'
+          subcommands
+        end
+
+        COMMAND_ARGUMENT = 'git'
+
+        # @return [String]
+        def self.command_argument
+          COMMAND_ARGUMENT
+        end
+
+        def repository_path
+          repository_path? ? parsed.path : '.'
+        end
+
+        def repository_path?
+          parsed.path.present?
+        end
+
+        def git
+          @git ||= ::Avm::Git::Launcher::Base.by_root(repository_path)
+        end
+
+        # @return [[EacGit::Local]]
+        def git_repo
+          git.eac_git
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/scms/branch'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Branch < ::Avm::Scms::Branch
+          common_constructor :scm, :eac_git_branch
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def head_commit
+            ::Avm::Git::Scms::Git::Commit.new(scm, eac_git_branch.head_commit)
+          end
+
+          # @return [String]
+          def id
+            eac_git_branch.name
+          end
+
+          # @param remote [Avm::Git::Scms::Git::Remote]
+          def push(remote)
+            eac_git_branch.push(remote.eac_git_remote, force: true)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# 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
+        module Branches
+          # @return [Avm::Git::Scms::Git::Branch]
+          def head_branch
+            ::Avm::Git::Scms::Git::Branch.new(self,
+                                              git_repo.current_branch)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# 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, :commit_info
+          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, commit_info)
+          end
+
+          private
+
+          attr_writer :starting_commit
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFiles
+          enable_method_class
+          common_constructor :scm
+
+          # @return [Avm::Git::Scms::Git::ChangedFile]
+          def result
+            scm.git_repo.dirty_files.map do |dirty_file|
+              ::Avm::Git::Scms::Git::ChangedFile.new(scm, dirty_file.path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/files/appendable'
+require 'avm/files/deploy'
+require 'avm/scms/base'
+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
+          class Deploy
+            include ::Avm::Files::Appendable
+            enable_simple_cache
+
+            attr_reader :build_dir, :commit, :target_env, :target_path
+
+            def initialize(commit, target_env, target_path)
+              @commit = commit
+              @target_env = target_env
+              @target_path = target_path
+            end
+
+            def run
+              fd = ::Avm::Files::Deploy.new(target_env, target_path)
+              fd.append_tar_output_command(git_archive_command)
+              fd.appended.push(*appended)
+              fd.run
+            end
+
+            private
+
+            def git_archive_command
+              commit.git_repo.command('archive', '--format=tar', commit.id)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+require 'avm/git/scms/git/commit/deploy'
+require 'avm/scms/base'
+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
+          module DeployMethods
+            def deploy_to_env_path(target_env, target_path)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(self, target_env, target_path)
+            end
+
+            def deploy_to_url(target_url)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(
+                self,
+                *::Avm::Git::Commit.target_url_to_env_path(target_url)
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+# 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
+          require_sub __FILE__, include_modules: true
+          common_constructor :git_scm, :git_commit do
+            git_commit.assert_argument(::EacGit::Local::Commit, 'git_commit')
+          end
+          delegate :git_repo, to: :git_scm
+          delegate :id, to: :git_commit
+
+          FIXUP_SUBJECT_PATTERN = /\Afixup!/.freeze
+
+          # @return [Array<Pathname>]
+          def changed_files
+            git_commit.changed_files.map { |cf| cf.path.to_pathname }
+          end
+
+          # @return [Boolean]
+          def fixup?
+            FIXUP_SUBJECT_PATTERN.match?(git_commit.subject)
+          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
+
+          # @return [String]
+          delegate :subject, to: :git_commit
+
+          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/commit_dirty.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit_info'
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class CommitDirty
+          enable_method_class
+          # @param commit_info [Avm::Scms::CommitInfo, nil]
+          common_constructor :scm, :commit_info, default: [nil]
+          delegate :git_repo, :head_commit, :run_commit, to: :scm
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def result
+            return nil unless git_repo.dirty?
+
+            run_commit(asserted_commit_info)
+            head_commit
+          end
+
+          private
+
+          def asserted_commit_info
+            r = ::Avm::Scms::CommitInfo.assert(commit_info)
+            r = r.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if r.message.blank?
+            git_repo.dirty_files.inject(r) { |a, e| a.path(e.absolute_path) }
+          end
+        end
+      end
+    end
+  end
+end