eac_tools 0.86.1 → 0.86.2

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

@@ -0,0 +1,47 @@
+# 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 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,31 @@
+# frozen_string_literal: true
+
+require 'avm/scms/interval'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          def initialize(scm, from, to)
+            super(scm, from, to)
+            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,21 @@
+# 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 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,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/remote'
+require 'eac_ruby_utils/core_ext'
+
+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,32 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/remote'
+require 'eac_ruby_utils/core_ext'
+
+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,57 @@
+# 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 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,44 @@
+# 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_modules: true
+        include ::Comparable
+
+        COMMIT_DIRTY_DEFAULT_MESSAGE = 'Dirty files.'
+
+        def <=>(other)
+          git_repo <=> other.git_repo
+        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

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :parent_changed_file
+
+          # @return [Pathname]
+          def path
+            parent_changed_file.path.relative_path_from(scm.relative_path_from_parent_scm)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit'
+require 'avm/git/scms/git/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          common_constructor :scm, :parent_commit
+
+          delegate :deploy_to_env_path, :fixup?, :id, :merge_with, :reword, :scm_file?, :subject,
+                   :to_s, to: :parent_commit
+
+          # @return [Array<Pathname>]
+          def changed_files
+            parent_commit.changed_files.map do |cf|
+              cf.relative_path_from(scm.relative_path_from_parent_scm)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git_sub_base/commit'
+require 'avm/scms/base'
+require 'avm/scms/interval'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class Interval < ::Avm::Scms::Interval
+          # @return [Array<Avm::Git::Scms::GitSubBase::Commit>]
+          def commits
+            parent_interval.commits.map do |parent_commit|
+              Avm::Git::Scms::GitSubBase::Commit.new(scm, parent_commit)
+            end
+          end
+
+          # @return [Avm::Git::Scms::Git::Interval]
+          def parent_interval
+            scm.parent_scm.interval(from, to)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        enable_abstract_methods
+
+        delegate :commit_if_change, :current_milestone_base_commit,
+                 :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
+
+        # @return [Enumerable<Avm::Git::Scms::GitSubBase::ChangedFile>]
+        def changed_files
+          parent_scm.changed_files.map do |parent_changed_file|
+            ::Avm::Git::Scms::GitSubBase::ChangedFile.new(self, parent_changed_file)
+          end
+        end
+
+        # @param from [Avm::Git::Scms::Git::Commit]
+        # @param to [Avm::Git::Scms::Git::Commit]
+        # @return [Avm::Git::Scms::GitSubBase::Interval]
+        def interval(from, to)
+          ::Avm::Git::Scms::GitSubBase::Interval.new(self, from, to)
+        end
+
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git_sub_base'
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubrepo < ::Avm::Git::Scms::GitSubBase
+        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/git_subtree.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/provider'
+require 'avm/git/scms/git_sub_base'
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubtree < ::Avm::Git::Scms::GitSubBase
+        def update
+          # Do nothing
+        end
+
+        def valid?
+          return false unless ::Avm::Git::Scms::Provider
+                                .new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
+
+          (::Avm::Git::Scms::Provider.new.all - [self.class])
+            .lazy.map { |scm_class| scm_class.new(path) }.none?(&:valid?)
+        end
+      end
+    end
+  end
+end

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

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

data/sub/{avm-eac_php_base0/lib/avm/eac_php_base0/source_generators.rb → avm-git/lib/avm/git/scms.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacPhpBase0
-    module SourceGenerators
+  module Git
+    module Scms
       require_sub __FILE__
     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