avm-tools 0.33.1 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f708f3072f93556dae56f82d2453331feabdb25b0862ece5db75fb69f62f0e8
-  data.tar.gz: 6121ec8f21d98b1fa4f89e1f519455be06cf4f93446960336dfe86eac6de609c
+  metadata.gz: bc93a50b713fa65d2893cb05c7a38feab44295c625011c6597d5aeaaf866ccf9
+  data.tar.gz: 67ab9170e9c7e780bf839d0bdb1d5ebe4edb91e2d46b08af22a46c5bfb2c93c6
 SHA512:
-  metadata.gz: 10c43268cb9404bee7d99afbaea5d0131ea2081b293d4b11df7a5837174e87095255cbfbb18a9359df316d5105c4479b675c055259a0b7d5e673a2c21b7262ec
-  data.tar.gz: 53ef9178434c46af701bb101ee1979f54bf5b8f2de208a6dce4df33adb46345e2d8bc8f2e8c7b62b7f58b6504836a1ed928b549380f09186d782bb66c9ec5b85
+  metadata.gz: d6f5008949bde37c4f319aea45a7676b7acc314408154fabe3ace835206dd44f988cd6593e6b571291898bc659fcd013f3d43e49807f9046233f5c028f4894d6
+  data.tar.gz: d9db915b89d71139af123feab08e08e3a4743a866d3895c9fbedb5b61def92e64d0509c9e7bb7fffbc56f76fdf7239087ef26810d7b80cd6155513d25ea75a82

data/lib/avm/git/issue/complete.rb

@@ -14,11 +14,12 @@ module Avm
         include ::EacRubyUtils::SimpleCache
         include ::EacRubyUtils::Console::Speaker
 
-        attr_reader :no_validate_branch
+        attr_reader :skip_validations
 
         def initialize(options)
           consumer = ::EacRubyUtils::OptionsConsumer.new(options)
-          dir, @no_validate_branch = consumer.consume_all(:dir, :no_validate_branch)
+          dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
+          validate_skip_validations
           consumer.validate
           @git = ::EacLauncher::Git::Base.new(dir)
         end

data/lib/avm/git/issue/complete/_local_branch.rb

@@ -19,10 +19,7 @@ module Avm
         end
 
         def branch_name_result
-          ::Avm::Result.success_or_error(
-            branch_name,
-            issue_id || no_validate_branch
-          )
+          ::Avm::Result.success_or_error(branch_name, issue_id.present?)
         end
 
         def branch_hash_result

data/lib/avm/git/issue/complete/_validations.rb

@@ -1,34 +1,52 @@
 # frozen_string_literal: true
 
 require 'avm/result'
+require 'ostruct'
 
 module Avm
   module Git
     module Issue
       class Complete
         VALIDATIONS = {
+          clean_workspace: 'Clean workspace?',
           branch_name: 'Branch name',
           branch_hash: 'Branch hash',
           follow_master: 'Follow master?',
           commits: 'Commits?',
           bifurcations: 'Bifurcations?',
           dry_push: 'Dry push?'
-        }.freeze
+        }.with_indifferent_access.freeze
 
         def valid?
-          validations.values.none?(&:error?)
+          validations.map(&:result).none?(&:error?)
         end
 
         def validations_banner
-          validations.each do |label, result|
-            infov label, result.label
+          validations.each do |v|
+            infov "[#{v.key}] #{v.label}", v.result.label
           end
         end
 
         def validations
           VALIDATIONS.map do |key, label|
-            [label, send("#{key}_result")]
-          end.to_h
+            ::OpenStruct.new(key: key, label: label, result: validation_result(key))
+          end
+        end
+
+        def validation_result(key)
+          if skip_validations.include?(key)
+            ::Avm::Result.neutral('skipped')
+          else
+            send("#{key}_result")
+          end
+        end
+
+        def validate_skip_validations
+          skip_validations.each do |validation|
+            next if VALIDATIONS.keys.include?(validation)
+
+            raise "\"#{validation}\" is not a registered validation"
+          end
         end
       end
     end

data/lib/avm/git/issue/complete/_working_tree.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        def clean_workspace_result
+          r = @git.dirty_files.none?
+          ::Avm::Result.success_or_error(r ? 'yes' : 'no', r)
+        end
+      end
+    end
+  end
+end

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

@@ -20,9 +20,13 @@ module Avm
                 __PROGRAM__ -h | --help
 
               Options:
-                -h --help                 Show this screen.
-                -B --no-validate-branch   Does not validate branch/tag name.
-                -y --yes                  Does not ask for user confirmation.
+                -h --help                             Show this screen.
+                -s --skip-validations=<validations>   Does not validate conditions on <validations>
+                                                      (Comma separated value).
+                -y --yes                              Does not ask for user confirmation.
+
+              Validations:
+              %%VALIDATIONS%%
             DOCOPT
 
             def run
@@ -32,15 +36,26 @@ module Avm
               complete.run if confirm?
             end
 
+            def doc
+              DOC.gsub('%%VALIDATIONS%%', doc_validations_list)
+            end
+
             private
 
             def confirm?
               options.fetch('--yes') || request_input('Confirm issue completion?', bool: true)
             end
 
+            def skip_validations
+              options.fetch('--skip-validations').to_s.split(',').map(&:strip).reject(&:blank?)
+            end
+
             def git_complete_issue_options
-              { dir: context(:repository_path),
-                no_validate_branch: options.fetch('--no-validate-branch') }
+              { dir: context(:repository_path), skip_validations: skip_validations }
+            end
+
+            def doc_validations_list
+              ::Avm::Git::Issue::Complete::VALIDATIONS.keys.map { |k| "  * #{k}" }.join("\n")
             end
           end
         end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.33.1'
+    VERSION = '0.34.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.34.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -210,6 +210,7 @@ files:
 - lib/avm/git/issue/complete/_remote.rb
 - lib/avm/git/issue/complete/_tracker.rb
 - lib/avm/git/issue/complete/_validations.rb
+- lib/avm/git/issue/complete/_working_tree.rb
 - lib/avm/git/revision_test.rb
 - lib/avm/git/spec_helper.rb
 - lib/avm/instances.rb