avm 0.2.0 → 0.3.0

data/lib/avm/git/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze
+        FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
+        GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
+
+        attr_reader(*FIELDS)
+
+        # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
+        # Reference: https://git-scm.com/docs/git-diff-tree
+        def initialize(line)
+          m = DIFF_TREE_PATTERN.match(line.strip)
+          raise "\"#{line}\" did not match pattern" unless m
+
+          FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
+        end
+
+        def fields
+          FIELDS.map { |field| [field, send(field)] }.to_h
+        end
+
+        private
+
+        attr_writer(*FIELDS)
+      end
+    end
+  end
+end

data/lib/avm/git/commit/file.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+require 'eac_ruby_utils/simple_cache'
+require 'avm/git/commit/diff_tree_line'
+
+module Avm
+  module Git
+    class Commit
+      class File
+        include ::EacRubyUtils::SimpleCache
+
+        attr_reader :git, :diff_tree
+
+        # git: [EacGit::Local]
+        # diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
+        def initialize(git, diff_tree_line)
+          @git = git
+          @diff_tree = ::Avm::Git::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::Avm::Git::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
+
+        def to_s
+          "#{path}|#{status}"
+        end
+
+        def src_size_uncached
+          size(src_sha1)
+        end
+
+        def dst_size_uncached
+          size(dst_sha1)
+        end
+
+        private
+
+        def size(sha1)
+          return 0 if /\A0+\z/.match(sha1)
+
+          git.command('cat-file', '-s', sha1).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/file_auto_fixup.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/commit_info'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class FileAutoFixup
+      enable_speaker
+      enable_simple_cache
+      enable_listable
+
+      common_constructor :git, :path, :rules do
+        self.path = path.to_pathname.expand_path(git.root_path)
+      end
+
+      COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
+
+      def git_relative_path
+        path.to_pathname.relative_path_from(git.root_path)
+      end
+
+      def run
+        start_banner
+        run_commit || warn("No rule returned commit information for \"#{path}\"")
+      end
+
+      private
+
+      def commit_args
+        commit_info.if_present([], &:git_commit_args) + ['--', git_relative_path]
+      end
+
+      def commit_info_uncached
+        rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
+      end
+
+      def start_banner
+        infov 'Path', path
+        infov '  Commits found', commits.count
+      end
+
+      def run_commit
+        return false if commit_info.blank?
+
+        infov '  Commit arguments', ::Shellwords.join(commit_args)
+        run_git_add_and_commit
+        success '  Commited'
+        true
+      end
+
+      def run_git_add_and_commit
+        git.execute!('reset', '--soft', 'HEAD')
+        if path.exist?
+          git.execute!('add', git_relative_path)
+        else
+          git.execute!('rm', '-f', git_relative_path)
+        end
+        git.execute!('commit', *commit_args)
+      end
+
+      def commits_uncached
+        git.execute!('log', '--pretty=format:%H', COMMITS_SEARCH_INTERVAL, '--', path)
+           .each_line.map { |sha1| ::Avm::Git::Commit.new(git, sha1.strip) }
+           .reject { |commit| commit.subject.start_with?('fixup!') }
+           .each_with_index.map { |commit, index| CommitDelegator.new(commit, index) }
+      end
+
+      class CommitDelegator < ::SimpleDelegator
+        attr_reader :index
+
+        def initialize(commit, index)
+          super(commit)
+          @index = index
+        end
+
+        def position
+          index + 1
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)
+
+module Avm
+  module Git
+    module Issue
+    end
+  end
+end

data/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/lib/avm/git/issue/complete/commits.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Commits
+          def commits_result
+            ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
+          end
+
+          def commits_uncached
+            return [] unless branch_hash && follow_master?
+
+            interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
+            @git.execute!('rev-list', interval).each_line.map(&:strip)
+          end
+
+          def bifurcations_result
+            commits.each do |commit|
+              if multiple_parents?(commit)
+                return ::Avm::Result.error("#{commit} has multiple parents")
+              end
+            end
+            ::Avm::Result.success('no')
+          end
+
+          def multiple_parents?(commit)
+            commit_parents(commit).count > 1
+          end
+
+          def commit_parents(commit)
+            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                .select(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/git_subrepos.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module GitSubrepos
+          def git_subrepos_result
+            return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+            infom 'Checking Git subrepos...'
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+            r.check_remote = true
+            r.result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/local_branch.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalBranch
+          def branch_uncached
+            @git.current_branch
+          end
+
+          def branch_hash_uncached
+            @git.rev_parse("refs/heads/#{branch}")
+          end
+
+          def branch_name
+            branch.split('/')[-1]
+          end
+
+          def branch_name_result
+            ::Avm::Result.success_or_error(issue_id.present?, branch_name)
+          end
+
+          def branch_hash_result
+            ::Avm::Result.success_or_error(
+              branch_hash.present?,
+              branch_hash
+            )
+          end
+
+          def follow_master_result
+            return ::Avm::Result.neutral('No branch hash') unless branch_hash
+
+            r = follow_master?
+            ::Avm::Result.success_or_error(r, 'yes', 'no')
+          end
+
+          def follow_master?
+            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+          end
+
+          def remove_local_branch
+            info 'Removendo branch local...'
+            bn = branch_name
+            git(['checkout', branch_hash])
+            git(['branch', '-D', bn])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/local_tag.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalTag
+          def assert_tag
+            if tag_hash
+              return if tag_hash == branch_hash
+
+              delete_tag
+            end
+            create_tag
+          end
+
+          def delete_tag
+            info 'Removendo tag...'
+            git(['tag', '-d', branch_name])
+          end
+
+          def tag
+            "refs/tags/#{branch_name}"
+          end
+
+          def tag_hash
+            @git.rev_parse(tag)
+          end
+
+          def create_tag
+            git(['tag', branch_name, branch_hash])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/push.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Push
+          def dry_push_args
+            %w[push --dry-run] + [remote_name] + pushs
+          end
+
+          def dry_push_result
+            return ::Avm::Result.error('Nothing to push') if pushs.empty?
+
+            r = @git.execute(dry_push_args)
+            message = if r.fetch(:exit_code).zero?
+                        'ok'
+                      else
+                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
+                      end
+            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+          end
+
+          def push
+            if pushs.empty?
+              info 'PUSH: Nada a enviar'
+            else
+              info "PUSH: enviando \"#{pushs}\"..."
+              git(%w[push origin] + pushs)
+            end
+          end
+
+          def pushs_uncached
+            [master_push, remove_branch_push, tag_push].reject(&:nil?)
+          end
+
+          def master_push
+            remote_master_hash != branch_hash ? "#{branch_hash}:refs/heads/master" : nil
+          end
+
+          def remove_branch_push
+            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+          end
+
+          def tag_push
+            return nil unless !remote_tag_hash || remote_tag_hash != branch_hash
+
+            "#{branch_hash}:#{tag}"
+          end
+        end
+      end
+    end
+  end
+end