avm-tools 0.86.0 → 0.87.0

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

@@ -1,32 +1,22 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/git/base'
 require 'avm/git/commit'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy a Git revision to a location (Local or remote).
-
-            Usage:
-              __PROGRAM__ [options] [<target-url>]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                     Mostra esta ajuda.
-              -r --reference=<reference>    Reference [default: HEAD].
-              -i --instance=<instance-id>   Read entries from instance with id=<instance-id>.
-              -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
-          DOCOPT
+    class Runner
+      class Git
+        class Deploy
+          DEFAULT_REFERENCE = 'HEAD'
+
+          runner_with :help do
+            desc 'Deploy a Git revision to a location (Local or remote).'
+            arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+            arg_opt '-i', '--instance', 'Read entries from instance with id=<instance-id>.'
+            arg_opt '-r', '--reference', "Reference (default: #{DEFAULT_REFERENCE})."
+            pos_arg :target_url
+          end
 
           def run
             input_banner
@@ -62,7 +52,7 @@ module Avm
           end
 
           def reference
-            options.fetch('--reference')
+            parsed.reference || DEFAULT_REFERENCE
           end
 
           def git_uncached
@@ -70,8 +60,8 @@ module Avm
           end
 
           def git_repository_path
-            if context('repository_path?') || dev_instance_fs_path.blank?
-              return context(:repository_path)
+            if runner_context.call(:repository_path) || dev_instance_fs_path.blank?
+              return runner_context.call(:repository_path)
             end
 
             dev_instance_fs_path
@@ -94,7 +84,7 @@ module Avm
           end
 
           def target_url
-            options['<target-url>'].if_present { |v| return v }
+            parsed.target_url.if_present { |v| return v }
             instance.if_present { |v| return v.read_entry('fs.url') }
             nil
           end
@@ -108,11 +98,11 @@ module Avm
           end
 
           def instance_id
-            options.fetch('--instance')
+            parsed.instance
           end
 
           def appended_directories
-            options.fetch('--append-dirs').to_s.split(':')
+            parsed.append_dirs.to_s.split(':')
           end
         end
       end

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class DirtyFiles < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker
 

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

@@ -6,8 +6,8 @@ require 'avm/git/issue/complete'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Issue < ::EacRubyUtils::Console::DocoptRunner
           enable_simple_cache
           include ::EacRubyUtils::Console::Speaker

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Organize < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -6,8 +6,8 @@ require 'avm/git/revision_test'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class RevisionsTest < ::EacRubyUtils::Console::DocoptRunner
           enable_simple_cache
           enable_console_speaker

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Subrepo < ::EacRubyUtils::Console::DocoptRunner
           require_sub __FILE__
           include ::EacCli::DefaultRunner

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Subrepo < ::EacRubyUtils::Console::DocoptRunner
           class Check < ::EacRubyUtils::Console::DocoptRunner
             include ::EacCli::DefaultRunner

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Subrepo < ::EacRubyUtils::Console::DocoptRunner
           class Clone
             runner_with :help do

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Subrepo < ::EacRubyUtils::Console::DocoptRunner
           class Fix
             runner_with :help do
@@ -29,7 +29,8 @@ module Avm
               infov 'Dirty files', local_repos.dirty_files.count
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
-                ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path).run
+                ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
+                                              ::Avm::Git::FileAutoFixup::OPTION_UNIQUE => true).run
               end
             end
 

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

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Instance < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
         runner_with

data/lib/avm/tools/runner/instance/info.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Instance < ::EacRubyUtils::Console::DocoptRunner
         class Info < ::EacRubyUtils::Console::DocoptRunner
           runner_with

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

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
         include ::EacCli::DefaultRunner

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

@@ -4,7 +4,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Instances < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

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

@@ -5,7 +5,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Projects < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

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

@@ -4,7 +4,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Publish < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

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

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 require 'avm/local_projects/instance'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         require_sub __FILE__
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities for local projects.'
           arg_opt '-C', '--path', 'Path to local project instance.'
           subcommands
@@ -29,7 +26,7 @@ module Avm
         end
 
         def instance_path_uncached
-          (options.fetch('--path') || '.').to_pathname.expand_path
+          (parsed.path || '.').to_pathname.expand_path
         end
       end
     end

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase0
           require_sub __FILE__
           enable_simple_cache

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase0
           class BuildChapters
             runner_with :help do

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase0
           class BuildSingle
             runner_with :help do

data/lib/avm/tools/runner/local_project/eac_writings_base0/info.rb

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase0
           class Info
             runner_with :help do

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase1
           require_sub __FILE__
 

data/lib/avm/tools/runner/local_project/eac_writings_base1/build.rb

@@ -7,8 +7,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase1
           class Build
             runner_with :help do

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Info < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -7,8 +7,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           require_sub __FILE__
           include ::EacCli::DefaultRunner

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

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             require_sub __FILE__

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             class GemfileLock < ::EacRubyUtils::Console::DocoptRunner

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Test < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Update < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/version'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class VersionBump < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+    class Runner
+      class LocalProject
+        class VersionBump
+          runner_with :help do
             desc 'Bump version of a local project.'
             arg_opt '-n', '--new', 'Set new version.'
             arg_opt '-s', '--segment', 'Increment de <segment>-th segment (Left-most is 0)'
@@ -29,7 +26,7 @@ module Avm
           def run_version_changed
             infom 'Version changed'
             if confirm?
-              context(:instance).run_job(:version_bump, target_version)
+              runner_context.call(:instance).run_job(:version_bump, target_version)
               success 'Bumped'
             else
               fatal_error 'Bump unconfirmed'
@@ -41,23 +38,23 @@ module Avm
           end
 
           def start_banner
-            context(:instance_banner)
+            runner_context.call(:instance_banner)
             infov 'Current version', current_version.if_present('-')
             infov 'Target version', target_version.if_present('-')
           end
 
           def confirm?
-            options.fetch('--yes') || request_input('Confirm version bump?', bool: true)
+            parsed.yes? || request_input('Confirm version bump?', bool: true)
           end
 
           def current_version_uncached
-            context(:instance).if_respond('version')
+            runner_context.call(:instance).if_respond('version')
           end
 
           def target_version_uncached
             r = current_version
             %w[new segment major minor patch].each do |option|
-              option_value = options.fetch("--#{option}")
+              option_value = parsed[option]
               next if option_value.blank?
 
               r = send("target_version_from_#{option}", r, option_value)