avm-tools 0.86.0 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d94c38f057d3459362f2f15eba68de92e72a7141f03a5c029e920db648eb34b
-  data.tar.gz: 2719a55cb7b994c496349331e4b5a40a11307e4fe92d889914d3005836d68398
+  metadata.gz: df3208595cdaefa7e6f51a5a14518064df146b2081e32365e3ad746326e844bb
+  data.tar.gz: 367b039c49b3ff3e9a8083bafe1c889656e924403014efbeec2f3032ccfe0247
 SHA512:
-  metadata.gz: 54d1c5271e6d30791bbc6a9cd6084f21ef2e171f3b64e21c315aa41f4bf2f289ae4c8725f74280a0f008d4a6fb32ce85f71fcf3f5e83d46a5ef14d48dc7a6174
-  data.tar.gz: 2c717894f623ab3bfd4b8b489c01adf8cc564a638c374fa1f7dbc5f9be715461ae4b1f8847b22d48a383e51775754eac408d8f6273260ff32dd1837acd5b30dd
+  metadata.gz: 1e1aa08cda713c6600a551681f4f2d986e939675ba41bd5f270497f9dba564213906ae71890ce9ea00285a289d8edc626d70bd91aa31e2a381524bc19404d58b
+  data.tar.gz: 25c272f9097b2d48cf1d88ece314eef1361527644942c3b0e1e862709f60e155ac4db9a31b823432f72abd478eaec9f4218503932228a8bf0c44c30b3a3ee46b

data/lib/avm/git/file_auto_fixup.rb

@@ -7,8 +7,12 @@ module Avm
     class FileAutoFixup
       enable_console_speaker
       enable_simple_cache
+      enable_listable
+      lists.add_symbol :option, :select, :unique
 
-      common_constructor :git, :path
+      common_constructor :git, :path, :options, default: [{}] do
+        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+      end
 
       COMMIT_FORMAT = '%h - %s (%cr)'
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
@@ -18,8 +22,8 @@ module Avm
         start_banner
         if commits.count.zero?
           run_no_commits_found
-        elsif commits.count == 1
-          fixup_commit(commits.first)
+        elsif auto_selected_commit.present?
+          fixup_commit(auto_selected_commit)
         else
           run_commits_selection
         end
@@ -27,6 +31,10 @@ module Avm
 
       private
 
+      def auto_selected_commit_uncached
+        selected_commit_by_unique || select_commit_by_select
+      end
+
       def start_banner
         infov 'Path', path
         infov '  Commits found', commits.count
@@ -56,6 +64,17 @@ module Avm
         request_input('Which commit?', list: commits_by_position)
       end
 
+      def selected_commit_by_unique
+        return unless options[OPTION_UNIQUE]
+        return commits.first if commits.first
+      end
+
+      def select_commit_by_select
+        options[OPTION_SELECT].if_present(&:to_i).if_present do |v|
+          commits.find { |commit| commit.position == v }
+        end
+      end
+
       def commits_banner
         commits.each_with_index do |commit, _index|
           infov "    #{commit.position}", format_commit(commit)

data/lib/avm/tools/runner.rb

@@ -3,14 +3,12 @@
 require 'avm/self'
 require 'avm/tools/version'
 require 'eac_ruby_base0/runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      include ::EacRubyBase0::Runner
+    class Runner
       require_sub __FILE__
+      include ::EacRubyBase0::Runner
 
       runner_definition do
         desc 'Tools for AVM.'

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         require_sub __FILE__
       end

data/lib/avm/tools/runner/eac_rails_base0/apache_path.rb

@@ -7,7 +7,7 @@ require 'avm/eac_rails_base0/apache_path'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
         class ApachePath < ::EacRubyUtils::Console::DocoptRunner
           runner_with

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         require_sub __FILE__
       end

data/lib/avm/tools/runner/eac_redmine_base0/core_update.rb

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class CoreUpdate < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner

data/lib/avm/tools/runner/eac_redmine_base0/docker.rb

@@ -4,7 +4,7 @@ require 'avm/docker/runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class Docker < ::Avm::Docker::Runner
         end

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -5,7 +5,7 @@ require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class ProjectRename
           runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class EacWordpressBase0 < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end

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

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

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

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

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

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
-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 Files < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Files
         require_sub __FILE__
-
-        DOC = <<~DOCOPT
-          Files utilities for AVM.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+        runner_with :help, :subcommands do
+          desc 'Files utilities for AVM.'
+          subcommands
+        end
       end
     end
   end

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

@@ -1,40 +1,31 @@
 # frozen_string_literal: true
 
 require 'avm/files/formatter'
+require 'eac_cli/core_ext'
 require 'eac_launcher/git/base'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Files < ::EacRubyUtils::Console::DocoptRunner
-        class Format < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Format files.
-
-            Usage:
-              __PROGRAM__ [options] [<paths>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                 Show this screen.
-              -a --apply                Confirm changes.
-              -n --no-recursive         No recursive.
-              -v --verbose              Verbose
-              -d --git-dirty            Select Git dirty files to format.
-          DOCOPT
+    class Runner
+      class Files
+        class Format
+          runner_with :help do
+            desc 'Format files.'
+            bool_opt '-a', '--apply', 'Confirm changes.'
+            bool_opt '-n', '--no-recursive', 'No recursive.'
+            bool_opt '-v', '--verbose', 'Verbose'
+            bool_opt '-d', '--git-dirty', 'Select Git dirty files to format.'
+            pos_arg :paths, repeat: true, optional: true
+          end
 
           def run
             ::Avm::Files::Formatter.new(source_paths, formatter_options).run
           end
 
           def formatter_options
-            { ::Avm::Files::Formatter::OPTION_APPLY => options.fetch('--apply'),
-              ::Avm::Files::Formatter::OPTION_RECURSIVE => !options.fetch('--no-recursive'),
-              ::Avm::Files::Formatter::OPTION_VERBOSE => options.fetch('--verbose') }
+            { ::Avm::Files::Formatter::OPTION_APPLY => parsed.apply?,
+              ::Avm::Files::Formatter::OPTION_RECURSIVE => !parsed.no_recursive?,
+              ::Avm::Files::Formatter::OPTION_VERBOSE => parsed.verbose? }
           end
 
           def git
@@ -46,10 +37,10 @@ module Avm
           end
 
           def source_paths
-            if options.fetch('--git-dirty')
-              options.fetch('<paths>') + git_dirty_files
+            if parsed.git_dirty?
+              parsed.paths + git_dirty_files
             else
-              options.fetch('<paths>').if_present(%w[.])
+              parsed.paths.if_present(%w[.])
             end
           end
         end

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