avm-tools 0.52.0 → 0.55.0

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

data/lib/avm/git/subrepo_checks.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoChecks
+      enable_console_speaker
+      enable_simple_cache
+      attr_accessor :check_remote, :fix_parent
+      common_constructor :repository
+
+      def add_all_subrepos
+        add_subrepos(
+          *repository.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+          .select(&:present?)
+        )
+      end
+
+      def add_subrepos(*subpath_list)
+        subpath_list.each do |subpath|
+          subpaths.add(subpath)
+        end
+        reset_cache
+        self
+      end
+
+      def check_options
+        { fix_parent: fix_parent, check_remote: check_remote }
+      end
+
+      def show_result
+        checks.each(&:show_result)
+        infov 'Result', result.label
+      end
+
+      private
+
+      def checks_uncached
+        subpaths.map do |subpath|
+          ::Avm::Git::SubrepoCheck.new(repository.subrepo(subpath), check_options)
+        end
+      end
+
+      def result_uncached
+        error_count = checks.count { |check| check.result.error? }
+        ::Avm::Result.success_or_error(
+          error_count.zero?,
+          "#{error_count} of #{checks.count} subrepos failed"
+        )
+      end
+
+      def subpaths
+        @subpaths ||= ::Set.new
+      end
+    end
+  end
+end

data/lib/avm/result.rb

@@ -2,12 +2,13 @@
 
 require 'colorized_string'
 require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   class Result < ::SimpleDelegator
     include ::EacRubyUtils::Listable
 
-    lists.add_string :type, :success, :error, :neutral
+    lists.add_string :type, :success, :error, :neutral, :pending, :outdated
 
     lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -20,10 +21,19 @@ module Avm
     TYPE_SUCCESS_COLOR = 'green'
     TYPE_ERROR_COLOR = 'red'
     TYPE_NEUTRAL_COLOR = 'light_black'
+    TYPE_PENDING_COLOR = 'yellow'
+    TYPE_OUTDATED_COLOR = 'blue'
 
     class << self
-      def success_or_error(value, success)
-        new(value, success ? ::Avm::Result::TYPE_SUCCESS : ::Avm::Result::TYPE_ERROR)
+      # Return Avm::Result.success(success_value) if +success+ is truthy.
+      # Return Avm::Result.error(error_value || success_value) if +success+ is falsely.
+      # @return [Avm::Result]
+      def success_or_error(success, success_value, error_value = nil)
+        if success
+          self.success(success_value)
+        else
+          error(error_value.presence || success_value)
+        end
       end
     end
 

data/lib/avm/stereotypes/eac_webapp_base0/deploy.rb

@@ -12,10 +12,9 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       class Deploy
+        require_sub __FILE__, include_modules: true
         include ::ActiveSupport::Callbacks
 
-        require_relative 'deploy/_appended_directories'
-
         DEFAULT_REFERENCE = 'HEAD'
 
         enable_console_speaker
@@ -61,18 +60,16 @@ module Avm
 
         def git_deploy
           infom 'Deploying source code and appended content...'
-          build_git_commit.append_directory(template.path).append_directories(
-            appended_directories
-          ).run
-        end
-
-        def git_reference
-          options[:reference] || DEFAULT_REFERENCE
+          build_git_commit
+            .append_directory(template.path)
+            .append_directories(appended_directories)
+            .append_file_content(VERSION_TARGET_PATH, version)
+            .run
         end
 
         def setup_files_units
           instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
-            FilesUnit.new(self, data_key, fs_path_subpath).run
+            FileUnit.new(self, data_key, fs_path_subpath).run
           end
         end
 
@@ -89,42 +86,10 @@ module Avm
           fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
         end
 
-        def commit_sha1_uncached
-          git_fetch
-          r = git.rev_parse(git_reference_found)
-          return r if r
-
-          raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
-        end
-
-        def git_reference_found_uncached
-          %w[git_reference instance_branch master_branch].map { |b| send(b) }.find(&:present?) ||
-            raise(
-              ::Avm::Result::Error,
-              'No git reference found (Searched for option, instance and master)'
-            )
-        end
-
         def git_uncached
           ::EacLauncher::Git::Base.new(git_repository_path)
         end
 
-        def instance_branch
-          remote_branch(instance.id)
-        end
-
-        def master_branch
-          remote_branch('master')
-        end
-
-        def git_remote_name
-          ::Avm::Git::DEFAULT_REMOTE_NAME
-        end
-
-        def git_remote_hashs_uncached
-          git.remote_hashs(git_remote_name)
-        end
-
         def git_fetch_uncached
           infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
           git.fetch(git_remote_name)
@@ -133,10 +98,6 @@ module Avm
         def git_repository_path
           instance.source_instance.read_entry(:fs_path)
         end
-
-        def remote_branch(name)
-          git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
-        end
       end
     end
   end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        module AppendedDirectories
+          APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+          def appended_directories
+            appended_directories_from_instance_entry + appended_directories_from_options
+          end
+
+          def appended_directories_from_instance_entry
+            ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+          end
+
+          def appended_directories_from_options
+            options[:appended_directories] || []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb

@@ -4,7 +4,7 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       class Deploy
-        class FilesUnit < ::SimpleDelegator
+        class FileUnit < ::SimpleDelegator
           attr_reader :data_key, :fs_path_subpath
 
           def initialize(deploy, data_key, fs_path_subpath)

data/lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        module GitInfo
+          def commit_sha1_uncached
+            git_fetch
+            r = git.rev_parse(git_reference_found)
+            return r if r
+
+            raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
+          end
+
+          def git_reference
+            options[:reference] || DEFAULT_REFERENCE
+          end
+
+          def git_reference_found_uncached
+            %w[git_reference instance_branch master_branch].map { |b| send(b) }.find(&:present?) ||
+              raise(
+                ::Avm::Result::Error,
+                'No git reference found (Searched for option, instance and master)'
+              )
+          end
+
+          def git_remote_hashs_uncached
+            git.remote_hashs(git_remote_name)
+          end
+
+          def git_remote_name
+            ::Avm::Git::DEFAULT_REMOTE_NAME
+          end
+
+          def instance_branch
+            remote_branch(instance.id)
+          end
+
+          def remote_branch(name)
+            git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
+          end
+
+          def master_branch
+            remote_branch('master')
+          end
+        end
+      end
+    end
+  end
+end