capistrano-git-with-submodules 1.2.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 369fba65acde05c8def4e1f53bf518cae8c6c943
-  data.tar.gz: 7a36a19ab3d2a320b0d9883452a31b9dbbbebaa0
+SHA256:
+  metadata.gz: 43acbb9322fd5d355f4c4319dde1006472da125350c443097e35884c7745aab1
+  data.tar.gz: 877486aea429e70c9a1ebb2e97507dd124e88148ee4ef800c68726a6f22f48c4
 SHA512:
-  metadata.gz: 2da4ed36202e8f24202999ff4e544b8db8074af1725631c442ceabf244b8433c6ec67d7aaf65f209f9cde9993f8e7b7beffb9fc4eefba6c67a3dac7b50a1188a
-  data.tar.gz: 8d7e5f4d77b03eae94c11f7d7eeab54dc1bf36040ed2b9061797594885908e1d9efe0668cf39c8503711ceacee82510a9b46733c28ad782fdba7835d607078b8
+  metadata.gz: 877d813c32ba9b95f081793e9f710a870a5559dd15a0689f4c8de83ece3fd930f1c29d115141023a7ca759532e81ef7cc1b3e3c209e29d9a36600be9db5903c0
+  data.tar.gz: 4a2dfd75e751471b8606b49b6b949b7c11fa68fb64f1edef00f6cbc7853e422345d5b3470f5e2896ef79ef327e685a274b06d8c5cb6a9c51187aac803074753f

data/README.md

@@ -1,4 +1,4 @@
-# capistrano-git-with-submodules [![Gem](https://img.shields.io/gem/v/capistrano-git-with-submodules.svg?maxAge=86400)](https://rubygems.org/gems/capistrano-git-with-submodules) [![Gem](https://img.shields.io/gem/dt/capistrano-git-with-submodules.svg?maxAge=86400)](https://rubygems.org/gems/capistrano-git-with-submodules)
+# capistrano-git-with-submodules [![Gem](https://img.shields.io/gem/v/capistrano-git-with-submodules.svg?maxAge=21600)](https://rubygems.org/gems/capistrano-git-with-submodules) [![Gem](https://img.shields.io/gem/dt/capistrano-git-with-submodules.svg?maxAge=21600)](https://rubygems.org/gems/capistrano-git-with-submodules)
 
 Git submodule support for Capistrano 3.7+
 
@@ -9,26 +9,28 @@ For Capistrano 3.0-3.6 use old [capistrano-git-submodule-strategy](https://githu
 #### Gemfile
 From rubygems.org (recommended)
 ```ruby
-gem 'capistrano-git-with-submodules', '~> 1.2'
+gem 'capistrano-git-with-submodules', '~> 2.0'
 ```
 
 Latest revision from github
 ```ruby
-gem 'capistrano-git-with-submodules', '~> 1.2', :github => 'ekho/capistrano-git-with-submodules'
+gem 'capistrano-git-with-submodules', '~> 2.0', :github => 'ekho/capistrano-git-with-submodules'
 ```
 
 #### Capfile
-Change default
+After
 ```ruby
 require "capistrano/scm/git"
 install_plugin Capistrano::SCM::Git
 ```
-to
+add
 ```ruby
 require "capistrano/scm/git-with-submodules"
 install_plugin Capistrano::SCM::Git::WithSubmodules
 ```
 
+> If you are upgrading from [`capistrano-git-submodule-strategy`](https://github.com/ekho/capistrano-git-submodule-strategy#using) you should remove its settings from your `Gemfile`, `Capfile` and `deploy.rb`.
+
 ## Contributing to capistrano-git-with-submodules
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

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

@@ -0,0 +1,9 @@
+module Capistrano
+  module Git
+    module With
+      module Submodules
+        VERSION = "2.0.4"
+      end
+    end
+  end
+end

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

@@ -1,35 +1,41 @@
-require "capistrano/scm/git"
+require "capistrano/plugin"
 
-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)
+class Capistrano::SCM::Git::WithSubmodules < Capistrano::Plugin
 
-  def archive_to_release_path
-    origin_archive_to_release_path
+  def register_hooks
+    after 'git:create_release', 'git:submodules:create_release'
+  end
 
-    return unless backend.test(:test, '-f', release_path.join('.gitmodules'))
+  def define_tasks
+    namespace :git do
+      namespace :submodules do
 
-    submodules_to_release_path
+        desc "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
+        task create_release: :'git:update' do
+          temp_index_file_path = release_path.join("TEMP_INDEX_#{fetch(:release_timestamp)}")
 
-    backend.execute("find #{release_path} -name '.git' -printf 'Deleted %p' -delete")
-  end
+          on release_roles :all do
+            with fetch(:git_environmental_variables).merge(
+                'GIT_DIR' => repo_path.to_s,
+                'GIT_WORK_TREE' => release_path.to_s,
+                'GIT_INDEX_FILE' => temp_index_file_path.to_s
+            ) do
+              within release_path do
+                verbose = Rake.application.options.trace ? 'v' : ''
+                quiet = Rake.application.options.trace ? '' : '--quiet'
 
-  ##
-  # 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
+                execute :git, :reset, '--mixed', quiet, fetch(:branch), '--'
+                execute :git, :submodule, 'sync', '--recursive', quiet
+                execute :git, :submodule, 'update', '--init', '--checkout', '--recursive', quiet
+                execute :find, release_path, "-name '.git'", "|",  "xargs -I {} rm -rf#{verbose} '{}'"
+                execute :rm, "-f#{verbose}", temp_index_file_path.to_s
+              end if test :test, '-f', release_path.join('.gitmodules')
+            end
+          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.2.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Boris Gorbylev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -25,7 +25,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.7'
 description: Git submodules support for Capistrano 3.7+
-email: ekho@ekho.name
+email:
+- ekho@ekho.name
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -34,6 +35,7 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
+- lib/capistrano-git-with-submodules/version.rb
 - lib/capistrano/scm/git-with-submodules.rb
 homepage: https://github.com/ekho/capistrano-git-with-submodules
 licenses:
@@ -54,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Git submodules support for Capistrano 3.7+