avm-tools 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e079512629b48e8c65948293d37db10a2f347f2ab9e602124a618a157da8f7
-  data.tar.gz: 971a2ef2d0a0a4eba5fe15b212e272ef4a94bb50d0a3d592284cc9c095b3779e
+  metadata.gz: 9c43972836fb5b4414055f3b478a1f85e814c1c86bf84d2975031c7aa1890902
+  data.tar.gz: c0ab56207e455dee36a9dc480b23f8e1d6e494421913c830dd746779d9293f4d
 SHA512:
-  metadata.gz: cc9f614f22d2f1eb36a7ecba29b9fb9ebf860247658940520023cc37bde2d5298024a7199b90baaea2cc5fd552d1029ff7d3d3d26cf994c7f7ab110de54d798c
-  data.tar.gz: cfd4bc26d96554c1cb38a028b2246fbdd4774daab0705b8072df94f6605e865b570d3d69c19f995144052630cf895e25d3bdde8fd06901126465991753571726
+  metadata.gz: 1e482a38d4fa941481cf58e635776884ed86fece1df69e458b2be979de63f67f345ae738218d4f911ac6e0c184811eb6b77d88dce6b6169670e7e7fc48ae3781
+  data.tar.gz: 5a969b9d92a2b1d21dd85f99d0d286a7e4f01bc9d101d60632d43eea5a70fea98e41bbf00f7a2331c62e7855b9c079b5171eae5208ee25354b8b40eb9dd9a2b1

data/lib/avm/git/file_auto_fixup.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class FileAutoFixup
+      enable_console_speaker
+      enable_simple_cache
+
+      common_constructor :git, :path
+
+      COMMIT_FORMAT = '%h - %s (%cr)'
+      COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
+      SKIP_OPTION = 's'
+
+      def run
+        start_banner
+        if commits.count.zero?
+          run_no_commits_found
+        elsif commits.count == 1
+          fixup_commit(commits.first)
+        else
+          run_commits_selection
+        end
+      end
+
+      private
+
+      def start_banner
+        infov 'Path', path
+        infov '  Commits found', commits.count
+      end
+
+      def run_no_commits_found
+        infom '  No commits found'
+      end
+
+      def fixup_commit(commit)
+        infov '  Commit selected/found', format_commit(commit)
+        git.execute!('commit', '--fixup', commit.sha1, '--', path)
+        success "  Fixup with \"#{format_commit(commit)}\""
+      end
+
+      def run_commits_selection
+        selected_commit = select_commit
+        if selected_commit
+          fixup_commit(selected_commit)
+        else
+          infom '  Skipped'
+        end
+      end
+
+      def select_commit
+        commits_banner
+        request_input('Which commit?', list: commits_by_position)
+      end
+
+      def commits_banner
+        commits.each_with_index do |commit, _index|
+          infov "    #{commit.position}", format_commit(commit)
+        end
+        infov "    #{SKIP_OPTION}", 'skip'
+      end
+
+      def commits_by_position
+        (commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]]).to_h
+      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
+
+      def format_commit(commit)
+        commit.format(COMMIT_FORMAT)
+      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/patches/eac_launcher_git_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_launcher/git/base'
+require 'eac_launcher/git/error'
 require 'eac_ruby_utils/patch'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
@@ -17,6 +18,21 @@ module Avm
         args, _options = build_args(args)
         ::EacRubyUtils::Envs.local.command(*args)
       end
+
+      def dirty_files
+        execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
+          parse_status_line(line.gsub(/\n\z/, ''))
+        end
+      end
+
+      private
+
+      def parse_status_line(line)
+        m = /\A(.)(.)\s(.+)\z/.match(line)
+        ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
+        ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
+                         absolute_path: ::File.expand_path(m[3], self))
+      end
     end
   end
 end

data/lib/avm/tools/runner/git.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/require_sub'
+require 'avm/patches/eac_launcher_git_base'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
@@ -23,6 +24,10 @@ module Avm
         def repository_path
           options.fetch('-C')
         end
+
+        def git
+          @git ||= ::EacLauncher::Git::Base.new(repository_path)
+        end
       end
     end
   end

data/lib/avm/tools/runner/git/auto_fixup.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/git/file_auto_fixup'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class AutoFixup < ::EacRubyUtils::Console::DocoptRunner
+          DOC = <<~DOCOPT
+            Auto fixup files.
+
+              Usage:
+              __PROGRAM__ [options] [<files>...]
+            __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                     Mostra esta ajuda.
+          DOCOPT
+
+          def run
+            files.each do |file|
+              ::Avm::Git::FileAutoFixup.new(context(:git), file).run
+            end
+          end
+
+          private
+
+          def files
+            files_from_option || dirty_files
+          end
+
+          def files_from_option
+            r = options.fetch('<files>')
+            r.any? ? r : nil
+          end
+
+          def dirty_files
+            context(:git).dirty_files.map(&:path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/git/dirty_files.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class DirtyFiles < ::EacRubyUtils::Console::DocoptRunner
+          enable_console_speaker
+
+          FIELDS = {
+            i: :index, w: :worktree, p: :path, a: :absolute_path
+          }.map { |k, v| ["%#{k}", v] }.to_h
+
+          FIELDS_DOC = FIELDS.map { |k, v| "  #{k} => #{v}" }.join("\n")
+
+          DOC = <<~DOCOPT
+            Lists dirty files in Git repository.
+
+            Usage:
+              __PROGRAM__ [options]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                     Mostra esta ajuda.
+              -f --format=<format>          Format of each line (See "Format fields") [default: %p].
+
+            Format fields:
+            #{FIELDS_DOC}
+          DOCOPT
+
+          def run
+            context(:git).dirty_files.each do |file|
+              out("#{format_file(file)}\n")
+            end
+          end
+
+          private
+
+          def format_file(file)
+            FIELDS.inject(options.fetch('--format')) { |a, e| a.gsub(e.first, file.send(e.last)) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.15.1'
+    VERSION = '0.16.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - lib/avm/git/commit/deploy.rb
 - lib/avm/git/commit/diff_tree_line.rb
 - lib/avm/git/commit/file.rb
+- lib/avm/git/file_auto_fixup.rb
 - lib/avm/git/issue.rb
 - lib/avm/git/issue/complete.rb
 - lib/avm/git/issue/complete/_commits.rb
@@ -227,8 +228,10 @@ files:
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/rotate.rb
 - lib/avm/tools/runner/git.rb
+- lib/avm/tools/runner/git/auto_fixup.rb
 - lib/avm/tools/runner/git/commit.rb
 - lib/avm/tools/runner/git/deploy.rb
+- lib/avm/tools/runner/git/dirty_files.rb
 - lib/avm/tools/runner/git/issue.rb
 - lib/avm/tools/runner/git/issue/complete.rb
 - lib/avm/tools/version.rb