capistrano-git-with-submodules 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c68411582da013a8133e3bb6e557fe9c17bc8264
-  data.tar.gz: 86b3362772f248e88323439d429c9d364f8c7fc4
+SHA256:
+  metadata.gz: fdba8fe1dcb93e559f238d43e9ab676eef9a0d6a0129e7cc67b9e095d14579f6
+  data.tar.gz: 1ca0cc0665cc980217b2f8f20f16bc59ed8ad4f9ab5d58343aff11c2b24c3713
 SHA512:
-  metadata.gz: a0935b277ca071e1bd595be3e0f1a91e9585cd1d9cb8ba32fa4d9d1cc8d27d097e8e4f794ab47e2fc35c81ac70df07ab175b107a061a58bc9b270babcadbfc23
-  data.tar.gz: 59e8483f107ee087f2bcab2f1af00b32d194f07d14740d88eb151c8258704aadc56b0e40d4a5faabfc62e8ec2ba5a5b1faac0267fa90639c2b38ff847e604785
+  metadata.gz: 28aa5ab47278f50ba5c096c563318ab2164db8fd1ec2ead43fd88a9170e6d4b90033645c71287d392b49d8dc742bbd2e90ffa84136fed340c8dbe42247623849
+  data.tar.gz: c6c2035eda864d752f2bf2b899647cdaea16e3a4c75987c6fbc83533d57f98d3d962a3701df592057b7037efee61426defe9f6d32e4319827661cb6888b87614

data/README.md

@@ -4,6 +4,8 @@ Git submodule support for Capistrano 3.7+
 
 For Capistrano 3.0-3.6 use old [capistrano-git-submodule-strategy](https://github.com/ekho/capistrano-git-submodule-strategy)
 
+**NOTE:** The project is looking for active maintainers.
+
 ## Using
 
 #### Gemfile
@@ -29,6 +31,8 @@ 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/scm/git-with-submodules.rb

@@ -27,8 +27,17 @@ class Capistrano::SCM::Git::WithSubmodules < Capistrano::Plugin
                 verbose = Rake.application.options.trace ? 'v' : ''
                 quiet = Rake.application.options.trace ? '' : '--quiet'
 
-                execute :git, :reset, '--mixed', quiet, fetch(:branch)
-                execute :git, :submodule, 'update', '--init', '--checkout', '--recursive', quiet
+                execute :git, :reset, '--mixed', quiet, fetch(:branch), '--'
+                update_submodule = proc do
+                  execute :git, :submodule, 'update',
+                          '--init', '--checkout', '--recursive', '--remote', quiet
+                end
+                begin
+                  update_submodule.call
+                rescue SSHKit::Command::Failed
+                  execute :git, :submodule, 'sync', '--recursive', quiet
+                  update_submodule.call
+                end
                 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')

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

@@ -2,7 +2,7 @@ module Capistrano
   module Git
     module With
       module Submodules
-        VERSION = "2.0.2"
+        VERSION = "2.0.5"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-with-submodules
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Boris Gorbylev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -56,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Git submodules support for Capistrano 3.7+