avm-tools 0.85.0 → 0.88.0

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_base0.rb

@@ -6,14 +6,13 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           require_sub __FILE__
-          runner_with
           enable_simple_cache
 
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'EacWritingsBase0 utitilies for local projects.'
             subcommands
           end
@@ -26,7 +25,7 @@ module Avm
           private
 
           def project_uncached
-            ::Avm::EacWritingsBase0::Project.new(context(:instance_path))
+            ::Avm::EacWritingsBase0::Project.new(runner_context.call(:instance_path))
           end
         end
       end

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

@@ -6,13 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class BuildChapters
-            runner_with
-
-            runner_definition do
+            runner_with :help do
               arg_opt '-o', '--output-dir', 'Output chapters to specific directory.'
             end
 

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

@@ -6,12 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class BuildSingle
-            runner_with
-            runner_definition do
+            runner_with :help do
               arg_opt '-s', '--source-dir', 'Write .tex source code in specific directory.'
               arg_opt '-f', '--output-file', 'Output to specific file.'
               arg_opt '-c', '--chapter', 'Write only the chapter <chapter>.'

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

@@ -6,12 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class Info
-            runner_with
-            runner_definition do
+            runner_with :help do
               desc 'Information about a loca EacRailsBase0 local project.'
             end
 

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)