avm-git 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08807ed5f28720bdc1346119e0edce88d09298e8922f393cdb747dad2f5a264c'
-  data.tar.gz: 872be582ce4574a19dcca64367fc4daf382e87aec182cbe9480dcf2719652f27
+  metadata.gz: 25deabda475aeffbd9a4f14f9de5078f8f51fb05ffdc4ab98d6f111f030fe2e2
+  data.tar.gz: f0fe9cc8771e0c3fcf81403808f60552ad1f14f78c1f9e5dddc9a9d87395c9dc
 SHA512:
-  metadata.gz: 1af7e9a4aa25da4313b005f9cb82a44b0b9a081959927ebebac2b1405647ae8f06bf6e3ed0cc689ff90785445bd66e5f92da5086670baaeaca3642b04abf3ffc
-  data.tar.gz: 68cf014ecfabb42b1cacf3d689a3311d5f397ccf30912164b9287d8adb53af62a72153d9366d358de418bc2aa751913b61aa915b62c197c981be6fb5e8ddd15f
+  metadata.gz: ec19f43839e2824496ba6254ad12a2dbc194a5472fd80a69243519b371e824f27396d529012e5e073159d8d4b35155dbdff44900fab1999fa18bcbdf709c0a51
+  data.tar.gz: c56a75478acec1016f500f51d5d673cab895fa01e735ef04b6b6ada77d6e1c2165ebb37215ec5d4faf1f1a551dbee4ed34321c7448f81e2d2d6269bdd7052db9

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

@@ -15,7 +15,7 @@ module Avm
             return [] unless branch_hash && follow_master?
 
             interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
-            @git.execute!('rev-list', interval).each_line.map(&:strip)
+            launcher_git.execute!('rev-list', interval).each_line.map(&:strip)
           end
 
           def bifurcations_result
@@ -32,8 +32,8 @@ module Avm
           end
 
           def commit_parents(commit)
-            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
-                .select(&:present?)
+            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                        .select(&:present?)
           end
         end
       end

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

@@ -12,7 +12,7 @@ module Avm
             return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
 
             infom 'Checking Git subrepos...'
-            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
             r.check_remote = true
             r.result
           end

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

@@ -7,16 +7,21 @@ module Avm
     module Issue
       class Complete
         module LocalBranch
+          NO_CURRENT_BRANCH_NAME = 'none'
+
+          # Retrieves the current local branch.
+          #
+          # @return [EacGit::Local::Branch, nil]
           def branch_uncached
-            @git.current_branch
+            eac_git.current_branch
           end
 
           def branch_hash_uncached
-            @git.rev_parse("refs/heads/#{branch}")
+            branch.if_present(&:current_commit_id)
           end
 
           def branch_name
-            branch.split('/')[-1]
+            branch.if_present(NO_CURRENT_BRANCH_NAME, &:name)
           end
 
           def branch_name_result
@@ -38,14 +43,16 @@ module Avm
           end
 
           def follow_master?
-            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+            remote_master_hash ? launcher_git.descendant?(branch_hash, remote_master_hash) : true
           end
 
           def remove_local_branch
+            return unless branch
+
             info 'Removendo branch local...'
             bn = branch_name
-            git(['checkout', branch_hash])
-            git(['branch', '-D', bn])
+            git_execute(['checkout', branch_hash])
+            git_execute(['branch', '-D', bn])
           end
         end
       end

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

@@ -18,7 +18,7 @@ module Avm
 
           def delete_tag
             info 'Removendo tag...'
-            git(['tag', '-d', branch_name])
+            git_execute(['tag', '-d', branch_name])
           end
 
           def tag
@@ -26,11 +26,11 @@ module Avm
           end
 
           def tag_hash
-            @git.rev_parse(tag)
+            launcher_git.rev_parse(tag)
           end
 
           def create_tag
-            git(['tag', branch_name, branch_hash])
+            git_execute(['tag', branch_name, branch_hash])
           end
         end
       end

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

@@ -12,13 +12,7 @@ module Avm
           def dry_push_result
             return ::Avm::Result.error('Nothing to push') if pushs.empty?
 
-            r = @git.execute(dry_push_args)
-            message = if r.fetch(:exit_code).zero?
-                        'ok'
-                      else
-                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
-                      end
-            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+            dry_push_execution_result
           end
 
           def push
@@ -26,7 +20,7 @@ module Avm
               info 'PUSH: Nada a enviar'
             else
               info "PUSH: enviando \"#{pushs}\"..."
-              git(%w[push origin] + pushs)
+              git_execute(%w[push origin] + pushs)
             end
           end
 
@@ -39,7 +33,7 @@ module Avm
           end
 
           def remove_branch_push
-            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+            remote_branch_hash ? ":refs/heads/#{branch.name}" : nil
           end
 
           def tag_push
@@ -47,6 +41,18 @@ module Avm
 
             "#{branch_hash}:#{tag}"
           end
+
+          private
+
+          def dry_push_execution_result
+            r = launcher_git.execute(dry_push_args)
+            message = if r.fetch(:exit_code).zero?
+                        'ok'
+                      else
+                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
+                      end
+            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+          end
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Avm
           end
 
           def remote_branch_hash
-            remote_hashs["refs/heads/#{branch}"]
+            remote_hashs["refs/heads/#{branch.name}"]
           end
 
           def remote_tag_hash
@@ -24,7 +24,7 @@ module Avm
           end
 
           def remote_hashs_uncached
-            @git.remote_hashs(remote_name)
+            launcher_git.remote_hashs(remote_name)
           end
         end
       end

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

@@ -28,7 +28,7 @@ module Avm
 
           def test_performer
             ::Avm::Sources::Tests::Builder
-              .new(::Avm::Registry.sources.detect(@git))
+              .new(::Avm::Registry.sources.detect(launcher_git))
               .include_main(true)
               .include_subs(true)
               .performer

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

@@ -19,7 +19,7 @@ module Avm
           end
 
           def branch_short_hash
-            git(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
+            git_execute(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
           end
         end
       end

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

@@ -11,6 +11,8 @@ module Avm
           enable_simple_cache
           common_constructor :parent, :key, :label
 
+          SKIPPED_RESULT_MESSAGE = 'skipped'
+
           def skip?
             parent.skip_validations.include?(key)
           end
@@ -18,11 +20,17 @@ module Avm
           private
 
           def result_uncached
-            if skip?
-              ::Avm::Result.neutral('skipped')
-            else
-              parent.send("#{key}_result")
-            end
+            skip? ? skipped_result : validation_result
+          end
+
+          def skipped_result
+            ::Avm::Result.neutral(SKIPPED_RESULT_MESSAGE)
+          end
+
+          def validation_result
+            parent.send("#{key}_result")
+          rescue ::RuntimeError => e
+            ::Avm::Result.error("error raised: #{e.message}")
           end
         end
       end

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

@@ -10,7 +10,7 @@ module Avm
           end
 
           def clean_workspace?
-            @git.dirty_files.none?
+            launcher_git.dirty_files.none?
           end
         end
       end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
+require 'eac_git/local'
 
 module Avm
   module Git
@@ -10,14 +11,15 @@ module Avm
         enable_simple_cache
         enable_speaker
 
-        attr_reader :skip_validations
+        BRANCH_NAME_ISSUE_ID_PATTERN =
+
+          attr_reader :dir, :skip_validations
 
         def initialize(options)
           consumer = ::EacRubyUtils::OptionsConsumer.new(options)
-          dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
+          @dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
           validate_skip_validations
           consumer.validate
-          @git = ::Avm::Launcher::Git::Base.new(dir)
         end
 
         def start_banner
@@ -35,16 +37,29 @@ module Avm
         end
 
         def issue_id
-          m = branch_name.match(/\A#{Regexp.quote('issue_')}(\d+)\z/)
-          m ? m[1].to_i : nil
+          branch ? issue_id_parser.parse(branch_name) : nil
+        end
+
+        # @return [EacRubyUtils::RegexpParser]
+        def issue_id_parser
+          /\A#{Regexp.quote('issue_')}(\d+)\z/.to_parser { |m| m[1].to_i }
         end
 
         private
 
-        def git(args, exit_outputs = {})
-          r = @git.execute!(args, exit_outputs: exit_outputs)
+        # @return [EacGit::Local]
+        def eac_git_uncached
+          ::EacGit::Local.new(dir)
+        end
+
+        def git_execute(args, exit_outputs = {})
+          r = launcher_git.execute!(args, exit_outputs: exit_outputs)
           r.is_a?(String) ? r.strip : r
         end
+
+        def launcher_git_uncached
+          ::Avm::Launcher::Git::Base.new(dir)
+        end
       end
     end
   end

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-files
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement