avm-tools 0.95.0 → 0.99.1

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

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'filesize'
 require 'avm/git/commit'
 
@@ -77,7 +76,7 @@ module Avm
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(runner_context.call(:repository_path))
+            ::Avm::Launcher::Git::Base.new(runner_context.call(:repository_path))
           end
 
           def commit_uncached

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'avm/git/commit'
 
 module Avm
@@ -56,7 +56,7 @@ module Avm
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(git_repository_path)
+            ::Avm::Launcher::Git::Base.new(git_repository_path)
           end
 
           def git_repository_path

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

@@ -1,46 +1,41 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class DirtyFiles < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
-
+        class DirtyFiles
+          DEFAULT_FORMAT = '%p'
           FIELDS = {
             i: :index, w: :worktree, p: :path, a: :absolute_path
           }.map { |k, v| ["%#{k}", v] }.to_h
 
-          FIELDS_DOC = FIELDS.map { |k, v| "  #{k} => #{v}" }.join("\n")
-
-          DOC = <<~DOCOPT
-            Lists dirty files in Git repository.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                     Mostra esta ajuda.
-              -f --format=<format>          Format of each line (See "Format fields") [default: %p].
+          runner_with :help do
+            desc 'Lists dirty files in Git repository.'
+            arg_opt '-f', '--format',
+                    "Format of each line (See \"Format fields\") [default: #{DEFAULT_FORMAT}]."
+          end
 
-            Format fields:
-            #{FIELDS_DOC}
-          DOCOPT
+          def help_extra_text
+            "Format fields:\n" + FIELDS.map { |k, v| "  #{k} => #{v}" }.join("\n")
+          end
 
           def run
-            context(:git).dirty_files.each do |file|
+            runner_context.call(:git).dirty_files.each do |file|
               out("#{format_file(file)}\n")
             end
           end
 
           private
 
+          def format
+            parsed.format || DEFAULT_FORMAT
+          end
+
           def format_file(file)
-            FIELDS.inject(options.fetch('--format')) { |a, e| a.gsub(e.first, file.send(e.last)) }
+            FIELDS.inject(format) { |a, e| a.gsub(e.first, file.send(e.last)) }
           end
         end
       end

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

@@ -1,64 +1,53 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'avm/core_ext'
 require 'avm/git/issue/complete'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Issue < ::EacRubyUtils::Console::DocoptRunner
-          enable_simple_cache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Closes a issue in a Git repository.
-
-            Usage:
-              __PROGRAM__ [options] [complete]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                             Show this screen.
-              -f --uncomplete-unfail                Do not exit with error if issue is not completed
-                                                    or is invalid.
-              -s --skip-validations=<validations>   Does not validate conditions on <validations>
-                                                    (Comma separated value).
-              -y --yes                              Does not ask for user confirmation.
-
-            Validations:
-            %%VALIDATIONS%%
-          DOCOPT
-
-          UNCOMPLETE_MESSAGE =
-
-            def run
-              banner
-              return unless validate
+        class Issue
+          runner_with :confirmation, :help do
+            desc 'Closes a issue in a Git repository.'
+            bool_opt '-f', '--uncomplete-unfail', 'Do not exit with error if issue is not' \
+              ' completed or is invalid.'
+            arg_opt '-s', '--skip-validations', 'Does not validate conditions on <validations>' \
+              ' (Comma separated value).'
+            bool_opt '--complete', 'Run complete task.'
+            bool_opt '--deliver', 'Run "deliver" task.'
+            bool_opt '--validate', 'Validate for "complete" task.'
+          end
 
-              run_complete if options.fetch('complete')
-              success('Done!')
-            end
+          def run
+            run_validate if parsed.validate?
+            run_deliver if parsed.deliver?
+            run_complete if parsed.complete?
+            success('Done!')
+          end
 
-          def banner
-            complete.start_banner
+          def help_extra_text
+            "Validations:\n#{doc_validations_list}"
           end
 
-          def validate
+          def run_validate
+            complete.start_banner
             return true if complete.valid?
 
             uncomplete_message('Some validation did not pass')
           end
 
           def run_complete
-            return complete.run if confirm?
+            return complete.run if confirm?('Confirm issue completion?')
 
             uncomplete_message('Issue was not completed')
           end
 
-          def doc
-            DOC.gsub('%%VALIDATIONS%%', doc_validations_list)
+          def run_deliver
+            deliver.start_banner
+            return deliver.run if confirm?('Confirm issue delivery?')
+
+            uncomplete_message('Issue was not delivered')
           end
 
           private
@@ -67,16 +56,16 @@ module Avm
             ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
           end
 
-          def confirm?
-            options.fetch('--yes') || request_input('Confirm issue completion?', bool: true)
+          def deliver_uncached
+            ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
           end
 
           def skip_validations
-            options.fetch('--skip-validations').to_s.split(',').map(&:strip).reject(&:blank?)
+            parsed.skip_validations.to_s.split(',').map(&:strip).reject(&:blank?)
           end
 
           def git_complete_issue_options
-            { dir: context(:repository_path), skip_validations: skip_validations }
+            { dir: runner_context.call(:repository_path), skip_validations: skip_validations }
           end
 
           def doc_validations_list
@@ -84,7 +73,7 @@ module Avm
           end
 
           def uncomplete_unfail?
-            options.fetch('--uncomplete-unfail')
+            parsed.uncomplete_unfail?
           end
 
           def uncomplete_message(message)

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

@@ -2,16 +2,13 @@
 
 require 'avm/git/organize/repository'
 require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Organize < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class Organize
+          runner_with :help do
             desc 'Organize branches.'
             bool_opt '-a', '--all', 'Run all organizations.'
             bool_opt '-n', '--no', 'Do not run operations.'
@@ -37,7 +34,7 @@ module Avm
           end
 
           def collect?(type)
-            options.fetch("--#{type}") || options.fetch('--all')
+            parsed.fetch(type) || parsed.all?
           end
 
           def collect_references
@@ -58,14 +55,14 @@ module Avm
           end
 
           def run_operations?
-            return true if options.fetch('--yes')
-            return false if options.fetch('--no')
+            return true if parsed.yes?
+            return false if parsed.no?
 
             request_input('Confirm operations?', bool: true)
           end
 
           def repository_uncached
-            ::Avm::Git::Organize::Repository.new(context(:git).eac_git)
+            ::Avm::Git::Organize::Repository.new(runner_context.call(:git).eac_git)
           end
 
           def start_banner

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

@@ -1,32 +1,21 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/core_ext'
 require 'avm/git/revision_test'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class RevisionsTest < ::EacRubyUtils::Console::DocoptRunner
-          enable_simple_cache
-          enable_console_speaker
-
-          DOC = <<~DOCOPT
-            Test multiple revisions until a error is found.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                     Mostra esta ajuda.
-              -c --command=<test-command>   Command to test instance.
-              -n --no-cache                 Does not use cache.
-          DOCOPT
+        class RevisionsTest
+          runner_with :help do
+            desc 'Test multiple revisions until a error is found.'
+            arg_opt '-c', '--command', 'Command to test instance.'
+            bool_opt '-n', '--no-cache', 'Does not use cache.'
+          end
 
           def run
-            fatal_error('Repository is dirty') if context(:git).dirty?
+            fatal_error('Repository is dirty') if runner_context.call(:git).dirty?
 
             return_to_branch_on_end do
               infov 'Revisions found', revisions.count
@@ -41,11 +30,11 @@ module Avm
           private
 
           def return_to_branch_on_end
-            current_branch = context(:git).current_branch
+            current_branch = runner_context.call(:git).current_branch
             yield
           ensure
             infom "Returning to original branch \"#{current_branch}\""
-            context(:git).execute!('checkout', current_branch)
+            runner_context.call(:git).execute!('checkout', current_branch)
           end
 
           def revision_with_error_uncached
@@ -61,14 +50,14 @@ module Avm
           end
 
           def revisions_uncached
-            context(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
-                         .each_line.map(&:strip).reverse.map do |sha1|
-              ::Avm::Git::RevisionTest.new(context(:git), sha1, test_revision_options)
+            runner_context.call(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
+                          .each_line.map(&:strip).reverse.map do |sha1|
+              ::Avm::Git::RevisionTest.new(runner_context.call(:git), sha1, test_revision_options)
             end
           end
 
           def test_revision_options
-            { test_command: options.fetch('--command'), no_cache: options.fetch('--no-cache') }
+            { test_command: parsed.command, no_cache: parsed.no_cache? }
           end
         end
       end

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

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Git-subrepo (https://github.com/ingydotnet/git-subrepo) utilities.'
             subcommands
           end

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

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
+require 'avm/core_ext'
 require 'eac_git/local'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
-          class Check < ::EacRubyUtils::Console::DocoptRunner
-            include ::EacCli::DefaultRunner
-
-            runner_definition do
+        class Subrepo
+          class Check
+            runner_with :help do
               desc 'Check status of subrepos.'
               bool_opt '-a', '--all', 'Select all subrepos.'
               bool_opt '-f', '--fix-parent', 'Fix parent SHA1.'
@@ -23,7 +20,7 @@ module Avm
 
             def run
               subrepo_checks.show_result
-              return if options.fetch('--no-error')
+              return if parsed.no_error?
               return unless subrepo_checks.result.error?
 
               fatal_error 'Failed'
@@ -33,15 +30,15 @@ module Avm
 
             def subrepo_checks_uncached
               r = ::Avm::Git::SubrepoChecks.new(local_repos)
-              r.check_remote = options.fetch('--remote')
-              r.fix_parent = options.fetch('--fix-parent')
-              r.add_all_subrepos if options.fetch('--all')
-              r.add_subrepos(*options.fetch('<subrepos>'))
+              r.check_remote = parsed.remote?
+              r.fix_parent = parsed.fix_parent?
+              r.add_all_subrepos if parsed.all?
+              r.add_subrepos(*parsed.subrepos)
               r
             end
 
             def local_repos_uncached
-              ::EacGit::Local.new(context(:git))
+              ::EacGit::Local.new(runner_context.call(:git))
             end
           end
         end

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

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
+require 'avm/core_ext'
 require 'eac_git/local'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo
           class Clone
             runner_with :help do
               desc 'Clone git-subrepo repositories.'

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

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
+require 'avm/core_ext'
 require 'eac_git/local'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo
           class Fix
             runner_with :help do
               desc 'Fix git-subrepos\' parent property.'