avm-tools 0.87.1 → 0.92.0

data/lib/avm/git/auto_commit/rules/base.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Base
+          class << self
+            def keys
+              [long_key, short_key]
+            end
+
+            def long_key
+              name.demodulize.variableize
+            end
+
+            def short_key
+              long_key[0, 1]
+            end
+          end
+
+          def with_file(file)
+            self.class.const_get('WithFile').new(self, file)
+          end
+
+          class WithFile
+            common_constructor :rule, :file
+
+            def new_commit_info
+              ::Avm::Git::AutoCommit::CommitInfo.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/last.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Last < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits.last.if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Manual < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            enable_console_speaker
+
+            COMMIT_FORMAT = '%h - %s (%cr)'
+            SKIP_OPTION = 's'
+
+            def commit_info
+              return nil unless file.commits.any?
+
+              commits_banner
+              request_input('Which commit?', list: commits_by_position).if_present do |v|
+                new_commit_info.fixup(v)
+              end
+            end
+
+            def commits_banner
+              file.commits.each_with_index do |commit, _index|
+                infov "    #{commit.position}", format_commit(commit)
+              end
+              infov "    #{SKIP_OPTION}", 'skip'
+            end
+
+            def commits_by_position
+              (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
+                .to_h
+            end
+
+            def format_commit(commit)
+              commit.format(COMMIT_FORMAT)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/nth.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Nth < ::Avm::Git::AutoCommit::Rules::Base
+          common_constructor :number do
+            self.number = number.to_i
+          end
+
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits(number - 1).if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/unique.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Unique < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              return nil unless file.commits.count == 1
+
+              new_commit_info.fixup(file.commits.first)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/file_auto_fixup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/auto_commit/commit_info'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -8,31 +9,24 @@ module Avm
       enable_console_speaker
       enable_simple_cache
       enable_listable
-      lists.add_symbol :option, :select, :unique
 
-      common_constructor :git, :path, :options, default: [{}] do
-        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
-      end
+      common_constructor :git, :path, :rules
 
-      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 auto_selected_commit.present?
-          fixup_commit(auto_selected_commit)
-        else
-          run_commits_selection
-        end
+        run_commit || warn("No rule returned commit information for \"#{path}\"")
       end
 
       private
 
-      def auto_selected_commit_uncached
-        selected_commit_by_unique || select_commit_by_select
+      def commit_args
+        commit_info.if_present([], &:git_commit_args) + ['--', path]
+      end
+
+      def commit_info_uncached
+        rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
       end
 
       def start_banner
@@ -40,50 +34,13 @@ module Avm
         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 selected_commit_by_unique
-        return unless options[OPTION_UNIQUE]
-        return commits.first if commits.first
-      end
+      def run_commit
+        return false if commit_info.blank?
 
-      def select_commit_by_select
-        options[OPTION_SELECT].if_present(&:to_i).if_present do |v|
-          commits.find { |commit| commit.position == v }
-        end
-      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
+        infov '  Commit arguments', ::Shellwords.join(commit_args)
+        git.execute!('commit', *commit_args)
+        success '  Commited'
+        true
       end
 
       def commits_uncached
@@ -93,10 +50,6 @@ module Avm
            .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
 

data/lib/avm/instances/runner.rb

@@ -31,7 +31,7 @@ module Avm
       private
 
       def instance_uncached
-        self.class.instance_class.by_id(options.fetch('<instance-id>'))
+        self.class.instance_class.by_id(parsed.instance_id)
       end
     end
   end

data/lib/avm/tools/runner/{eac_writings_base1.rb → eac_asciidoctor_base0.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/runner'
-require 'avm/eac_writings_base1'
+require 'avm/eac_asciidoctor_base0'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class EacWritingsBase1 < ::Avm::EacWebappBase0::Runner
+      class EacAsciidoctorBase0 < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end
     end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class EacWebappBase0 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -2,16 +2,14 @@
 
 require 'avm/git/auto_commit_path'
 require 'avm/files/formatter'
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class AutoCommit < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class AutoCommit
+          runner_with :help do
             desc 'Commit with message based in content commited.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
             bool_opt '-f', '--format', 'Format files before commit.'
@@ -33,17 +31,19 @@ module Avm
 
           def clear_stage
             infom 'Clearing stage...'
-            context(:git).system!('reset', 'HEAD')
+            runner_context.call(:git).system!('reset', 'HEAD')
           end
 
           def dirty_paths
-            return [] unless options.fetch('--dirty')
+            return [] unless parsed.dirty?
 
-            context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
+            runner_context.call(:git).dirty_files.map do |d|
+              runner_context.call(:git).root_path.join / d.path
+            end
           end
 
           def format_files
-            return unless options.fetch('--format')
+            return unless parsed.format?
 
             infom 'Formating files...'
             ::Avm::Files::Formatter.new(paths.map(&:path),
@@ -51,10 +51,9 @@ module Avm
           end
 
           def paths_uncached
-            (options.fetch('<paths>')
-              .map { |p| p.to_pathname.expand_path } + dirty_paths)
-              .reject(&:directory?)
-              .sort.uniq.map { |path| ::Avm::Git::AutoCommitPath.new(context(:git), path) }
+            (parsed.paths.map { |p| p.to_pathname.expand_path } + dirty_paths)
+              .reject(&:directory?).sort.uniq
+              .map { |path| ::Avm::Git::AutoCommitPath.new(runner_context.call(:git), path) }
           end
 
           def run_paths

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

@@ -3,6 +3,7 @@
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
@@ -11,25 +12,18 @@ module Avm
         class AutoFixup
           runner_with :help do
             desc 'Auto fixup files.'
-            bool_opt '-l', '--last', 'Equivalent to "--select=1".'
-            arg_opt '-s', '--select', 'Automatically select de <value>-th commit.'
-            bool_opt '-u', '--unique', 'Automatically select the first commit if it is unique.'
+            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
             pos_arg :files, repeat: true, optional: true
           end
 
           def run
             files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, file_options).run
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
             end
           end
 
           private
 
-          def file_options
-            { Avm::Git::FileAutoFixup::OPTION_SELECT => select,
-              Avm::Git::FileAutoFixup::OPTION_UNIQUE => parsed.unique? }
-          end
-
           def files
             files_from_option || dirty_files
           end
@@ -43,6 +37,12 @@ module Avm
             runner_context.call(:git).dirty_files.map(&:path)
           end
 
+          def rules
+            parsed.rule.map do |rule_string|
+              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+            end
+          end
+
           def select
             parsed.last? ? 1 : parsed.select
           end

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

@@ -11,22 +11,13 @@ module Avm
   module Tools
     class Runner
       class Git
-        class Commit < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Mostra informações de um commit.
-
-            Usage:
-              __PROGRAM__ [options] <ref>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help        Mostra esta ajuda.
-              -f --files       Mostra os arquivos.
-              -s --size        Mostra o tamanho de arquivos.
-          DOCOPT
+        class Commit
+          runner_with :help do
+            desc 'Mostra informações de um commit.'
+            bool_opt '-f', '--files', 'Mostra os arquivos.'
+            bool_opt '-s', '--size', 'Mostra o tamanho de arquivos.'
+            pos_arg :ref
+          end
 
           def run
             input_banner
@@ -64,7 +55,7 @@ module Avm
           end
 
           def files_banner
-            return unless options.fetch('--files')
+            return unless parsed.files?
 
             commit.files.each do |file|
               infov "  #{file.path}", file_value(file)
@@ -82,11 +73,11 @@ module Avm
           end
 
           def reference
-            options.fetch('<ref>')
+            parsed.ref
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(context(:repository_path))
+            ::EacLauncher::Git::Base.new(runner_context.call(:repository_path))
           end
 
           def commit_uncached
@@ -103,7 +94,7 @@ module Avm
           end
 
           def show_size?
-            options.fetch('--size')
+            parsed.size?
           end
         end
       end