avm-tools 0.94.2 → 0.98.0

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.'

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

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
+      class Launcher
         require_sub __FILE__
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities to deploy applications and libraries.'
           subcommands
         end

data/lib/avm/tools/runner/launcher/instances.rb

@@ -1,28 +1,21 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Instances < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Mostra informações sobre instâncias.
-
-            Usage:
-              __PROGRAM__ [options] [<instance_path>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-              --all            Get all instances.
-              --recache        Rewrite instances cache.
-
-          DOCOPT
+      class Launcher
+        class Instances < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Mostra informações sobre instâncias.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '--all', 'Get all instances.'
+            pos_arg :instance_path, repeat: true, optional: true
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.recache?
             instances.each { |i| show_instance(i) }
           end
 
@@ -34,10 +27,6 @@ module Avm
             infov('  * Git current revision', instance.options.git_current_revision)
             infov('  * Git publish remote', instance.options.git_publish_remote)
           end
-
-          def instance_path
-            options['<instance_path>']
-          end
         end
       end
     end

data/lib/avm/tools/runner/launcher/projects.rb

@@ -1,29 +1,21 @@
 # frozen_string_literal: true
 
 require 'eac_launcher/context'
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Projects < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Shows available projects.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help        Show this screen.
-              -i --instances   Show instances.
-              --recache        Rewrite instances cache.
-
-          DOCOPT
+      class Launcher
+        class Projects < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Shows available projects.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '-i', '--instances', 'Show instances.'
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.recache?
             ::EacLauncher::Context.current.projects.each do |p|
               show_project(p)
             end
@@ -33,7 +25,7 @@ module Avm
 
           def show_project(project)
             puts project_label(project)
-            return unless options['--instances']
+            return unless parsed.instances?
 
             project.instances.each do |i|
               puts "  * #{instance_label(i)}"

data/lib/avm/tools/runner/launcher/publish.rb

@@ -1,33 +1,26 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/runner_helper'
+require 'avm/launcher/instances/runner_helper'
 
 module Avm
   module Tools
     class Runner
-      class Launcher < ::EacRubyUtils::Console::DocoptRunner
-        class Publish < ::EacLauncher::Instances::RunnerHelper
-          DOC = <<~DOCOPT
-            Publica projetos ou instâncias.
-
-            Usage:
-              __PROGRAM__ [options] [<instance_path>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help             Show this screen.
-              --new                 Publish projects not published before.
-              -s --stereotype=<st>  Publish only for stereotype <stereotype>.
-              --all            Publish all instances.
-              -d --dry-run          "Dry run" publishing.
-              --pending             Publish only pending.
-              --recache             Rewrite instances cache.
-              --run                 Confirm publishing.
-
-          DOCOPT
+      class Launcher
+        class Publish < ::Avm::Launcher::Instances::RunnerHelper
+          runner_with :help do
+            desc 'Publica projetos ou instâncias.'
+            bool_opt '--all', 'Get all instances.'
+            bool_opt '-d', '--dry-run', '"Dry run" publishing.'
+            bool_opt '--new', 'Publish projects not published before.'
+            bool_opt '--pending', 'Publish only pending.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+            bool_opt '--run', 'Confirm publishing.'
+            arg_opt '-s', '--stereotype', 'Publish only for stereotype <stereotype>.'
+            pos_arg :instance_path, repeat: true, optional: true
+          end
 
           def run
-            ::EacLauncher::Context.current.recache = options['--recache']
+            ::EacLauncher::Context.current.recache = parsed.recache?
             build_publish_options
             instances.each do |i|
               next unless i.options.publishable?
@@ -39,7 +32,7 @@ module Avm
           private
 
           def dry_run?
-            options.fetch('--dry-run')
+            parsed.dry_run?
           end
 
           def instance_method
@@ -51,12 +44,11 @@ module Avm
           end
 
           def publish_options
-            { new: options.fetch('--new'), stereotype: options.fetch('--stereotype'),
-              confirm: run? }
+            { new: parsed.new?, stereotype: parsed.stereotype?, confirm: run? }
           end
 
           def run?
-            options.fetch('--run') && !dry_run?
+            parsed.run? && !dry_run?
           end
         end
       end

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

@@ -1,43 +1,27 @@
 # frozen_string_literal: true
 
+require 'avm/core_ext'
 require 'avm/ruby/rubocop'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Ruby
-        class Rubocop < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-          include ::EacRubyUtils::SimpleCache
-
-          DOC = <<~DOCOPT
-            Runs Rubocop (https://rubygems.org/gems/rubocop).
-
-            Usage:
-              __PROGRAM__ [options] [<rubocop-args>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help               Show this screen.
-              -C=<path>               Caminho para executar o Rubocop [default: .].
-          DOCOPT
+        class Rubocop
+          runner_with :help do
+            desc 'Runs Rubocop (https://rubygems.org/gems/rubocop).'
+            arg_opt '-C', 'Caminho para executar o Rubocop [default: .].'
+            pos_arg :rubocop_args, repeat: true, optional: true
+          end
 
           def run
-            ::Avm::Ruby::Rubocop.new(path, rubocop_args).run
+            ::Avm::Ruby::Rubocop.new(path, parsed.rubocop_args).run
           end
 
           private
 
           def path
-            ::Pathname.new(options.fetch('-C')).expand_path
-          end
-
-          def rubocop_args
-            r = options.fetch('<rubocop-args>')
-            r.shift if r.first == '--'
-            r
+            ::Pathname.new(parsed.c || '.').expand_path
           end
         end
       end