avm-tools 0.51.0 → 0.54.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30c179acc435486e3fe35ad34714133f582332ddcfb98fd00be1f75c1960df2
-  data.tar.gz: 07d4c21e8c6dd98d2f7ce70a02f5caec1ba0660e9a59f5d15af0c8b6f711022a
+  metadata.gz: b84d0393c577738f7356c886a99ef8e6c82343f9dd7d751cbf560dda774f32df
+  data.tar.gz: ffbb4bc86684f7422e7b49c38583a6f9d8df938c8471524e30eced6c6ea40a63
 SHA512:
-  metadata.gz: 9d3b21ec49fb39bad56c9d8de4538cf5261f452d57d8c0188e0cb501ae7a9584fa54d2e35a0a88c250956af6edc48eec0e91f2aa4c186fec038f67d148f911dc
-  data.tar.gz: 761bad690d7493109e71c2fdb34efcf5a0f1737d6d5b52d1f23d16c4c597e18593a5bca169900484421ff8071f79a20560a8754409e4b529135b905c099cbade
+  metadata.gz: 1984afe6dca5217c4ac1085872901e0be97b8ede8a7ce023fb7e7ad87525c37af30e3cb174223c14b870c8a14c0a332d9c8ec6f01bf20f0e18d50e55ea306039
+  data.tar.gz: fa200e96cb2f36a56e980ec5e179dafe659035c1d8f95c4f6b2c352343d177cdb05aa7fa3bab86bb049931956d5a01c02e5dc0092bc87a659e064919c9dd1df7

data/lib/avm/files/formatter.rb

@@ -12,7 +12,7 @@ module Avm
       enable_console_speaker
       common_constructor :source_paths, :options
 
-      FORMATS = %w[ruby html php python xml json generic_plain].freeze
+      FORMATS = %w[ruby php html python xml json generic_plain].freeze
 
       def run
         clear

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/_git_subrepos.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        def git_subrepos_result
+          return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+          r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+          r.check_remote = true
+          r.result
+        end
+      end
+    end
+  end
+end

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/_validations.rb

@@ -16,6 +16,7 @@ module Avm
           commits: 'Commits?',
           bifurcations: 'Bifurcations?',
           dry_push: 'Dry push?',
+          git_subrepos: 'Git subrepos ok?',
           test: 'Test ok?'
         }.with_indifferent_access.freeze
 

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

@@ -5,8 +5,11 @@ module Avm
     module Issue
       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(clean_workspace?, 'yes', 'no')
+        end
+
+        def clean_workspace?
+          @git.dirty_files.none?
         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

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