avm-tools 0.113.0 → 0.113.4

data/sub/avm-git/lib/avm/git/issue/complete/working_tree.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module WorkingTree
+          def clean_workspace_result
+            ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+          end
+
+          def clean_workspace?
+            @git.dirty_files.none?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
+        enable_speaker
+
+        attr_reader :skip_validations
+
+        def initialize(options)
+          consumer = ::EacRubyUtils::OptionsConsumer.new(options)
+          dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
+          validate_skip_validations
+          consumer.validate
+          @git = ::Avm::Launcher::Git::Base.new(dir)
+        end
+
+        def start_banner
+          validations_banner
+        end
+
+        def run
+          return false unless valid?
+
+          assert_tag
+          push
+          remove_local_branch
+          clipboard_copy_tracker_message
+          true
+        end
+
+        def issue_id
+          m = branch_name.match(/\A#{Regexp.quote('issue_')}(\d+)\z/)
+          m ? m[1].to_i : nil
+        end
+
+        private
+
+        def git(args, exit_outputs = {})
+          r = @git.execute!(args, exit_outputs: exit_outputs)
+          r.is_a?(String) ? r.strip : r
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+require 'clipboard'
+
+module Avm
+  module Git
+    module Issue
+      class Deliver
+        enable_simple_cache
+        enable_speaker
+
+        common_constructor :git_repo
+
+        def run
+          push
+          clipboard_copy_tracker_message
+          true
+        end
+
+        def start_banner
+          infov 'Branch name', branch_name
+          infov 'Commit ID', branch_commit_id
+          infov 'Push arguments', ::Shellwords.join(push_args)
+        end
+
+        private
+
+        def branch_commit_id
+          git_repo.rev_parse(branch_name)
+        end
+
+        def branch_name_uncached
+          git_repo.command('rev-parse', '--abbrev-ref', 'HEAD').execute!.strip
+        end
+
+        def clipboard_copy_tracker_message
+          ::Clipboard.copy(textile_tracker_message)
+          infov 'Copied to clipboard', textile_tracker_message
+        end
+
+        def push
+          git_repo.command(*push_args).system!
+        end
+
+        def push_args
+          %w[push origin --force] + ["#{branch_name}:refs/heads/#{branch_name}"]
+        end
+
+        def textile_tracker_message
+          "#{branch_name}: commit:#{branch_commit_id}."
+        end
+      end
+    end
+  end
+end

data/{lib/avm/eac_rails_base0.rb → sub/avm-git/lib/avm/git/issue.rb}

@@ -4,6 +4,8 @@ require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
-  module EacRailsBase0
+  module Git
+    module Issue
+    end
   end
 end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Organize
+      class ReferenceUpdate
+        enable_listable
+        lists.add_symbol :operation, :remove
+
+        common_constructor :repository, :reference, :operation
+
+        def run_operation
+          send("run_operation_#{operation}")
+        end
+
+        def to_s
+          "#{reference} [#{operation}]"
+        end
+
+        private
+
+        def reference_pathname
+          repository.refs_root.join(reference)
+        end
+
+        def run_operation_remove
+          reference_pathname.unlink
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Organize
+      class Repository
+        enable_simple_cache
+        common_constructor :eac_git_local
+
+        def collected_references
+          @collected_references || []
+        end
+
+        def collect_subrepos
+          collect_references_with_pattern(
+            %r{\Asubrepo/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+          collect_references_with_pattern(
+            %r{\Aheads/subrepo/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+        end
+
+        def collect_originals
+          collect_references_with_pattern(
+            %r{\Aoriginal/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+        end
+
+        def all_branches
+          eac_git_local.execute!
+        end
+
+        delegate :to_s, to: :eac_git_local
+
+        private
+
+        def all_references
+          ::Pathname.glob("#{refs_root}/**/*").select(&:file?)
+                    .map { |p| p.relative_path_from(refs_root).to_path }
+        end
+
+        def reference_update_by_ref(reference)
+          collected_references.find { |ru| ru.reference == reference }
+        end
+
+        def collect_reference(reference, operation)
+          new_ru = ::Avm::Git::Organize::ReferenceUpdate.new(self, reference, operation)
+          reference_update_by_ref(new_ru.reference).if_present do |ru_found|
+            raise "Reference #{new_ru} already added (#{ru_found})"
+          end
+          @collected_references ||= []
+          @collected_references << new_ru
+        end
+
+        def collect_references_with_pattern(pattern, operation)
+          references_with_pattern(pattern).each do |reference|
+            collect_reference(reference, operation)
+          end
+        end
+
+        def references_with_pattern(pattern)
+          all_references.select { |reference| pattern.if_match(reference, false) }
+        end
+
+        def refs_root_uncached
+          eac_git_local.root_path / '.git' / 'refs'
+        end
+      end
+    end
+  end
+end

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

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

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