avm-tools 0.91.0 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5aa5e8fb2a459dbf2a43a6db6c3c3e2010eafeb38f22986c2ce25f7ed59fe8
-  data.tar.gz: a277ee83c3e5e91ad98d6427294b82f2a3183a3cf7f65e2cecd924bd8f179c74
+  metadata.gz: 1b6568f1c571107315662a90e29d111bf1af9a534c326ea57f358fa68c7ec550
+  data.tar.gz: 808a16008057b72ef58b11d91f05e021c814bca2100f3c5e85c0363bcac97216
 SHA512:
-  metadata.gz: cfdf75803e0dbb82f59c7b385d8eb2947400ad05cc5e92acae171a3312e939808ec4d8b8d23423fde9c30176a21b48d79615cfd3ff403cf91a88361d5a926bbd
-  data.tar.gz: fb6d6065157b1668e96cc612c068cee618901bdf7003b30569c85c7344cd6628da679376801804d30bea0c9ce7f62f0e773501e25942a24ca6a517acbda07c6f
+  metadata.gz: dc0628987c36f9c72d642546a7b4ab85e3c630a239e053af92beb86658deac8fba9c7e389947b843097499fce529d2b100d734173aad36dea200d5c874a61ef8
+  data.tar.gz: c3b19cbf0a2d063e5a436d314b5b20ab7167e584bca986c486e6ee2fd9beccfcd156e0d7095559caf0fd4236f279aeea91a81cb45207cd5b01f769e2987c85b4

data/lib/avm/git/auto_commit/commit_info.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      class CommitInfo
+        enable_immutable
+
+        immutable_accessor :fixup
+
+        def git_commit_args
+          r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          return r if r.any?
+
+          raise 'Argument list is empty'
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        require_sub __FILE__
+
+        RULES_CLASSES = %w[last manual nth unique]
+                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
+
+        class << self
+          def parse(string)
+            parts = string.split(':')
+
+            klass = rule_class_by_key(parts.shift)
+            klass.new(*parts)
+          end
+
+          def rule_class_by_key(key)
+            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
+              raise("Rule not find with key \"#{key}\" (Available: " +
+                RULES_CLASSES.flat_map(&:keys) + ')')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/base.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Base
+          class << self
+            def keys
+              [long_key, short_key]
+            end
+
+            def long_key
+              name.demodulize.variableize
+            end
+
+            def short_key
+              long_key[0, 1]
+            end
+          end
+
+          def with_file(file)
+            self.class.const_get('WithFile').new(self, file)
+          end
+
+          class WithFile
+            common_constructor :rule, :file
+
+            def new_commit_info
+              ::Avm::Git::AutoCommit::CommitInfo.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/last.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Last < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits.last.if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Manual < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            enable_console_speaker
+
+            COMMIT_FORMAT = '%h - %s (%cr)'
+            SKIP_OPTION = 's'
+
+            def commit_info
+              return nil unless file.commits.any?
+
+              commits_banner
+              request_input('Which commit?', list: commits_by_position).if_present do |v|
+                new_commit_info.fixup(v)
+              end
+            end
+
+            def commits_banner
+              file.commits.each_with_index do |commit, _index|
+                infov "    #{commit.position}", format_commit(commit)
+              end
+              infov "    #{SKIP_OPTION}", 'skip'
+            end
+
+            def commits_by_position
+              (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
+                .to_h
+            end
+
+            def format_commit(commit)
+              commit.format(COMMIT_FORMAT)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/nth.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Nth < ::Avm::Git::AutoCommit::Rules::Base
+          common_constructor :number do
+            self.number = number.to_i
+          end
+
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits(number - 1).if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/auto_commit/rules/unique.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Unique < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              return nil unless file.commits.count == 1
+
+              new_commit_info.fixup(file.commits.first)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/file_auto_fixup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/auto_commit/commit_info'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -8,31 +9,24 @@ module Avm
       enable_console_speaker
       enable_simple_cache
       enable_listable
-      lists.add_symbol :option, :select, :unique
 
-      common_constructor :git, :path, :options, default: [{}] do
-        self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
-      end
+      common_constructor :git, :path, :rules
 
-      COMMIT_FORMAT = '%h - %s (%cr)'
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
-      SKIP_OPTION = 's'
 
       def run
         start_banner
-        if commits.count.zero?
-          run_no_commits_found
-        elsif auto_selected_commit.present?
-          fixup_commit(auto_selected_commit)
-        else
-          run_commits_selection
-        end
+        run_commit || warn("No rule returned commit information for \"#{path}\"")
       end
 
       private
 
-      def auto_selected_commit_uncached
-        selected_commit_by_unique || select_commit_by_select
+      def commit_args
+        commit_info.if_present([], &:git_commit_args) + ['--', path]
+      end
+
+      def commit_info_uncached
+        rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
       end
 
       def start_banner
@@ -40,50 +34,13 @@ module Avm
         infov '  Commits found', commits.count
       end
 
-      def run_no_commits_found
-        infom '  No commits found'
-      end
-
-      def fixup_commit(commit)
-        infov '  Commit selected/found', format_commit(commit)
-        git.execute!('commit', '--fixup', commit.sha1, '--', path)
-        success "  Fixup with \"#{format_commit(commit)}\""
-      end
-
-      def run_commits_selection
-        selected_commit = select_commit
-        if selected_commit
-          fixup_commit(selected_commit)
-        else
-          infom '  Skipped'
-        end
-      end
-
-      def select_commit
-        commits_banner
-        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 run_commit
+        return false if commit_info.blank?
 
-      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)
-        end
-        infov "    #{SKIP_OPTION}", 'skip'
-      end
-
-      def commits_by_position
-        (commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]]).to_h
+        infov '  Commit arguments', ::Shellwords.join(commit_args)
+        git.execute!('commit', *commit_args)
+        success '  Commited'
+        true
       end
 
       def commits_uncached
@@ -93,10 +50,6 @@ module Avm
            .each_with_index.map { |commit, index| CommitDelegator.new(commit, index) }
       end
 
-      def format_commit(commit)
-        commit.format(COMMIT_FORMAT)
-      end
-
       class CommitDelegator < ::SimpleDelegator
         attr_reader :index
 

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

@@ -2,16 +2,14 @@
 
 require 'avm/git/auto_commit_path'
 require 'avm/files/formatter'
-require 'eac_cli/default_runner'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
       class Git
-        class AutoCommit < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class AutoCommit
+          runner_with :help do
             desc 'Commit with message based in content commited.'
             bool_opt '-d', '--dirty', 'Select dirty files.'
             bool_opt '-f', '--format', 'Format files before commit.'
@@ -33,17 +31,19 @@ module Avm
 
           def clear_stage
             infom 'Clearing stage...'
-            context(:git).system!('reset', 'HEAD')
+            runner_context.call(:git).system!('reset', 'HEAD')
           end
 
           def dirty_paths
-            return [] unless options.fetch('--dirty')
+            return [] unless parsed.dirty?
 
-            context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
+            runner_context.call(:git).dirty_files.map do |d|
+              runner_context.call(:git).root_path.join / d.path
+            end
           end
 
           def format_files
-            return unless options.fetch('--format')
+            return unless parsed.format?
 
             infom 'Formating files...'
             ::Avm::Files::Formatter.new(paths.map(&:path),
@@ -51,10 +51,9 @@ module Avm
           end
 
           def paths_uncached
-            (options.fetch('<paths>')
-              .map { |p| p.to_pathname.expand_path } + dirty_paths)
-              .reject(&:directory?)
-              .sort.uniq.map { |path| ::Avm::Git::AutoCommitPath.new(context(:git), path) }
+            (parsed.paths.map { |p| p.to_pathname.expand_path } + dirty_paths)
+              .reject(&:directory?).sort.uniq
+              .map { |path| ::Avm::Git::AutoCommitPath.new(runner_context.call(:git), path) }
           end
 
           def run_paths

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

@@ -3,6 +3,7 @@
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'avm/git/file_auto_fixup'
+require 'avm/git/auto_commit/rules'
 
 module Avm
   module Tools
@@ -11,25 +12,18 @@ module Avm
         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.'
+            arg_opt '-r', '--rule', 'Apply a rule in the specified order.', repeat: true
             pos_arg :files, repeat: true, optional: true
           end
 
           def run
             files.each do |file|
-              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, file_options).run
+              ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).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
@@ -43,6 +37,12 @@ module Avm
             runner_context.call(:git).dirty_files.map(&:path)
           end
 
+          def rules
+            parsed.rule.map do |rule_string|
+              ::Avm::Git::AutoCommit::Rules.parse(rule_string)
+            end
+          end
+
           def select
             parsed.last? ? 1 : parsed.select
           end

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

@@ -11,22 +11,13 @@ module Avm
   module Tools
     class Runner
       class Git
-        class Commit < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Mostra informações de um commit.
-
-            Usage:
-              __PROGRAM__ [options] <ref>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help        Mostra esta ajuda.
-              -f --files       Mostra os arquivos.
-              -s --size        Mostra o tamanho de arquivos.
-          DOCOPT
+        class Commit
+          runner_with :help do
+            desc 'Mostra informações de um commit.'
+            bool_opt '-f', '--files', 'Mostra os arquivos.'
+            bool_opt '-s', '--size', 'Mostra o tamanho de arquivos.'
+            pos_arg :ref
+          end
 
           def run
             input_banner
@@ -64,7 +55,7 @@ module Avm
           end
 
           def files_banner
-            return unless options.fetch('--files')
+            return unless parsed.files?
 
             commit.files.each do |file|
               infov "  #{file.path}", file_value(file)
@@ -82,11 +73,11 @@ module Avm
           end
 
           def reference
-            options.fetch('<ref>')
+            parsed.ref
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(context(:repository_path))
+            ::EacLauncher::Git::Base.new(runner_context.call(:repository_path))
           end
 
           def commit_uncached
@@ -103,7 +94,7 @@ module Avm
           end
 
           def show_size?
-            options.fetch('--size')
+            parsed.size?
           end
         end
       end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.91.0'
+    VERSION = '0.92.0'
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/argument_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         true
       end
+
+      def build_value(new_value, previous_value)
+        repeat? ? previous_value + [new_value] : new_value
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
     end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -8,7 +8,8 @@ module EacCli
       DEFAULT_REQUIRED = false
 
       enable_listable
-      lists.add_symbol :option, :optional, :usage, :required
+      enable_abstract_methods :build_value, :default_value
+      lists.add_symbol :option, :optional, :usage, :repeat, :required
       attr_reader :short, :long, :description, :options
 
       def initialize(short, long, description, options = {})
@@ -23,6 +24,10 @@ module EacCli
         long.to_s.variableize.to_sym
       end
 
+      def repeat?
+        options[OPTION_REPEAT]
+      end
+
       def required?
         return true if options.key?(:required) && options.fetch(:required)
         return false if options.key?(:optional) && options.fetch(:optional)

data/vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         false
       end
+
+      def build_value(_new_value, previous_value)
+        repeat? ? previous_value + 1 : true
+      end
+
+      def default_value
+        repeat? ? 0 : false
+      end
     end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb

@@ -13,6 +13,18 @@ module EacCli
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
+      def build_value(new_value, previous_value)
+        if previous_value.is_a?(::Array)
+          previous_value + [new_value]
+        else
+          new_value
+        end
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
+
       def identifier
         name.to_s.variableize.to_sym
       end

data/vendor/eac_cli/lib/eac_cli/parser/collector.rb

@@ -24,11 +24,7 @@ module EacCli
       end
 
       def collect(option, value)
-        if data[option].is_a?(::Array)
-          data[option] << value
-        else
-          data[option] = value
-        end
+        data[option] = option.build_value(value, data[option])
       end
 
       def supplied?(option)
@@ -42,18 +38,8 @@ module EacCli
       end
 
       def default_values
-        definition.options.each { |option| data[option] = option_default_value(option) }
-        definition.positional.each do |positional|
-          data[positional] = positional_default_value(positional)
-        end
-      end
-
-      def option_default_value(option)
-        option.argument? ? nil : false
-      end
-
-      def positional_default_value(positional)
-        positional.repeat? ? [] : nil
+        definition.options.each { |option| data[option] = option.default_value }
+        definition.positional.each { |positional| data[positional] = positional.default_value }
       end
     end
   end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.12.6'
+  VERSION = '0.13.0'
 end

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe ::EacCli::Runner do
       runner_definition do
         arg_opt '-o', '--opt1', 'A arg option.'
         bool_opt '-p', '--opt2', 'A boolean option'
+        arg_opt '-q', '--opt4', 'A repeatable argument option.', repeat: true
+        bool_opt '-r', '--opt5', 'A repeatable boolean option', repeat: true
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -29,7 +31,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when all args are supplied' do
     let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
     let(:parsed_expected) do
-      { opt1: 'aaa', opt2: true, opt3: false, pos1: 'bbb',
+      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
         pos2: %w[ccc ddd] }
     end
 
@@ -63,7 +65,10 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
@@ -82,12 +87,25 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: true, pos1: nil, pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, pos1: nil,
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt3?).to eq(true) }
   end
 
+  context 'when repeated options are supplied' do
+    let(:argv) { %w[--opt5 -rrr --opt4=A -q B --opt4 C AAA] }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, pos1: 'AAA',
+        pos2: [] }
+    end
+
+    it { expect(parsed_actual).to eq(parsed_expected) }
+  end
+
   context 'when extra args are not supplied' do
     let(:runner_class) do
       the_module = described_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.92.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -400,6 +400,13 @@ files:
 - lib/avm/files/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb
+- lib/avm/git/auto_commit/commit_info.rb
+- lib/avm/git/auto_commit/rules.rb
+- lib/avm/git/auto_commit/rules/base.rb
+- lib/avm/git/auto_commit/rules/last.rb
+- lib/avm/git/auto_commit/rules/manual.rb
+- lib/avm/git/auto_commit/rules/nth.rb
+- lib/avm/git/auto_commit/rules/unique.rb
 - lib/avm/git/auto_commit_path.rb
 - lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb