avm-tools 0.92.0 → 0.94.3

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 :help 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/git/auto_commit/commit_info.rb

@@ -8,10 +8,11 @@ module Avm
       class CommitInfo
         enable_immutable
 
-        immutable_accessor :fixup
+        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'

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

@@ -2,13 +2,13 @@
 
 require 'eac_ruby_utils/core_ext'
 
+::EacRubyUtils.require_sub __FILE__
+
 module Avm
   module Git
     module AutoCommit
       module Rules
-        require_sub __FILE__
-
-        RULES_CLASSES = %w[last manual nth unique]
+        RULES_CLASSES = %w[last manual new nth unique]
                         .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
 
         class << self
@@ -22,7 +22,7 @@ module Avm
           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) + ')')
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
           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

@@ -7,6 +7,14 @@ module Avm
     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

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

@@ -10,10 +10,16 @@ module Avm
       enable_simple_cache
       enable_listable
 
-      common_constructor :git, :path, :rules
+      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}\"")
@@ -22,7 +28,7 @@ module Avm
       private
 
       def commit_args
-        commit_info.if_present([], &:git_commit_args) + ['--', path]
+        commit_info.if_present([], &:git_commit_args) + ['--', git_relative_path]
       end
 
       def commit_info_uncached
@@ -38,11 +44,21 @@ module Avm
         return false if commit_info.blank?
 
         infov '  Commit arguments', ::Shellwords.join(commit_args)
-        git.execute!('commit', *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) }

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/core_update'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class CoreUpdate
+          runner_with :help do
             arg_opt '-u', '--url', 'Core\'s package URL.'
             arg_opt '-v', '--version', 'Core\'s version.'
             desc 'Update instance\' core.'
@@ -32,7 +28,7 @@ module Avm
           end
 
           def update
-            ::Avm::EacRedmineBase0::CoreUpdate.new(context(:instance), version, url).run
+            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:instance), version, url).run
           end
 
           def url
@@ -40,7 +36,7 @@ module Avm
           end
 
           def url_by_version
-            options.fetch('--version').if_present do |v|
+            parsed.version.if_present do |v|
               "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
             end
           end
@@ -52,11 +48,11 @@ module Avm
           end
 
           def version
-            options.fetch('--version') || version_by_url
+            parsed.version || version_by_url
           end
 
           def version_by_url
-            options.fetch('--url').if_present do |v|
+            parsed.url.if_present do |v|
               /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
             end
           end

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit_path'
-require 'avm/files/formatter'
 require 'eac_cli/core_ext'
+require 'avm/files/formatter'
+require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
@@ -10,54 +11,53 @@ module Avm
       class Git
         class AutoCommit
           runner_with :help do
-            desc 'Commit with message based in content commited.'
+            desc 'Auto fixup files.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
             bool_opt '-f', '--format', 'Format files before commit.'
-            pos_arg 'paths', repeat: true, optional: true
+            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
+            pos_arg :files, repeat: true, optional: true
           end
 
           def run
-            clear_stage
-            banner
             format_files
-            run_paths
+            files.each do |file|
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run
+            end
           end
 
           private
 
-          def banner
-            infov 'Paths', paths.count
+          def files_uncached
+            (files_from_option + dirty_files).sort.uniq
           end
 
-          def clear_stage
-            infom 'Clearing stage...'
-            runner_context.call(:git).system!('reset', 'HEAD')
-          end
-
-          def dirty_paths
-            return [] unless parsed.dirty?
-
-            runner_context.call(:git).dirty_files.map do |d|
-              runner_context.call(:git).root_path.join / d.path
-            end
+          def files_from_option
+            parsed.files.map { |p| p.to_pathname.expand_path }
           end
 
           def format_files
             return unless parsed.format?
 
             infom 'Formating files...'
-            ::Avm::Files::Formatter.new(paths.map(&:path),
-                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+            ::Avm::Files::Formatter.new(files, ::Avm::Files::Formatter::OPTION_APPLY => true).run
           end
 
-          def paths_uncached
-            (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) }
+          def dirty_files
+            return [] unless parsed.dirty?
+
+            runner_context.call(:git).dirty_files.map do |file|
+              file.path.to_pathname.expand_path(runner_context.call(:git).root_path)
+            end
+          end
+
+          def rules
+            parsed.rule.map do |rule_string|
+              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+            end
           end
 
-          def run_paths
-            paths.each(&:run)
+          def select
+            parsed.last? ? 1 : parsed.select
           end
         end
       end

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

@@ -30,7 +30,7 @@ module Avm
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
                 ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
-                                              ::Avm::Git::FileAutoFixup::OPTION_UNIQUE => true).run
+                                              [::Avm::Git::AutoCommit::Rules::Unique.new]).run
               end
             end
 

data/lib/avm/tools/runner/local_project/ruby.rb

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Ruby utitilies for local projects.'
             subcommands
           end

data/lib/avm/tools/runner/local_project/ruby/bundler.rb

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
+        class Ruby
+          class Bundler
             require_sub __FILE__
-            include ::EacCli::DefaultRunner
-
-            runner_definition do
+            runner_with :help, :subcommands do
               desc 'Ruby\'s bundler utitilies for local projects.'
               subcommands
             end

data/lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_base0/core_ext'
 
 module Avm
   module Tools
     class Runner
       class LocalProject
-        class Ruby < ::EacRubyUtils::Console::DocoptRunner
-          class Bundler < ::EacRubyUtils::Console::DocoptRunner
-            class GemfileLock < ::EacRubyUtils::Console::DocoptRunner
-              include ::EacCli::DefaultRunner
-
-              runner_definition do
+        class Ruby
+          class Bundler
+            class GemfileLock
+              runner_with :help do
                 desc 'Manipulage a "Gemfile.lock" file.'
                 bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
                 bool_opt '-i', '--install', 'Run "bundle install".'
@@ -34,7 +31,7 @@ module Avm
               private
 
               def complete?
-                !option_or_all?('--recursive') || !conflict?
+                !option_or_all?(:recursive) || !conflict?
               end
 
               def rebasing?
@@ -51,21 +48,21 @@ module Avm
               end
 
               def bundle_install
-                return unless check_capability(__method__, :ruby_gem, '--install')
+                return unless check_capability(__method__, :ruby_gem, :install)
 
                 infom '"bundle install"...'
                 bundle_run('install')
               end
 
               def bundle_update
-                return unless check_capability(__method__, :ruby_gem, '--update')
+                return unless check_capability(__method__, :ruby_gem, :update)
 
                 infom '"bundle update"...'
                 bundle_run('update')
               end
 
               def git_continue
-                return unless check_capability(__method__, :git_repo, '--continue')
+                return unless check_capability(__method__, :git_repo, :continue)
 
                 infom "Adding \"#{gemfile_lock}\"..."
                 instance.git_repo.command('add', gemfile_lock).execute!
@@ -115,11 +112,11 @@ module Avm
               end
 
               def option_or_all?(option)
-                options.fetch(option) || options.fetch('--all')
+                parsed[option] || parsed.all?
               end
 
               def instance
-                context(:instance)
+                runner_context.call(:instance)
               end
 
               def check_capability(caller, capability, option)