avm-tools 0.48.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ebefeec62ed2a18b49480f8da27d9582ab7c4bf6f71e19d0c2c2a82a7ec87ec
-  data.tar.gz: 1616f697714aecc0ea58b6695a8d7672b79e384c352a9e0ec1ece91daf88667c
+  metadata.gz: f84588df0d4cd0ec0d2140c037681209a2d20ad2631dced23607886bef8d18f5
+  data.tar.gz: 9f2fbd2b970e79076c229d536e5b764d096688b51ef9d4d22646ad7a1b33ff6a
 SHA512:
-  metadata.gz: 17fbb28c4bdaf19ca33c1db1cb3f0d9678dd476f5804f972c19fff2e0ab0aae151568b2e82ce46a6da6b524682de4df11b0d231606d61ce0a1fe67c089490262
-  data.tar.gz: 8fda39f66fb0d7e2108245b33e76d7f7053223572b0571534f57cdc5f1632ddd595b1f0a510bfc453a61286f2fee2b5fc3e8d786ce9f587bd16a6334e1f84833
+  metadata.gz: 3bfad35dd4309a96a5a8f61b97cb1ba84203fd3ae20aac14394d6366269af231f8a50cafe8b9d9bb38c10fddd28dace0309738ef14d59ef64c2381faa166b5ff
+  data.tar.gz: 2eebd6a5654e278c8131630f500568ae6d4cf5f92f9eae4108b9ea497b3c229c539acc6f6c1dc6904109bcd2bdf4505f86682e0af3098503649bb7c6be8c13aa

data/Gemfile

@@ -3,3 +3,11 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gems_subdir = ::File.join(__dir__, 'vendor', 'gems')
+Dir["#{gems_subdir}/*"].each do |dir|
+  next unless ::File.directory?(dir)
+
+  basename = ::File.basename(dir)
+  gem basename, path: "#{gems_subdir}/#{basename}"
+end

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

@@ -10,7 +10,7 @@ module Avm
         enable_console_speaker
         enable_listable
 
-        DEFAULT_EXPIRE_TIME = 1.days
+        DEFAULT_EXPIRE_TIME = 1.day
         DEFAULT_FILE_EXTENSION = '.tar'
 
         attr_reader :package, :data_file_path, :existing

data/lib/avm/git/auto_commit_path.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class AutoCommitPath
+      enable_console_speaker
+      common_constructor :git, :path
+
+      CLASS_NAME_PATTERNS = [%r{lib/(.+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+
+      def run
+        banner
+        commit
+      end
+
+      def banner
+        infom "Checking \"#{relative_path}\""
+        infov '  * Class name', class_name
+        infov '  * Commit message', commit_message
+      end
+
+      def commit
+        infom '  * Commiting...'
+        git.system!('reset', 'HEAD')
+        git.system!('add', '--', relative_path.to_path)
+        git.system!('commit', '-m', commit_message, '--', relative_path.to_path)
+      end
+
+      def class_name
+        CLASS_NAME_PATTERNS.each do |pattern|
+          pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
+        end
+        raise "No pattern matched \"#{relative_path}\""
+      end
+
+      def commit_message
+        r = class_name
+        r += ': remove' unless path.file?
+        r + '.'
+      end
+
+      def relative_path
+        path.relative_path_from(git.root_path)
+      end
+    end
+  end
+end

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

@@ -7,10 +7,7 @@ module Avm
     module Issue
       class Complete
         def commits_result
-          ::Avm::Result.success_or_error(
-            commits.any? ? 'yes' : 'none',
-            commits.any?
-          )
+          ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
         end
 
         def commits_uncached

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

@@ -19,13 +19,13 @@ module Avm
         end
 
         def branch_name_result
-          ::Avm::Result.success_or_error(branch_name, issue_id.present?)
+          ::Avm::Result.success_or_error(issue_id.present?, branch_name)
         end
 
         def branch_hash_result
           ::Avm::Result.success_or_error(
-            branch_hash,
-            branch_hash.present?
+            branch_hash.present?,
+            branch_hash
           )
         end
 
@@ -33,10 +33,7 @@ module Avm
           return ::Avm::Result.neutral('No branch hash') unless branch_hash
 
           r = follow_master?
-          ::Avm::Result.success_or_error(
-            r ? 'yes' : 'no',
-            r
-          )
+          ::Avm::Result.success_or_error(r, 'yes', 'no')
         end
 
         def follow_master?

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

@@ -17,7 +17,7 @@ module Avm
                     else
                       r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
                     end
-          ::Avm::Result.success_or_error(message, r.fetch(:exit_code).zero?)
+          ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
         end
 
         def push

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

@@ -2,16 +2,20 @@
 
 require 'avm/instances/configuration'
 require 'avm/result'
+require 'eac_ruby_utils/fs/temp'
 
 module Avm
   module Git
     module Issue
       class Complete
         def test_result
-          test_command = configuration.if_present(&:test_command)
-          return ::Avm::Result.success('unconfigured') unless test_command.present?
+          test_command = configuration.if_present(&:any_test_command)
+          return ::Avm::Result.success('unconfigured') if test_command.blank?
 
-          if test_command.execute[:exit_code].zero?
+          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')
@@ -20,6 +24,16 @@ module Avm
 
         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::Instances::Configuration.find_by_path(@git)
         end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/issue/complete/validation'
 require 'avm/result'
 require 'ostruct'
 
@@ -28,20 +29,6 @@ module Avm
           end
         end
 
-        def validations
-          VALIDATIONS.map do |key, label|
-            ::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)
@@ -49,6 +36,14 @@ module Avm
             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

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

@@ -6,7 +6,7 @@ module Avm
       class Complete
         def clean_workspace_result
           r = @git.dirty_files.none?
-          ::Avm::Result.success_or_error(r ? 'yes' : 'no', r)
+          ::Avm::Result.success_or_error(r, 'yes', 'no')
         end
       end
     end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        class Validation
+          enable_simple_cache
+          common_constructor :parent, :key, :label
+
+          def skip?
+            parent.skip_validations.include?(key)
+          end
+
+          private
+
+          def result_uncached
+            if skip?
+              ::Avm::Result.neutral('skipped')
+            else
+              parent.send("#{key}_result")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo_check.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      require_sub __FILE__, include_modules: true
+      enable_console_speaker
+      enable_simple_cache
+
+      BLANK_TEXT = 'BLANK'
+
+      common_constructor :subrepo, :options
+
+      def blank_text
+        BLANK_TEXT
+      end
+
+      def check_remote?
+        options.fetch(:check_remote) ? true : false
+      end
+
+      def fix_parent?
+        options.fetch(:fix_parent) ? true : false
+      end
+
+      private
+
+      def result_uncached
+        return ::Avm::Result.error('Parent failed') if parent_result.error?
+        return ::Avm::Result.error('Remote failed') if remote_result.error?
+
+        ::Avm::Result.success('Parent and remote ok')
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo_check/parent.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module Parent
+        def fix_parent
+          return if parent_result.success?
+
+          info('  Fixing...')
+          self.parent_hash = expected_parent_hash
+          info_banner
+        end
+
+        private
+
+        def expected_parent_hash_uncached
+          subrepo.local.rev_parse("#{last_file_change_rev}^")
+        end
+
+        def last_file_change_rev
+          subrepo.local.command('log', '-n', '1', '--pretty=format:%H', '--',
+                                subrepo.config_relative_path.to_path).execute!.strip
+        end
+
+        def parent_hash
+          subrepo.parent_commit_id
+        end
+
+        def parent_hash=(new_hash)
+          subrepo.config.parent_commit_id = new_hash
+          subrepo.write_config
+        end
+
+        def parent_hash_ok?
+          return false if expected_parent_hash.blank? || parent_hash.blank?
+
+          expected_parent_hash == parent_hash
+        end
+
+        def parent_result_uncached
+          ::Avm::Result.success_or_error(parent_hash_ok?,
+                                         parent_hash.presence || blank_text)
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo_check/remote.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module Remote
+        private
+
+        def fetch_uncached
+          subrepo.command('clean').execute!
+          subrepo.command('fetch').execute!
+        end
+
+        def check_remote_disabled?
+          !check_remote?
+        end
+
+        def check_remote_disabled_result
+          ::Avm::Result.neutral('Check remote disabled')
+        end
+
+        def local_descend_remote?
+          local_id.present? && remote_id.present? && subrepo.local.descendant?(local_id, remote_id)
+        end
+
+        def local_descend_remote_result
+          ::Avm::Result.pending(remote_result_value)
+        end
+
+        def local_id_uncached
+          fetch
+          subrepo.command('branch', '--force').execute!
+          subrepo.local.rev_parse("subrepo/#{subrepo.subpath}")
+        end
+
+        def remote_descend_local?
+          local_id.present? && remote_id.present? && subrepo.local.descendant?(remote_id, local_id)
+        end
+
+        def remote_descend_local_result
+          ::Avm::Result.outdated(remote_result_value)
+        end
+
+        def remote_branches
+          ['', 'refs/heads/', 'refs/tags/'].map { |prefix| "#{prefix}#{subrepo.remote_branch}" }
+        end
+
+        def remote_id_uncached
+          ls_result = subrepo.remote.ls
+          remote_branches.each do |b|
+            return ls_result[b] if ls_result[b].present?
+          end
+          nil
+        end
+
+        def remote_result_uncached
+          %w[check_remote_disabled same_ids local_descend_remote remote_descend_local]
+            .each do |condition|
+            return send("#{condition}_result") if send("#{condition}?")
+          end
+
+          ::Avm::Result.error(remote_result_value)
+        end
+
+        def remote_result_value
+          local_s = local_id.presence || blank_text
+          remote_s = remote_id.presence || blank_text
+
+          if local_s == remote_s
+            "[L/R=#{local_s}]"
+          else
+            "[L=#{local_s}, R=#{remote_s}]"
+          end
+        end
+
+        def same_ids?
+          local_id.present? && remote_id.present? && local_id == remote_id
+        end
+
+        def same_ids_result
+          ::Avm::Result.success(remote_result_value)
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/subrepo_check/show_result.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      module ShowResult
+        def show_result
+          out(subrepo.subpath.to_path.cyan)
+          out_attr('parent', parent_result.label)
+          run_fix_parent
+          out_attr('remote', remote_result.label)
+          out("\n")
+        end
+
+        def run_fix_parent
+          return unless fix_parent?
+          return unless parent_result.error?
+
+          out('|Fixing...'.white)
+          self.parent_hash = expected_parent_hash
+          out_attr('new parent', parent_result.label)
+        end
+
+        def out_attr(key, value)
+          out('|' + "#{key}=".white + value)
+        end
+      end
+    end
+  end
+end