avm-tools 0.101.0 → 0.103.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5243b812d2aa6e9e61cff80a964aa4b035abd9dd85051f5798fbfc6b1c00486a
-  data.tar.gz: 8c79b0a42a1d863349129e5a2ab8d091f8765abea99815d4f706e64126f843bc
+  metadata.gz: bee250c84ba8f56a38c3e10bc301116cab8098d23cf7f75a5027a7ae43b66d80
+  data.tar.gz: db17fbed340f859c761618bb94f6d83baa59b6e4c6d15fd7d053589d875175d3
 SHA512:
-  metadata.gz: f1c66dd955e5367563ccad9d9ae5e44946c109b9abf519b3bddb04cd5bda6dcb4b74a6bc4745f1ba7fd400111ab5ce41e5172cd3d28765ea44106531ba8d8644
-  data.tar.gz: 2b7c051160d2c1b549a25b6a620a9458c151b85887c1bcffd859ac4099fd72e57a6d2af17309b293883a1da0b431a64b54e8491446e191efed274f18a2f93dfe
+  metadata.gz: 7088176c3a9109762de09fbd347836bc9f86fb856f1fc4703c7f7f91e5309b596935466231dd8bb316285ae613a29f611bc992d8ae43cc03f8daf308bce0740c
+  data.tar.gz: ff79f6f21852b281262254df6d3f0eccab89129f972b83e8b9e524edfee9e32484afe0cbf46f502284c0df6d3fe5c8cc57c3a342c9331e0b7be0c468fbf0738d

data/lib/avm/app_src.rb

@@ -2,6 +2,7 @@
 
 require 'avm/apps/sources/configuration'
 require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 require 'i18n'
@@ -27,7 +28,7 @@ module Avm
     end
 
     def run_job(job, job_args = [])
-      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+      stereotypes_jobs(job, job_args).each(&:run)
     end
 
     private
@@ -37,14 +38,14 @@ module Avm
       ::Avm::Apps::Sources::Configuration.find_in_path(path)
     end
 
-    def run_stereotype_job(stereotype, job, job_args)
+    def stereotypes_jobs(job, job_args)
       job_class_method = "#{job}_class"
-      if stereotype.send(job_class_method).present?
-        puts stereotype.label + ": #{job} class found. Running..."
-        stereotype.send(job_class_method).new(self, *job_args).run
-      else
-        puts stereotype.label + ": #{job} class not found"
+      r = []
+      stereotypes.each do |stereotype|
+        r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
       end
+      r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
     end
 
     def stereotypes_uncached

data/lib/avm/data/package/dump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/files/rotate'
 require 'minitar'
 

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

@@ -17,7 +17,7 @@ module Avm
               return nil unless file.commits.any?
 
               commits_banner
-              request_input('Which commit?', list: commits_by_position).if_present do |v|
+              input('Which commit?', list: commits_by_position).if_present do |v|
                 new_commit_info.fixup(v)
               end
             end

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

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/options_consumer'
-require 'eac_ruby_utils/require_sub'
-require 'eac_ruby_utils/simple_cache'
-::EacRubyUtils.require_sub(__FILE__)
+require 'avm/tools/core_ext'
 
 module Avm
   module Git
     module Issue
       class Complete
-        include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
+        enable_speaker
 
         attr_reader :skip_validations
 

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Commits
+          def commits_result
+            ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
+          end
+
+          def commits_uncached
+            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)
+          end
+
+          def bifurcations_result
+            commits.each do |commit|
+              if multiple_parents?(commit)
+                return ::Avm::Result.error("#{commit} has multiple parents")
+              end
+            end
+            ::Avm::Result.success('no')
+          end
+
+          def multiple_parents?(commit)
+            commit_parents(commit).count > 1
+          end
+
+          def commit_parents(commit)
+            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                .select(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module GitSubrepos
+          def git_subrepos_result
+            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.check_remote = true
+            r.result
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalBranch
+          def branch_uncached
+            @git.current_branch
+          end
+
+          def branch_hash_uncached
+            @git.rev_parse("refs/heads/#{branch}")
+          end
+
+          def branch_name
+            branch.split('/')[-1]
+          end
+
+          def branch_name_result
+            ::Avm::Result.success_or_error(issue_id.present?, branch_name)
+          end
+
+          def branch_hash_result
+            ::Avm::Result.success_or_error(
+              branch_hash.present?,
+              branch_hash
+            )
+          end
+
+          def follow_master_result
+            return ::Avm::Result.neutral('No branch hash') unless branch_hash
+
+            r = follow_master?
+            ::Avm::Result.success_or_error(r, 'yes', 'no')
+          end
+
+          def follow_master?
+            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+          end
+
+          def remove_local_branch
+            info 'Removendo branch local...'
+            bn = branch_name
+            git(['checkout', branch_hash])
+            git(['branch', '-D', bn])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalTag
+          def assert_tag
+            if tag_hash
+              return if tag_hash == branch_hash
+
+              delete_tag
+            end
+            create_tag
+          end
+
+          def delete_tag
+            info 'Removendo tag...'
+            git(['tag', '-d', branch_name])
+          end
+
+          def tag
+            "refs/tags/#{branch_name}"
+          end
+
+          def tag_hash
+            @git.rev_parse(tag)
+          end
+
+          def create_tag
+            git(['tag', branch_name, branch_hash])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Push
+          def dry_push_args
+            %w[push --dry-run] + [remote_name] + pushs
+          end
+
+          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)
+          end
+
+          def push
+            if pushs.empty?
+              info 'PUSH: Nada a enviar'
+            else
+              info "PUSH: enviando \"#{pushs}\"..."
+              git(%w[push origin] + pushs)
+            end
+          end
+
+          def pushs_uncached
+            [master_push, remove_branch_push, tag_push].reject(&:nil?)
+          end
+
+          def master_push
+            remote_master_hash != branch_hash ? "#{branch_hash}:refs/heads/master" : nil
+          end
+
+          def remove_branch_push
+            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+          end
+
+          def tag_push
+            return nil unless !remote_tag_hash || remote_tag_hash != branch_hash
+
+            "#{branch_hash}:#{tag}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Remote
+          def remote_master_hash
+            remote_hashs['refs/heads/master']
+          end
+
+          def remote_branch_hash
+            remote_hashs["refs/heads/#{branch}"]
+          end
+
+          def remote_tag_hash
+            remote_hashs[tag]
+          end
+
+          private
+
+          def remote_name
+            'origin'
+          end
+
+          def remote_hashs_uncached
+            @git.remote_hashs(remote_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/apps/sources/configuration'
+require 'avm/result'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Test
+          def test_result
+            test_command = configuration.if_present(&:any_test_command)
+            return ::Avm::Result.success('unconfigured') if test_command.blank?
+
+            infom "Running test command \"#{test_command}\"..."
+            result = test_command.execute
+            test_result_log(result)
+            if result.fetch(:exit_code).zero?
+              ::Avm::Result.success('yes')
+            else
+              ::Avm::Result.error('no')
+            end
+          end
+
+          private
+
+          def test_result_log(result)
+            stdout_file = ::EacRubyUtils::Fs::Temp.file
+            stderr_file = ::EacRubyUtils::Fs::Temp.file
+            stdout_file.write(result.fetch(:stdout))
+            stderr_file.write(result.fetch(:stderr))
+            infov '  * Exit code', result.fetch(:exit_code)
+            infov '  * STDOUT', stdout_file.to_path
+            infov '  * STDERR', stderr_file.to_path
+          end
+
+          def configuration_uncached
+            ::Avm::Apps::Sources::Configuration.find_by_path(@git)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'clipboard'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Tracker
+          def clipboard_copy_tracker_message
+            ::Clipboard.copy(textile_tracker_message)
+            infov 'Copied to clipboard', textile_tracker_message
+          end
+
+          private
+
+          def textile_tracker_message_uncached
+            "Revisado para commit:#{branch_short_hash}, ok."
+          end
+
+          def branch_short_hash
+            git(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'avm/git/issue/complete/validation'
+require 'avm/result'
+require 'ostruct'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Validations
+          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?',
+            git_subrepos: 'Git subrepos ok?',
+            test: 'Test ok?'
+          }.with_indifferent_access.freeze
+
+          def valid?
+            validations.map(&:result).none?(&:error?)
+          end
+
+          def validations_banner
+            validations.each do |v|
+              infov "[#{v.key}] #{v.label}", v.result.label
+            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
+
+          private
+
+          def validations_uncached
+            VALIDATIONS.map do |key, label|
+              ::Avm::Git::Issue::Complete::Validation.new(self, key, label)
+            end
+          end
+        end
+      end
+    end
+  end
+end