avm-tools 0.84.0 → 0.87.1

data/lib/avm/tools/runner/files/rotate.rb

@@ -1,28 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'avm/files/rotate'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Files < ::EacRubyUtils::Console::DocoptRunner
-        class Rotate < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Rotates a file (Like a backup).
-
-            Usage:
-              __PROGRAM__ [options] <path>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                 Show this screen.
-              -L --space-limit=<space>  Limit by <space> the space used by rotated files.
-          DOCOPT
-
+    class Runner
+      class Files
+        class Rotate
+          runner_with :help do
+            desc 'Rotates a file (Like a backup).'
+            arg_opt '-L', '--space-limit', 'Limit by <space> the space used by rotated files.'
+            pos_arg :path
+          end
           def run
             error_message = rotate.run
             fatal_error(error_message) if error_message
@@ -30,8 +20,8 @@ module Avm
 
           def rotate
             @rotate ||= ::Avm::Files::Rotate.new(
-              options.fetch('<path>'),
-              space_limit: options.fetch('--space-limit')
+              parsed.path,
+              space_limit: parsed.space_limit
             )
           end
         end

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

@@ -7,26 +7,21 @@ require 'eac_launcher/git/base'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
-        DOC = <<~DOCOPT
-          Git utilities for AVM.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-            -C <path>             Path to Git repository.
-        DOCOPT
+    class Runner
+      class Git
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Git utilities for AVM.'
+          arg_opt '-C', '--path', 'Path to Git repository.'
+          subcommands
+        end
 
         def repository_path
-          repository_path? ? options.fetch('-C') : '.'
+          repository_path? ? parsed.path : '.'
         end
 
         def repository_path?
-          options.fetch('-C').present?
+          parsed.path.present?
         end
 
         def git

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

@@ -6,8 +6,8 @@ require 'eac_cli/default_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class AutoCommit < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

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

@@ -1,43 +1,50 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'avm/git/file_auto_fixup'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
-        class AutoFixup < ::EacRubyUtils::Console::DocoptRunner
-          DOC = <<~DOCOPT
-            Auto fixup files.
-
-              Usage:
-              __PROGRAM__ [options] [<files>...]
-            __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                     Mostra esta ajuda.
-          DOCOPT
+    class Runner
+      class Git
+        class AutoFixup
+          runner_with :help do
+            desc 'Auto fixup files.'
+            bool_opt '-l', '--last', 'Equivalent to "--select=1".'
+            arg_opt '-s', '--select', 'Automatically select de <value>-th commit.'
+            bool_opt '-u', '--unique', 'Automatically select the first commit if it is unique.'
+            pos_arg :files, repeat: true, optional: true
+          end
 
           def run
             files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(context(:git), file).run
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, file_options).run
             end
           end
 
           private
 
+          def file_options
+            { Avm::Git::FileAutoFixup::OPTION_SELECT => select,
+              Avm::Git::FileAutoFixup::OPTION_UNIQUE => parsed.unique? }
+          end
+
           def files
             files_from_option || dirty_files
           end
 
           def files_from_option
-            r = options.fetch('<files>')
+            r = parsed.files
             r.any? ? r.map { |p| p.to_pathname.expand_path } : nil
           end
 
           def dirty_files
-            context(:git).dirty_files.map(&:path)
+            runner_context.call(:git).dirty_files.map(&:path)
+          end
+
+          def select
+            parsed.last? ? 1 : parsed.select
           end
         end
       end

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

@@ -9,8 +9,8 @@ require 'avm/git/commit'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Git < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Git
         class Commit < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache
           include ::EacRubyUtils::Console::Speaker

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

@@ -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