eac_launcher 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52aa71693d4a4209ac7290124875448649aaed7b
-  data.tar.gz: 16cd264adfe0fbd7803a0f1226211071fc9c47f6
+  metadata.gz: be146005c131fcd24f8226cac90684e1e6580e66
+  data.tar.gz: 3699b4549409d7a83879078e8938e455d0767f16
 SHA512:
-  metadata.gz: 647bcc691051e3f74abf673997c289ba5246b51104278ebc3e4c9d48669ffb54e3d01c7fcd904f6172d523bdf29cb9610aa5084c43e6fd3ff25bf3a3620dc363
-  data.tar.gz: 29a16f00a5abd889bc15719dd3e1c3e2a9c8d22ace0a9b41181e397178b3886d5ff9a42ac7199c21fa27d61a1bff5e26c767b40d654c8fb1d0d010c516178a2c
+  metadata.gz: 48db93c8e6905615edf42facb4e248964180355dc709e568b03954e23f3abea7d210b6f50102ac40156a54eb93da2aeee9bea6f5071de91c123833d30f5d2b3e
+  data.tar.gz: 430bb4b45fe6ff30a9cd6e919fcdb5467343c915f3bfc42f5779939c9c4843d0da08c85e91ac4946c5bc656986960715d95abf91cec28bf2455ecf3aede19835

data/lib/eac_launcher/git/sub_warp_base.rb

@@ -0,0 +1,22 @@
+module EacLauncher
+  module Git
+    module SubWarpBase
+      private
+
+      def parent_instance_uncached
+        r = find_parent_instance(instance.parent)
+        return r if r
+        ::EacLauncher::Instances::Error.new('Git parent not found')
+      end
+
+      def find_parent_instance(current)
+        return current if current.stereotype?(::EacLauncher::Stereotypes::Git)
+        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

data/lib/eac_launcher/stereotype.rb

@@ -9,8 +9,12 @@ module EacLauncher
         base.extend(ClassMethods)
       end
 
+      def git_stereotypes
+        stereotypes.select { |c| c.name.demodulize.downcase.match('git') }
+      end
+
       def nogit_stereotypes
-        stereotypes.reject { |c| c.name.demodulize.downcase.match('git') }
+        stereotypes - git_stereotypes
       end
     end
 

data/lib/eac_launcher/stereotypes/git_subrepo/warp.rb

@@ -1,7 +1,10 @@
+require 'eac_launcher/git/sub_warp_base'
+
 module EacLauncher
   module Stereotypes
     class GitSubrepo
       class Warp < ::EacLauncher::Paths::Real
+        include ::EacLauncher::Git::SubWarpBase
         include ::Eac::SimpleCache
 
         attr_reader :instance
@@ -13,20 +16,20 @@ module EacLauncher
           push_to_aux
           reset
           assert_target_remote
-          super(cache_git)
+          super(warped_git)
         end
 
         private
 
         def check_parent
-          return if parent_cache_git.rev_parse(subrepo_parent_hash) &&
-                    parent_cache_git.descendant?('HEAD', subrepo_parent_hash)
+          return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
+                    parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
           raise EacLauncher::Instances::Error, "Subrepo parent hash \"#{subrepo_parent_hash}\""\
-            " not found in \"#{parent_cache_git}\""
+            " not found in \"#{parent_git_warped}\""
         end
 
         def subrepo_parent_hash
-          data = parent_cache_git.subrepo_status(instance.to_parent_path)
+          data = parent_git_warped.subrepo_status(to_parent_git_path)
           h = data['Pull Parent']
           return h if h.present?
           raise EacLauncher::Instances::Error, "Subrepo parent hash is blank: #{data}"
@@ -36,15 +39,7 @@ module EacLauncher
           ::EacLauncher::Git::Base.new(aux_path).init_bare
         end
 
-        def parent_instance
-          instance.parent
-        end
-
-        def parent_git_uncached
-          ::EacLauncher::Git::Base.new(parent_instance.real)
-        end
-
-        def parent_cache_git_uncached
+        def parent_git_warped_uncached
           ::EacLauncher::Git::Base.new(parent_instance.warped)
         end
 
@@ -52,32 +47,28 @@ module EacLauncher
           instance.cache_path('subrepo_aux_git_repository')
         end
 
-        def cache_git_uncached
+        def warped_git_uncached
           ::EacLauncher::Git::Base.new(instance.cache_path('git_repository'))
         end
 
         def push_to_aux
-          parent_cache_git.execute!('subrepo', 'branch', subrepo_subdir, '-fF')
-          h = parent_cache_git.rev_parse("subrepo/#{subrepo_subdir}", true)
-          parent_cache_git.execute!('push', aux_path, "#{h}:refs/heads/master", '--force')
-        end
-
-        def subrepo_subdir
-          instance.to_parent_path.gsub(%r{\A/+}, '')
+          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
-          ::EacLauncher::Git::MirrorUpdate.new(cache_git, aux_path, 'master')
+          ::EacLauncher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
         end
 
         def assert_target_remote
-          cache_git.assert_remote_url(::EacLauncher::Git::WarpBase::TARGET_REMOTE,
-                                      target_remote_url)
+          warped_git.assert_remote_url(::EacLauncher::Git::WarpBase::TARGET_REMOTE,
+                                       target_remote_url)
         end
 
         def target_remote_url
           ::EacLauncher::Vendor::Github.to_ssh_url(
-            parent_cache_git.subrepo_remote_url(subrepo_subdir)
+            parent_git_warped.subrepo_remote_url(to_parent_git_path)
           )
         end
       end

data/lib/eac_launcher/stereotypes/git_subtree/warp.rb

@@ -2,25 +2,23 @@ module EacLauncher
   module Stereotypes
     class GitSubtree
       class Warp < ::EacLauncher::Git::WarpBase
+        include ::EacLauncher::Git::SubWarpBase
+
         private
 
         def current_ref
           instance.cache_key("git_subtree.parent.#{cache_git.git.object('HEAD').sha}") do
-            cache_git.subtree_split(to_parent_path)
+            cache_git.subtree_split(to_parent_git_path)
           end
         end
 
         def source_instance
-          instance.parent
+          parent_instance
         end
 
         def source_remote_name
           instance.project_name
         end
-
-        def to_parent_path
-          instance.to_parent_path.gsub(%r{\A/+}, '')
-        end
       end
     end
   end

data/lib/eac_launcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacLauncher
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -157,6 +157,7 @@ files:
 - lib/eac_launcher/git/error.rb
 - lib/eac_launcher/git/mirror_update.rb
 - lib/eac_launcher/git/publish_base.rb
+- lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances/base.rb
 - lib/eac_launcher/instances/base/cache.rb