capistrano-git-with-submodules 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d3bdb9ce8029c090cd6851555cdb860d3e2913
-  data.tar.gz: 50bd07a4cd3f69653f3ef74c82a50e45721caa85
+  metadata.gz: 471b27ace6a52dcfda49776f81b91002cc1d2304
+  data.tar.gz: 6b2f499bbb3906e63a6ba71474fd433017217a60
 SHA512:
-  metadata.gz: 15cd88d438ac84b1da7c6239eccca2fe236735d7eefa733ed2cb9bb0074aaddcc40358f598d73e3c2cebe043e3741e409b848a9ae3697c713203d262fc119a41
-  data.tar.gz: bf3b61b5f39597ab902b0ce2d76d3a0dd55eef11ab034d4e857a198baf954111de62643df06652f7c2d605eae2eb06d83c5469db8a3221f104f3c89ac3a53309
+  metadata.gz: c9f588b21d46c69cc6731e5e3c8a858ea5f92c3771e7da061de694da4b5a12039cba25f44869d87a3fc76dd8c6f13f52eee75276ea5ccb76accbb26332686406
+  data.tar.gz: 3cdd46ac00260897ea79b4c9bdc023e0ba7df13ac95b5e787062e4cc30244821a681503fa7f17e7fdb15a3695d2480cf153f97e25adfb2371e09eda5b7db932a

data/README.md

@@ -8,7 +8,7 @@ For Capistrano 3.0-3.6 use old [capistrano-git-submodule-strategy](https://githu
 
 ####Gemfile
 ```ruby
-gem 'capistrano-git-with-submodules', '~> 0.1', :github => 'ekho/capistrano-git-with-submodules'
+gem 'capistrano-git-with-submodules', '~> 1.1', :github => 'ekho/capistrano-git-with-submodules'
 ```
 
 ####Capfile

data/lib/capistrano/scm/git-with-submodules.rb

@@ -1,18 +1,14 @@
 require "capistrano/scm/git"
 
 class Capistrano::SCM::Git::WithSubmodules < Capistrano::SCM::Git
+  alias_method :origin_archive_to_release_path, :archive_to_release_path if method_defined?(:archive_to_release_path)
 
   def archive_to_release_path
-    fail ':repo_tree currently not supported by GitWithSubmodules' if fetch(:repo_tree)
+    origin_archive_to_release_path
 
+    return unless backend.test(:test, '-e', release_path) && backend.test("ls -A #{release_path} | read linevar")
 
-    return if backend.test(:test, '-e', release_path) && backend.test("ls -A #{release_path} | read linevar")
-
-    _clone_repo
-
-    backend.within_only release_path do
-      git :submodule, 'update', '--init', '--recursive'
-    end
+    submodules_to_release_path
 
     unless fetch(:git_keep_meta, false)
       verbose = Rake.application.options.trace ? 'v' : ''
@@ -20,40 +16,24 @@ class Capistrano::SCM::Git::WithSubmodules < Capistrano::SCM::Git
     end
   end
 
-  def _clone_repo
-    git_version = backend.capture(:git, '--version').strip.match('^git version (\d+(?:\.\d+)+)$')
-
-    if git_version.nil? || git_version[1] < '2.3.0'
-      _clone_repo_with_old_git
-    else
-      _clone_repo_with_fresh_git
-    end
-  end
-
-  def _clone_repo_with_fresh_git
-    git :clone, '--reference', repo_path.to_s, '--dissociate', (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), repo_url, release_path
-  end
-
-  def _clone_repo_with_old_git
-    git :clone, (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), "file://#{repo_path}", release_path
-    backend.within_only release_path do
-      git :remote, 'set-url', 'origin', repo_url
-    end
-  end
-end
-
-
-# shit hack to execute command only in specified directory
-module SSHKit
-  module Backend
-    class Abstract
-      def within_only(directory, &block)
-        pwd = @pwd
-        @pwd = []
-        within directory, &block
-      ensure
-        @pwd = pwd
+  ##
+  # Adds configured submodules recursively to release
+  # It does so by connecting the bare repo and the work tree using environment variables
+  # The reset creates a temporary index, but does not change the working directory
+  # The temporary index is removed after everything is done
+  def submodules_to_release_path
+    temp_index_file_path = release_path.join("INDEX_#{fetch(:release_timestamp)}")
+    backend.within "../releases/#{fetch(:release_timestamp)}" do
+      backend.with(
+          'GIT_DIR' => repo_path.to_s,
+          'GIT_WORK_TREE' => release_path.to_s,
+          'GIT_INDEX_FILE' => temp_index_file_path.to_s
+      ) do
+        git :reset, '--mixed', fetch(:branch)
+        git :submodule, 'update', '--init', '--depth', 1, '--checkout', '--recursive'
+        verbose = Rake.application.options.trace ? 'v' : ''
+        backend.execute :rm, "-f#{verbose}", temp_index_file_path.to_s
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-with-submodules
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Boris Gorbylev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano