avm-tools 0.91.0 → 0.94.2

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,64 +1,63 @@
 # frozen_string_literal: true
 
-require 'avm/git/auto_commit_path'
+require 'eac_cli/core_ext'
 require 'avm/files/formatter'
-require 'eac_cli/default_runner'
+require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class AutoCommit < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
-            desc 'Commit with message based in content commited.'
+        class AutoCommit
+          runner_with :help do
+            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...'
-            context(:git).system!('reset', 'HEAD')
+          def files_from_option
+            parsed.files.map { |p| p.to_pathname.expand_path }
           end
 
-          def dirty_paths
-            return [] unless options.fetch('--dirty')
+          def format_files
+            return unless parsed.format?
 
-            context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
+            infom 'Formating files...'
+            ::Avm::Files::Formatter.new(files, ::Avm::Files::Formatter::OPTION_APPLY => true).run
           end
 
-          def format_files
-            return unless options.fetch('--format')
+          def dirty_files
+            return [] unless parsed.dirty?
 
-            infom 'Formating files...'
-            ::Avm::Files::Formatter.new(paths.map(&:path),
-                                        ::Avm::Files::Formatter::OPTION_APPLY => true).run
+            runner_context.call(:git).dirty_files.map do |file|
+              file.path.to_pathname.expand_path(runner_context.call(:git).root_path)
+            end
           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) }
+          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/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

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)

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

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-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 Ruby < ::EacRubyUtils::Console::DocoptRunner
+      class Ruby
         require_sub __FILE__
-
-        DOC = <<~DOCOPT
-          Ruby utilities for AVM.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+        runner_with :help, :subcommands do
+          desc 'Ruby utilities for AVM.'
+          subcommands
+        end
       end
     end
   end

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

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-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 Ruby < ::EacRubyUtils::Console::DocoptRunner
-        class Gems < ::EacRubyUtils::Console::DocoptRunner
+      class Ruby
+        class Gems
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Rubygems utilities for AVM.'
             subcommands
           end

data/lib/avm/tools/runner/ruby/gems/generate.rb

@@ -1,31 +1,20 @@
 # frozen_string_literal: true
 
 require 'avm/ruby/gems/generator'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Ruby < ::EacRubyUtils::Console::DocoptRunner
-        class Gems < ::EacRubyUtils::Console::DocoptRunner
-          class Generate < ::EacRubyUtils::Console::DocoptRunner
-            enable_console_speaker
-            enable_simple_cache
-
-            DOC = <<~DOCUMENT
-              Create a gem.
-
-              Usage:
-                __PROGRAM__ [options] <path>
-                __PROGRAM__ -h --help
-
-              Options:
-                -h --help                                   Show this help.
-                --eac-ruby-utils-version=<version>          Version for "eac_ruby_utils" gem.
-                --eac-ruby-gem-support-version=<version>    Version for "eac_ruby_gem_support" gem.
-            DOCUMENT
+      class Ruby
+        class Gems
+          class Generate
+            runner_with :help do
+              desc 'Create a gem.'
+              arg_opt '--eac-ruby-utils-version', 'Version for "eac_ruby_utils" gem.'
+              arg_opt '--eac-ruby-gem-support-version', 'Version for "eac_ruby_gem_support" gem.'
+              pos_arg :path
+            end
 
             def run
               success "Gem \"#{generator.name}\" created in \"#{generator.root_directory}\""
@@ -34,12 +23,12 @@ module Avm
             private
 
             def generator_uncached
-              ::Avm::Ruby::Gems::Generator.new(options.fetch('<path>'), generator_options)
+              ::Avm::Ruby::Gems::Generator.new(parsed.path, generator_options)
             end
 
             def generator_options
               %w[eac_ruby_utils eac_ruby_gem_support].map do |gem_name|
-                ["#{gem_name}_version".to_sym, options.fetch("--#{gem_name.dasherize}-version")]
+                ["#{gem_name}_version".to_sym, parsed.fetch("#{gem_name.variableize}_version")]
               end.to_h
             end
           end