avm-tools 0.89.0 → 0.94.0

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

@@ -1,24 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        ::EacRubyUtils.require_sub(__FILE__)
-
-        DOC = <<~DOCOPT
-          Data utilities for EacRailsBase0 instances.
-
-          Usage:
-            __PROGRAM__ __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+      class Data
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Data utilities for EacRailsBase0 instances.'
+        end
       end
     end
   end

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

@@ -1,37 +1,26 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/numeric/time'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
 require 'avm/data/package/dump'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Data < ::EacRubyUtils::Console::DocoptRunner
-        class Dump < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
+      class Data
+        class Dump
           DUMP_EXPIRE_TIME = 1.day
           DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
           NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
             'dump was expired.'
 
-          DOC = <<~DOCUMENT
-            Dump utility for EacRailsBase instance.
-
-                Usage:
-                __PROGRAM__ [options]
-
-              Options:
-                -h --help               Show this screen.
-                --rewrite               Forces dump overwrite.
-                --dump-path=<dump_path> Set DUMP_PATH variable.
-          DOCUMENT
+          runner_with :help do
+            desc 'Dump utility for EacRailsBase instance.'
+            bool_opt '-w', 'rewrite', 'Forces dump overwrite.'
+            arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
+          end
 
           def run
-            infov 'Instance to dump', "#{context(:instance)} (#{context(:instance).class})"
+            infov 'Instance to dump', "#{instance} (#{instance.class})"
             if package_dump.runnable?
               package_dump.run
             else
@@ -43,20 +32,25 @@ module Avm
 
           private
 
+          def instance
+            runner_context.call(:instance)
+          end
+
           def package_dump_uncached
-            context(:instance).data_package.dump(dump_path, existing: package_dump_existing)
+            instance
+              .data_package.dump(dump_path, existing: package_dump_existing)
           end
 
           def dump_path
-            options.fetch('--dump-path') || default_dump_path
+            parsed.dump_path || default_dump_path
           end
 
           def default_dump_path
-            context(:instance).read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
+            instance.read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
           end
 
           def package_dump_existing
-            if options.fetch('--rewrite')
+            if parsed.rewrite?
               ::Avm::Data::Package::Dump::EXISTING_ROTATE
             else
               ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED

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