eac_tools 0.101.1 → 0.101.2

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+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 # rubocop:disable Naming/PredicateMethod
+              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-tools/lib/avm/tools/runner/source/issue.rb → avm-git/lib/avm/git/runners/base/subrepo.rb}

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
-
 module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Issue
+  module Git
+    module Runners
+      class Base
+        class Subrepo
           require_sub __FILE__
           runner_with :help, :subcommands do
-            desc 'Issue operations within source.'
+            desc 'Git-subrepo (https://github.com/ingydotnet/git-subrepo) utilities.'
             subcommands
           end
         end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+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-tools/lib/avm/tools/rspec.rb → avm-git/lib/avm/git/runners.rb}

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils'
-
 module Avm
-  module Tools
-    module Rspec
+  module Git
+    module Runners
       require_sub __FILE__
     end
   end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+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,17 @@
+# frozen_string_literal: true
+
+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,34 @@
+# frozen_string_literal: true
+
+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,25 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :sub_changed_file
+
+          # @return [Pathname]
+          delegate :path, to: :sub_changed_file
+
+          # @return [Symbol]
+          def action
+            return ACTION_ADD if sub_changed_file.add?
+            return ACTION_DELETE if sub_changed_file.delete?
+            return ACTION_MODIFY if sub_changed_file.modify?
+
+            nyi sub_changed_file
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+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)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+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,24 @@
+# frozen_string_literal: true
+
+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,64 @@
+# frozen_string_literal: true
+
+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,32 @@
+# frozen_string_literal: true
+
+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

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Commits
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit(source)
+            if source.is_a?(::Avm::Git::Scms::Git::Commit)
+              return source if source.git_repo == git_repo
+
+              raise 'Not same Git repository'
+            end
+            git_repo.commitize(source).if_present do |v|
+              ::Avm::Git::Scms::Git::Commit.new(self, v)
+            end
+          end
+
+          # @param commit_info [Avm::Scms::CommitInfo]
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def commit_if_change(commit_info = nil)
+            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, commit_info)
+            tracker.start
+            yield
+            tracker.stop
+          end
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def head_commit
+            commit(git_repo.head)
+          end
+
+          # @param commit_info [Avm::Scms::CommitInfo]
+          # @return [Avm::Git::Scms::Git::Commit]
+          def reset_and_commit(commit_to_reset, commit_info)
+            git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
+            commit_dirty(commit_info)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          def initialize(scm, from, to)
+            super
+            self.from = scm.commit(from)
+            self.to = scm.commit(to)
+          end
+
+          # @return [Array<Avm::Git::Scms::Git::Commit>]
+          def commits
+            scm.git_repo.command('log', '--pretty=format:%H', git_commit_interval).execute!
+              .each_line.map { |sha1| scm.commit(sha1.strip) }
+          end
+
+          # @return [String]
+          def git_commit_interval
+            [from.id, to.id].join('..')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Milestones
+          BASE_COMMIT_REFERENCE = 'origin/master'
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def current_milestone_base_commit
+            commit(BASE_COMMIT_REFERENCE)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Remote < ::Avm::Scms::Remote
+          common_constructor :scm, :eac_git_remote
+
+          # @return [String]
+          def id
+            nyi eac_git_remote
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        module Remotes
+          DEFAULT_REMOTE_ID = 'origin'
+
+          # @return [Avm::Git::Scms::Git::Remote]
+          def default_remote
+            remote(default_remote_id)
+          end
+
+          # @return [String]
+          def default_remote_id
+            DEFAULT_REMOTE_ID
+          end
+
+          # @param id [String]
+          # @return [Avm::Git::Scms::Git::Remote]
+          def remote(id)
+            ::Avm::Git::Scms::Git::Remote.new(self, git_repo.remote(id))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class RunCommit
+          enable_method_class
+
+          common_constructor :scm, :commit_info
+
+          # @return [Avm::Git::Scms::Git::Commit]
+          def result
+            reset
+            add_paths
+            commit
+
+            scm.head_commit
+          end
+
+          protected
+
+          def add_path(path)
+            scm.git_repo.command(
+              *(path.exist? ? ['add'] : ['rm', '-f']),
+              path.relative_path_from(scm.path)
+            ).execute!
+          end
+
+          def add_paths
+            commit_info.paths.each { |path| add_path(path) }
+          end
+
+          def commit
+            scm.git_repo.command('commit', *commit_args).execute!
+          end
+
+          # @return [Array<String>]
+          def commit_args
+            r = commit_info.fixup.if_present([]) { |v| ['--fixup', v.id] }
+            r += commit_info.message.if_present([]) { |v| ['--message', v] }
+            return r if r.any?
+
+            raise 'Argument list is empty'
+          end
+
+          def reset
+            scm.git_repo.command('reset', 'HEAD').execute!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        require_sub __FILE__, include_modules: true
+        include ::Comparable
+
+        COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
+
+        def <=>(other)
+          git_repo <=> other.git_repo
+        end
+
+        # @param options [Hash<Symbol, Object>]
+        # @return [Avm::Git::Issues::Complete]
+        def completer(options = {})
+          ::Avm::Git::Issue::Complete.new(self, options)
+        end
+
+        def git_repo
+          @git_repo ||= ::EacGit::Local.new(path)
+        end
+
+        # @param from [Avm::Git::Scms::Git::Commit]
+        # @param to [Avm::Git::Scms::Git::Commit]
+        # @return [Avm::Git::Scms::Git::Interval]
+        def interval(from, to)
+          ::Avm::Git::Scms::Git::Interval.new(self, from, to)
+        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