avm-git 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e686cce8a98220b2633e53cf617745991d691b3a60f0bd78a45ea5b476adff29
-  data.tar.gz: e75397ee7ea44aa0c1dec4fbf3b9ec638e25312cb5288ac9627662f66d69bedb
+  metadata.gz: 6b950c0eeed70482dab12ee583f6df30f6bd1d7a9b7094bfd02a8cd733e93281
+  data.tar.gz: 41f39901cad5df8567da52f9bd02206c62094c60904f74ff4107d6a108fdfd7f
 SHA512:
-  metadata.gz: b4a4dd2cf8276aa921df11aeb99cc9bfe92a63f0a29281b444b1a3e5eb1a3418bd49297b960451aa5777e27d68f2648b0ffac1f7e82dcb63a3b5d7dcfa05ae85
-  data.tar.gz: 0cb57e3027c6f997360ae1b68ef573fbe356e0226c2f14968152497233bd0b136f3e04880242bff64c38185512a53aca68a8ca73ec667f0da69c2c34cc98c615
+  metadata.gz: 46cd50310c58b60a078268e225635097e86ac1cb89f18c4f40cb4e82402b0ea18ac14d0c30ff38846bb6924b1524738ef08b2fd5807b16b5522ff9d4291c16a8
+  data.tar.gz: ddc772bee2ae2d83f80e151737c62181cde440976daec88fa471203109cdeebe44357f146b456d1f2d3a761e2343a33ea013c89cce47b139a9b214d27d27fab1

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

@@ -19,16 +19,14 @@ module Avm
             r
           end
 
-          def execute(*args)
-            command(*args).execute
-          end
-
-          def execute!(*args)
-            command(*args).execute!
-          end
-
-          def system!(*args)
-            command(*args).system!
+          %w[execute execute! system system!].each do |exec_type|
+            define_method exec_type do |*args|
+              begin
+                command(*args).send(exec_type)
+              rescue ::EacRubyUtils::Envs::Command::ExecError
+                raise ::Avm::Git::Launcher::Error
+              end
+            end
           end
 
           def init

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/errors/base'
+
 module Avm
   module Git
     module Launcher
-      class Error < StandardError
+      class Error < ::Avm::Launcher::Errors::Base
         def initialize(git_instance, message)
           super("#{message} (Repository: #{git_instance})")
         end

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

@@ -3,7 +3,7 @@
 require 'avm/git/launcher/mirror_update'
 require 'avm/launcher/instances/error'
 require 'avm/git/vendor/github'
-require 'avm/projects/stereotypes/git/publish'
+require 'avm/git/launcher_stereotypes/git/publish'
 
 module Avm
   module Git
@@ -15,7 +15,7 @@ module Avm
       class WarpBase < ::Avm::Launcher::Paths::Real
         include ::EacRubyUtils::SimpleCache
 
-        TARGET_REMOTE = ::Avm::Projects::Stereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+        TARGET_REMOTE = ::Avm::Git::LauncherStereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
 
         def initialize(instance)
           @instance = instance

data/lib/avm/git/launcher_stereotypes/git/local_project_mixin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Git
+        module LocalProjectMixin
+          # @return [EacGit::Local]
+          def git_repo
+            @git_repo ||= ::EacGit::Local.new(path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git/publish.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/publish_base'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Git
+        class Publish < ::Avm::Git::Launcher::PublishBase
+          PUBLISH_GIT_REMOTE_NAME = 'publish'
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git/warp.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/warp_base'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Git
+        class Warp < ::Avm::Git::Launcher::WarpBase
+          private
+
+          def current_ref
+            'HEAD'
+          end
+
+          def source_instance
+            instance
+          end
+
+          def source_remote_name
+            ::Avm::Git::LauncherStereotypes::Git::Publish::PUBLISH_GIT_REMOTE_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/stereotype'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Git
+        require_sub __FILE__
+        include Avm::Launcher::Stereotype
+
+        class << self
+          def match?(path)
+            File.directory?(path.real.subpath('.git'))
+          end
+
+          def color
+            :white
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/publish_base'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubrepo
+        class Publish < ::Avm::Git::Launcher::PublishBase
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subrepo/warp.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+require 'avm/git/launcher/sub_warp_base'
+require 'avm/launcher/errors/base'
+require 'avm/launcher/paths/real'
+require 'avm/git/vendor/github'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubrepo
+        class Warp < ::Avm::Launcher::Paths::Real
+          include ::Avm::Git::Launcher::SubWarpBase
+          include ::EacRubyUtils::SimpleCache
+
+          attr_reader :instance
+
+          def initialize(instance)
+            @instance = instance
+            check_parent
+            init_aux
+            push_to_aux
+            reset
+            assert_target_remote
+            super(warped_git)
+          end
+
+          private
+
+          def check_parent
+            return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
+                      parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
+
+            raise Avm::Launcher::Errors::Base,
+                  "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
+                  " not found in \"#{parent_git_warped}\""
+          end
+
+          def subrepo_parent_hash
+            data = parent_git_warped.subrepo_status(to_parent_git_path)
+            h = data['Pull Parent']
+            return h if h.present?
+
+            raise Avm::Launcher::Errors::Base, "Subrepo parent hash is blank: #{data}"
+          end
+
+          def init_aux
+            ::Avm::Git::Launcher::Base.new(aux_path).init_bare
+          end
+
+          def parent_git_warped_uncached
+            ::Avm::Git::Launcher::Base.new(parent_instance.warped)
+          end
+
+          def aux_path
+            instance.cache_path('subrepo_aux_git_repository')
+          end
+
+          def warped_git_uncached
+            ::Avm::Git::Launcher::Base.new(instance.cache_path('git_repository'))
+          end
+
+          def push_to_aux
+            parent_git_warped.execute!('subrepo', 'branch', to_parent_git_path, '-fF')
+            h = parent_git_warped.rev_parse("subrepo/#{to_parent_git_path}", true)
+            parent_git_warped.execute!('push', aux_path, "#{h}:refs/heads/master", '--force')
+          end
+
+          def reset
+            ::Avm::Git::Launcher::MirrorUpdate.new(warped_git, aux_path, 'master')
+          end
+
+          def assert_target_remote
+            warped_git.assert_remote_url(::Avm::Git::Launcher::WarpBase::TARGET_REMOTE,
+                                         target_remote_url)
+          end
+
+          def target_remote_url
+            ::Avm::Git::Vendor::Github.to_ssh_url(
+              parent_git_warped.subrepo_remote_url(to_parent_git_path)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subrepo.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/error'
+require 'eac_ruby_utils/core_ext'
+require 'avm/launcher/stereotype'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubrepo
+        require_sub __FILE__
+        include Avm::Launcher::Stereotype
+
+        class << self
+          def match?(path)
+            File.exist?(path.real.subpath('.gitrepo')) && subrepo_url(path.real) != 'none'
+          end
+
+          def color
+            :light_cyan
+          end
+
+          def subrepo_url(path)
+            File.read(path.subpath('.gitrepo')).each_line do |l|
+              m = /remote\s*=\s(.+)/.match(l)
+              return m[1] if m
+            end
+            raise ::Avm::Git::Launcher::Error.new(path, '"remote = ... " not found')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subtree/publish.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/publish_base'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubtree
+        class Publish < ::Avm::Git::Launcher::PublishBase
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subtree/warp.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher/warp_base'
+require 'avm/git/launcher/sub_warp_base'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubtree
+        class Warp < ::Avm::Git::Launcher::WarpBase
+          include ::Avm::Git::Launcher::SubWarpBase
+
+          private
+
+          def current_ref
+            instance.cache_key("git_subtree.parent.#{cache_git.git.object('HEAD').sha}") do
+              cache_git.subtree_split(to_parent_git_path)
+            end
+          end
+
+          def source_instance
+            parent_instance
+          end
+
+          def source_remote_name
+            instance.project_name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/git_subtree.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/stereotype'
+require 'avm/git/launcher_stereotypes/git'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class GitSubtree
+        require_sub __FILE__
+        include Avm::Launcher::Stereotype
+
+        class << self
+          def match?(path)
+            return false if other_git_stereotype?(path)
+            return false unless other_nogit_stereotype?(path)
+
+            parent = parent_git(path.parent_path)
+            return false unless parent
+
+            ::Git.open(parent.real).remote(path.real.basename).url ? true : false
+          end
+
+          def color
+            :green
+          end
+
+          def parent_git(parent_path)
+            return nil unless parent_path
+
+            if ::Avm::Git::LauncherStereotypes::Git.match?(parent_path)
+              parent_path
+            else
+              parent_git(parent_path.parent_path)
+            end
+          end
+
+          def other_git_stereotype?(path)
+            ::Avm::Git::LauncherStereotypes::Git.match?(path) ||
+              ::Avm::Git::LauncherStereotypes::GitSubrepo.match?(path)
+          end
+
+          def other_nogit_stereotype?(path)
+            Avm::Launcher::Stereotype.nogit_stereotypes.any? { |s| s.match?(path) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes/provider.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/git/launcher_stereotypes/git'
+require 'avm/git/launcher_stereotypes/git_subrepo'
+require 'avm/git/launcher_stereotypes/git_subtree'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      class Provider
+        STEREOTYPES = [::Avm::Git::LauncherStereotypes::Git,
+                       ::Avm::Git::LauncherStereotypes::GitSubrepo,
+                       ::Avm::Git::LauncherStereotypes::GitSubtree].freeze
+
+        def all
+          STEREOTYPES
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/launcher_stereotypes.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module LauncherStereotypes
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.50'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.50'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -50,34 +50,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.105'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.105'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +171,18 @@ files:
 - lib/avm/git/launcher/remote.rb
 - lib/avm/git/launcher/sub_warp_base.rb
 - lib/avm/git/launcher/warp_base.rb
+- lib/avm/git/launcher_stereotypes.rb
+- lib/avm/git/launcher_stereotypes/git.rb
+- lib/avm/git/launcher_stereotypes/git/local_project_mixin.rb
+- lib/avm/git/launcher_stereotypes/git/publish.rb
+- lib/avm/git/launcher_stereotypes/git/warp.rb
+- lib/avm/git/launcher_stereotypes/git_subrepo.rb
+- lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb
+- lib/avm/git/launcher_stereotypes/git_subrepo/warp.rb
+- lib/avm/git/launcher_stereotypes/git_subtree.rb
+- lib/avm/git/launcher_stereotypes/git_subtree/publish.rb
+- lib/avm/git/launcher_stereotypes/git_subtree/warp.rb
+- lib/avm/git/launcher_stereotypes/provider.rb
 - lib/avm/git/organize.rb
 - lib/avm/git/organize/reference_update.rb
 - lib/avm/git/organize/repository.rb