avm-git 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09a9b23e21f6c8402cda511ff350c08856b39be0a2dffba63f53dbeb4f98924e'
-  data.tar.gz: 9f48b12b0bf0a063ef706b14a5278ac120cb44467b3d602cc081fa34ef83550e
+  metadata.gz: e686cce8a98220b2633e53cf617745991d691b3a60f0bd78a45ea5b476adff29
+  data.tar.gz: e75397ee7ea44aa0c1dec4fbf3b9ec638e25312cb5288ac9627662f66d69bedb
 SHA512:
-  metadata.gz: 802addab9795fe7ee716a3a12686d8bb1db3dbb572bbe30e3683cc7273647f0e42659c131889510726d0ed1f4f15d9068bbe5eacdf29b03499e16d8d05c18160
-  data.tar.gz: c7b90323a5ec6e1ca5f62984b75ed6a81697742ca1dfdb5c77f1b9839d9feb3b66dd19b24c03f486844dfba990e5f15aedcd0cabd34920997615ae5f535f16a0
+  metadata.gz: b4a4dd2cf8276aa921df11aeb99cc9bfe92a63f0a29281b444b1a3e5eb1a3418bd49297b960451aa5777e27d68f2648b0ffac1f7e82dcb63a3b5d7dcfa05ae85
+  data.tar.gz: 0cb57e3027c6f997360ae1b68ef573fbe356e0226c2f14968152497233bd0b136f3e04880242bff64c38185512a53aca68a8ca73ec667f0da69c2c34cc98c615

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

@@ -58,7 +58,7 @@ module Avm
         end
 
         def launcher_git_uncached
-          ::Avm::Launcher::Git::Base.new(dir)
+          ::Avm::Git::Launcher::Base.new(dir)
         end
       end
     end

data/lib/avm/git/launcher/base/class_methods.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        module ClassMethods
+          # @return [Avm::Git::Launcher::Base]
+          def by_root(search_base_path)
+            new(find_root(search_base_path).to_path)
+          end
+
+          # Searches the root path for the Git repository which includes +search_base_path+.
+          # @return [Pathname]
+          def find_root(search_base_path)
+            path = search_base_path.to_pathname.expand_path
+            loop do
+              return path if path.join('.git').exist?
+              raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
+
+              path = path.parent
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/base/dirty_files.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object'
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        module DirtyFiles
+          delegate :dirty?, to: :eac_git
+
+          def dirty_files
+            eac_git.dirty_files.map do |df|
+              ::OpenStruct.new(
+                df.to_h.merge(path: df.path.to_path, absolute_path: df.absolute_path.to_path)
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/base/remotes.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/git/launcher/remote'
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        module Remotes
+          # @return [Avm::Git::Launcher::Remote]
+          def remote(name)
+            ::Avm::Git::Launcher::Remote.new(self, name)
+          end
+
+          def remote_hashs(remote_name)
+            remote(remote_name).ls
+          end
+
+          def remote_exist?(remote_name)
+            remote(remote_name).exist?
+          end
+
+          def assert_remote_url(remote_name, url)
+            r = git.remote(remote_name)
+            if !r.url || r.url != url
+              r.remove if r.url
+              git.add_remote(remote_name, url)
+            end
+            r
+          end
+
+          def remote_branch_sha(remote_name, branch_name)
+            remote_hashs(remote_name)["refs/heads/#{branch_name}"]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/base/subrepo.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object'
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        module Subrepo
+          def subrepo_status(subrepo_path)
+            s = execute!('subrepo', 'status', subrepo_path.gsub(%r{\A/}, ''))
+            raise s.strip.to_s if s.include?('is not a subrepo')
+
+            r = subrepo_status_parse_output(s)
+            raise "Empty subrepo status for |#{s}|\n" unless r.any?
+
+            r
+          end
+
+          def subrepo_remote_url(subrepo_path)
+            h = subrepo_status(subrepo_path)
+            url = h['Remote URL']
+            return url if url.present?
+
+            raise "Remote URL is blank for subrepo \"#{subrepo_path}\" (Subrepo status: #{h})"
+          end
+
+          private
+
+          def subrepo_status_parse_output(output)
+            r = {}.with_indifferent_access
+            output.each_line do |l|
+              m = /\A([^\:]+)\:(.*)\z/.match(l.strip)
+              next unless m && m[2].present?
+
+              r[m[1].strip] = m[2].strip
+            end
+            r
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/base/underlying.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'eac_git/executables'
+require 'eac_ruby_utils/envs'
+require 'git'
+require 'avm/launcher/paths/real'
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        module Underlying
+          def command(*args)
+            args, options = build_args(args)
+            r = ::EacGit::Executables.git.command(*args)
+            (options[:exit_outputs] || {}).each do |status_code, result|
+              r = r.status_result(status_code, result)
+            end
+            r
+          end
+
+          def execute(*args)
+            command(*args).execute
+          end
+
+          def execute!(*args)
+            command(*args).execute!
+          end
+
+          def system!(*args)
+            command(*args).system!
+          end
+
+          def init
+            git
+            self
+          end
+
+          private
+
+          def build_args(args)
+            options = {}
+            if args.last.is_a?(Hash)
+              options = args.last
+              args.pop
+            end
+            args = args.first if args.first.is_a?(Array)
+            [['-C', self, '--no-pager'] + args, options]
+          end
+
+          def git_uncached
+            FileUtils.mkdir_p(self)
+            if File.exist?(subpath('.git'))
+              ::Git.open(self)
+            else
+              ::Git.init(self)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/base.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+require 'avm/launcher/paths/real'
+require 'avm/git/launcher/error'
+
+module Avm
+  module Git
+    module Launcher
+      class Base < ::Avm::Launcher::Paths::Real
+        require_sub __FILE__
+        enable_simple_cache
+        extend ::Avm::Git::Launcher::Base::ClassMethods
+        include ::Avm::Git::Launcher::Base::DirtyFiles
+        include ::Avm::Git::Launcher::Base::Remotes
+        include ::Avm::Git::Launcher::Base::Subrepo
+        include ::Avm::Git::Launcher::Base::Underlying
+
+        attr_reader :eac_git
+        delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
+
+        def initialize(path)
+          super(path)
+
+          @eac_git = ::EacGit::Local.new(path)
+        end
+
+        def init_bare
+          FileUtils.mkdir_p(self)
+          ::EacRubyUtils::Envs.local.command('git', 'init', '--bare', self).execute! unless
+          File.exist?(subpath('.git'))
+        end
+
+        # @return [Pathname]
+        def root_path
+          @root_path ||= self.class.find_root(to_s)
+        end
+
+        def descendant?(descendant, ancestor)
+          base = merge_base(descendant, ancestor)
+          return false if base.blank?
+
+          revparse = execute!('rev-parse', '--verify', ancestor).strip
+          base == revparse
+        end
+
+        def subtree_split(prefix)
+          execute!('subtree', '-q', 'split', '-P', prefix).strip
+        end
+
+        def push(remote_name, refspecs, options = {})
+          refspecs = [refspecs] unless refspecs.is_a?(Array)
+          args = ['push']
+          args << '--dry-run' if options[:dryrun]
+          args << '--force' if options[:force]
+          system!(args + [remote_name] + refspecs)
+        end
+
+        def push_all(remote_name)
+          system!('push', '--all', remote_name)
+          system!('push', '--tags', remote_name)
+        end
+
+        def fetch(remote_name, options = {})
+          args = ['fetch', '-p', remote_name]
+          args += %w[--tags --prune-tags --force] if options[:tags]
+          execute!(*args)
+        end
+
+        def current_branch
+          execute!(%w[symbolic-ref -q HEAD]).gsub(%r{\Arefs/heads/}, '').strip
+        end
+
+        def reset_hard(ref)
+          execute!('reset', '--hard', ref)
+        end
+
+        def raise(message)
+          ::Kernel.raise Avm::Git::Launcher::Error.new(self, message)
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/error.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Launcher
+      class Error < StandardError
+        def initialize(git_instance, message)
+          super("#{message} (Repository: #{git_instance})")
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/mirror_update.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/base'
+
+module Avm
+  module Git
+    module Launcher
+      class MirrorUpdate < ::Avm::Launcher::Paths::Real
+        include ::EacRubyUtils::SimpleCache
+
+        def initialize(target_path, source_path, source_rev)
+          super(target_path)
+          @target_git = ::Avm::Git::Launcher::Base.new(self)
+          @source_git = ::Avm::Git::Launcher::Base.new(source_path)
+          @source_rev = source_rev
+          run
+        end
+
+        private
+
+        def run
+          fetch_remote_source
+          reset_source_rev
+        end
+
+        def fetch_remote_source
+          @target_git.git
+          @target_git.assert_remote_url('origin', @source_git)
+          @target_git.fetch('origin', tags: true)
+        end
+
+        def reset_source_rev
+          @target_git.reset_hard(@source_git.rev_parse(@source_rev, true))
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/publish_base.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/simple_cache'
+require 'avm/launcher/publish/base'
+require 'avm/launcher/publish/check_result'
+
+module Avm
+  module Git
+    module Launcher
+      class PublishBase < ::Avm::Launcher::Publish::Base
+        include ::EacRubyUtils::SimpleCache
+        enable_speaker
+
+        CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
+                      local_following].freeze
+
+        REMOTE_UNAVAILABLE_MESSAGES = ['could not resolve host', 'connection timed out',
+                                       'no route to host'].map(&:downcase).freeze
+
+        protected
+
+        def internal_check
+          CHECKERS.each do |checker|
+            result = send("#{checker}_check_result")
+            return result if result
+          end
+          divergent_result_check_result
+        rescue ::Avm::Launcher::Instances::Error => e
+          ::Avm::Launcher::Publish::CheckResult.blocked(e.message)
+        rescue ::StandardError => e
+          raise e unless remote_unavailable_error?(e)
+
+          ::Avm::Launcher::Publish::CheckResult.blocked(e.message)
+        end
+
+        private
+
+        def remote_url_check_result
+          remote = sgit.remote(remote_name)
+          return if remote.exist? && remote.url.present?
+
+          ::Avm::Launcher::Publish::CheckResult.blocked("Remote \"#{remote_name}\" has blank path")
+        end
+
+        def remote_fetch_check_result
+          remote_fetch
+          nil
+        end
+
+        def remote_unavailable_error?(error)
+          error_message = error.message.downcase
+          REMOTE_UNAVAILABLE_MESSAGES.any? do |message|
+            error_message.include?(message)
+          end
+        end
+
+        def publish_remote_no_exist_check_result
+          return nil if sgit.remote_exist?(remote_name)
+
+          ::Avm::Launcher::Publish::CheckResult.blocked('Remote does not exist')
+        end
+
+        def remote_equal_check_result
+          return nil unless remote_sha.present? && remote_sha == local_sha
+
+          ::Avm::Launcher::Publish::CheckResult.updated('Remote equal')
+        end
+
+        def remote_following_check_result
+          return nil unless remote_sha.present? && sgit.descendant?(remote_sha, local_sha)
+
+          ::Avm::Launcher::Publish::CheckResult.outdated('Remote following')
+        end
+
+        def divergent_result_check_result
+          ::Avm::Launcher::Publish::CheckResult.blocked(
+            "Divergent (L: #{local_sha}, R: #{remote_sha})"
+          )
+        end
+
+        def local_following?
+          return true if remote_sha.blank?
+
+          sgit.descendant?(local_sha, remote_sha)
+        end
+
+        def local_following_check_result
+          return nil unless local_following?
+
+          ::Avm::Launcher::Publish::CheckResult.pending('Local following')
+        end
+
+        def sgit_uncached
+          ::Avm::Git::Launcher::Base.new(instance.warped)
+        end
+
+        def publish
+          info 'Pushing...'
+          sgit.push(remote_name, 'HEAD:master',
+                    dryrun: !::Avm::Launcher::Context.current.publish_options[:confirm])
+          info 'Pushed!'
+        end
+
+        def local_sha
+          sgit.git.object('HEAD').sha
+        end
+
+        def remote_sha_uncached
+          remote_fetch
+          b = sgit.git.branches["#{remote_name}/master"]
+          b ? b.gcommit.sha : nil
+        end
+
+        def remote_fetch_uncached
+          sgit.fetch(remote_name)
+        end
+
+        def remote_name
+          ::Avm::Git::Launcher::WarpBase::TARGET_REMOTE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Launcher
+      class Remote
+        common_constructor :git, :name
+
+        def exist?
+          git.execute!('remote').each_line.any? { |line| line.strip == name }
+        end
+
+        def ls
+          git.execute!(['ls-remote', name]).each_line.map do |line|
+            x = line.strip.split(/\s+/)
+            [x[1], x[0]]
+          end.to_h
+        end
+
+        # +git remote add ...+
+        def add(url)
+          git.execute!('remote', 'add', name, url)
+        end
+
+        # +git remote rm ...+
+        def remove
+          git.execute!('remote', 'rm', name)
+        end
+
+        # +git remote get-url ...+
+        def url
+          git.execute!('remote', 'get-url', name).strip.if_present(nil)
+        end
+
+        # git remote set-url ...
+        def url_set(url)
+          git.execute!('remote', 'set-url', name, url)
+        end
+
+        # Add or set URL if +url+ is present, remove remote if is blank.
+        def url=(url)
+          if exist? && url.blank?
+            remove
+          elsif exist? && self.url != url
+            url_set(url)
+          elsif !exist?
+            add(url)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/sub_warp_base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/errors/base'
+require 'avm/launcher/stereotype'
+
+module Avm
+  module Git
+    module Launcher
+      module SubWarpBase
+        private
+
+        def parent_instance_uncached
+          r = find_parent_instance(instance.parent)
+          return r if r
+
+          ::Avm::Launcher::Errors::Base.new('Git parent not found')
+        end
+
+        def find_parent_instance(current)
+          if ::Avm::Launcher::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
+            return current
+          end
+
+          current.parent ? find_parent_instance(current.parent) : nil
+        end
+
+        def to_parent_git_path
+          instance.logical.gsub(%r{\A#{Regexp.quote(parent_instance.logical)}/}, '')
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher/warp_base.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/mirror_update'
+require 'avm/launcher/instances/error'
+require 'avm/git/vendor/github'
+require 'avm/projects/stereotypes/git/publish'
+
+module Avm
+  module Git
+    module Launcher
+      # Métodos abstratos:
+      #  * source_instance
+      #  * source_remote_name
+      #  * current_ref
+      class WarpBase < ::Avm::Launcher::Paths::Real
+        include ::EacRubyUtils::SimpleCache
+
+        TARGET_REMOTE = ::Avm::Projects::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+
+        def initialize(instance)
+          @instance = instance
+          cache_git.git.reset_hard(current_ref)
+          cache_git.remote(TARGET_REMOTE).url = target_remote_url
+          super(path)
+        end
+
+        protected
+
+        attr_reader :instance
+
+        def validate_source_current_revision
+          if source_git.rev_parse(source_instance.options.git_current_revision, false).present?
+            return
+          end
+
+          raise ::Avm::Launcher::Instances::Error, 'Refspec ' \
+            "\"#{source_instance.options.git_current_revision}\" not found in \"#{source_git}\""
+        end
+
+        def update
+          validate_source_current_revision
+          ::Avm::Git::Launcher::MirrorUpdate.new(
+            path,
+            source_instance.real,
+            source_instance.options.git_current_revision
+          )
+        end
+
+        def path
+          instance.cache_path('git_repository')
+        end
+
+        def source_git_uncached
+          ::Avm::Git::Launcher::Base.new(source_instance.real)
+        end
+
+        def cache_git_uncached
+          ::Avm::Git::Launcher::Base.new(update)
+        end
+
+        def target_remote_url
+          ::Avm::Git::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/base'
+require 'avm/git/launcher/error'
+require 'avm/git/launcher/mirror_update'
+require 'avm/git/launcher/publish_base'
+require 'avm/git/launcher/warp_base'

data/lib/avm/git/organize/repository.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/git/organize/reference_update'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,19 @@ files:
 - lib/avm/git/issue/complete/validations.rb
 - lib/avm/git/issue/complete/working_tree.rb
 - lib/avm/git/issue/deliver.rb
+- lib/avm/git/launcher.rb
+- lib/avm/git/launcher/base.rb
+- lib/avm/git/launcher/base/class_methods.rb
+- lib/avm/git/launcher/base/dirty_files.rb
+- lib/avm/git/launcher/base/remotes.rb
+- lib/avm/git/launcher/base/subrepo.rb
+- lib/avm/git/launcher/base/underlying.rb
+- lib/avm/git/launcher/error.rb
+- lib/avm/git/launcher/mirror_update.rb
+- lib/avm/git/launcher/publish_base.rb
+- lib/avm/git/launcher/remote.rb
+- lib/avm/git/launcher/sub_warp_base.rb
+- lib/avm/git/launcher/warp_base.rb
 - lib/avm/git/organize.rb
 - lib/avm/git/organize/reference_update.rb
 - lib/avm/git/organize/repository.rb