avm-tools 0.90.0 → 0.94.1

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

@@ -7,22 +7,13 @@ require 'eac_ruby_utils/simple_cache'
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        class Load < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCUMENT
-            Load utility for EacRailsBase instance.
-
-            Usage:
-              __PROGRAM__ (<dump-path>|--source-instance=<source-instance>)
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                               Show this screen.
-              -S --source-instance=<source-instance>  Informa a instância a ser extraída o dump.
-          DOCUMENT
+      class Data
+        class Load
+          runner_with :ĥelp do
+            desc 'Load utility for EacRailsBase instance.'
+            arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
+            pos_arg :dump_path, optional: true
+          end
 
           def run
             return ::Dev::Result.error("Dump \"#{dump_path}\" does not exist") unless
@@ -33,16 +24,14 @@ module Avm
           end
 
           def dump_path_uncached
-            return options.fetch('<dump-path>').to_s if options.fetch('<dump-path>').present?
-            return source_instance_dump_path if options.fetch('--source-instance').present?
+            return parsed.dump_path.to_s if parsed.dump_path.present?
+            return source_instance_dump_path if parsed.source_instance.present?
 
-            raise "Dump path unknown (Options: #{options})"
+            raise "Dump path unknown (Options: #{parsed})"
           end
 
           def source_instance_dump_path
-            context(:instance).class.by_id(
-              options.fetch('--source-instance')
-            ).data_dump
+            runner_context.call(:instance).class.by_id(parsed.source_instance).data_dump
           end
 
           def load_dump
@@ -57,7 +46,7 @@ module Avm
           private
 
           def package_load_uncached
-            context(:instance).data_package.load(dump_path)
+            runner_context.call(:instance).data_package.load(dump_path)
           end
         end
       end

data/lib/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[asciidoc docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

data/lib/avm/git/auto_commit/commit_info.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      class CommitInfo
+        enable_immutable
+
+        immutable_accessor :fixup, :message
+
+        def git_commit_args
+          r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          r += message.if_present([]) { |v| ['--message', v] }
+          return r if r.any?
+
+          raise 'Argument list is empty'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::EacRubyUtils.require_sub __FILE__
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        RULES_CLASSES = %w[last manual new nth unique]
+                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
+
+        class << self
+          def parse(string)
+            parts = string.split(':')
+
+            klass = rule_class_by_key(parts.shift)
+            klass.new(*parts)
+          end
+
+          def rule_class_by_key(key)
+            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
+              raise("Rule not find with key \"#{key}\" (Available: " +
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
+          end
+        end
+      end
+    end
+  end
+end

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/new.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+require 'avm/git/auto_commit_path'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class New < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def auto_commit_path
+              ::Avm::Git::AutoCommitPath.new(file.git, file.path)
+            end
+
+            def commit_info
+              new_commit_info.message(auto_commit_path.commit_message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# 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
+          SHORT_KEY = 't'
+
+          class << self
+            def short_key
+              SHORT_KEY
+            end
+          end
+
+          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/auto_commit_path.rb

@@ -6,31 +6,10 @@ module Avm
   module Git
     class AutoCommitPath
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
       common_constructor :git, :path do
         self.path = path.to_pathname
       end
 
-      CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
-
-      def run
-        banner
-        commit
-      end
-
-      def banner
-        infom "Checking \"#{relative_path}\""
-        infov '  * Class name', class_name
-        infov '  * Commit message', commit_message
-      end
-
-      def commit
-        infom '  * Commiting...'
-        git.system!('reset', 'HEAD')
-        git.system!('add', '--', relative_path.to_path)
-        git.system!('commit', '-m', commit_message, '--', relative_path.to_path)
-      end
-
       def class_name
         ruby_class_name || relative_path.to_path
       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,30 @@ 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)
+      common_constructor :git, :path, :rules do
+        self.path = path.to_pathname.expand_path(git.root_path)
       end
 
-      COMMIT_FORMAT = '%h - %s (%cr)'
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
-      SKIP_OPTION = 's'
+
+      def git_relative_path
+        path.to_pathname.relative_path_from(git.root_path)
+      end
 
       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) + ['--', git_relative_path]
+      end
+
+      def commit_info_uncached
+        rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
       end
 
       def start_banner
@@ -40,50 +40,23 @@ module Avm
         infov '  Commits found', commits.count
       end
 
-      def run_no_commits_found
-        infom '  No commits found'
-      end
+      def run_commit
+        return false if commit_info.blank?
 
-      def fixup_commit(commit)
-        infov '  Commit selected/found', format_commit(commit)
-        git.execute!('commit', '--fixup', commit.sha1, '--', path)
-        success "  Fixup with \"#{format_commit(commit)}\""
+        infov '  Commit arguments', ::Shellwords.join(commit_args)
+        run_git_add_and_commit
+        success '  Commited'
+        true
       end
 
-      def run_commits_selection
-        selected_commit = select_commit
-        if selected_commit
-          fixup_commit(selected_commit)
+      def run_git_add_and_commit
+        git.execute!('reset', '--soft', 'HEAD')
+        if path.exist?
+          git.execute!('add', git_relative_path)
         else
-          infom '  Skipped'
+          git.execute!('rm', '-f', git_relative_path)
         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 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
+        git.execute!('commit', *commit_args)
       end
 
       def commits_uncached
@@ -93,10 +66,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