avm-tools 0.86.0 → 0.90.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, optional: true
+          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

@@ -2,16 +2,13 @@
 
 require 'avm/instances/base'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Instance < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Instance
         require_sub __FILE__
-        runner_with
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities for generic instances.'
           pos_arg :instance_id
           subcommands
@@ -20,7 +17,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Instances::Base.by_id(options['<instance_id>'])
+          ::Avm::Instances::Base.by_id(parsed.instance_id)
         end
       end
     end

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

@@ -2,16 +2,13 @@
 
 require 'avm/instances/entry_keys'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Instance < ::EacRubyUtils::Console::DocoptRunner
-        class Info < ::EacRubyUtils::Console::DocoptRunner
-          runner_with
-
-          runner_definition do
+    class Runner
+      class Instance
+        class Info
+          runner_with :help do
             desc 'Show info about a instance.'
           end
 
@@ -35,7 +32,7 @@ module Avm
           end
 
           def instance
-            context(:instance)
+            runner_context.call(:instance)
           end
         end
       end

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_base1.rb → eac_asciidoctor_base0.rb}

@@ -5,13 +5,13 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase1
+    class Runner
+      class LocalProject
+        class EacAsciidoctorBase0
           require_sub __FILE__
 
           runner_with :help, :subcommands do
-            desc 'EacWritingsBase0 utitilies for local projects.'
+            desc 'EacAsciidoctorBase0 utitilies for local projects.'
             subcommands
           end
 

data/lib/avm/tools/runner/local_project/{eac_writings_base1 → eac_asciidoctor_base0}/build.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/eac_writings_base1/build'
-require 'avm/eac_writings_base1/project'
+require 'avm/eac_asciidoctor_base0/build'
+require 'avm/eac_asciidoctor_base0/project'
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase1
+    class Runner
+      class LocalProject
+        class EacAsciidoctorBase0
           class Build
             runner_with :help do
               desc 'Build the project'
@@ -24,8 +24,8 @@ module Avm
             private
 
             def build_uncached
-              ::Avm::EacWritingsBase1::Build.new(runner_context.call(:project),
-                                                 target_directory: parsed.target_dir)
+              ::Avm::EacAsciidoctorBase0::Build.new(runner_context.call(:project),
+                                                    target_directory: parsed.target_dir)
             end
 
             def default_target_directory
@@ -36,10 +36,6 @@ module Avm
               runner_context.call(:project_banner)
               infov 'Target directory', build.target_directory
             end
-            #
-            #            def target_directory_uncached
-            #              .if_present(default_target_directory).to_pathname
-            #            end
           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/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