capistrano-git-with-submodules 2.0.2 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: c68411582da013a8133e3bb6e557fe9c17bc8264
4
- data.tar.gz: 86b3362772f248e88323439d429c9d364f8c7fc4
2
+ SHA256:
3
+ metadata.gz: fdba8fe1dcb93e559f238d43e9ab676eef9a0d6a0129e7cc67b9e095d14579f6
4
+ data.tar.gz: 1ca0cc0665cc980217b2f8f20f16bc59ed8ad4f9ab5d58343aff11c2b24c3713
5
5
  SHA512:
6
- metadata.gz: a0935b277ca071e1bd595be3e0f1a91e9585cd1d9cb8ba32fa4d9d1cc8d27d097e8e4f794ab47e2fc35c81ac70df07ab175b107a061a58bc9b270babcadbfc23
7
- data.tar.gz: 59e8483f107ee087f2bcab2f1af00b32d194f07d14740d88eb151c8258704aadc56b0e40d4a5faabfc62e8ec2ba5a5b1faac0267fa90639c2b38ff847e604785
6
+ metadata.gz: 28aa5ab47278f50ba5c096c563318ab2164db8fd1ec2ead43fd88a9170e6d4b90033645c71287d392b49d8dc742bbd2e90ffa84136fed340c8dbe42247623849
7
+ data.tar.gz: c6c2035eda864d752f2bf2b899647cdaea16e3a4c75987c6fbc83533d57f98d3d962a3701df592057b7037efee61426defe9f6d32e4319827661cb6888b87614
data/README.md CHANGED
@@ -4,6 +4,8 @@ Git submodule support for Capistrano 3.7+
4
4
 
5
5
  For Capistrano 3.0-3.6 use old [capistrano-git-submodule-strategy](https://github.com/ekho/capistrano-git-submodule-strategy)
6
6
 
7
+ **NOTE:** The project is looking for active maintainers.
8
+
7
9
  ## Using
8
10
 
9
11
  #### Gemfile
@@ -29,6 +31,8 @@ require "capistrano/scm/git-with-submodules"
29
31
  install_plugin Capistrano::SCM::Git::WithSubmodules
30
32
  ```
31
33
 
34
+ > 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`.
35
+
32
36
  ## Contributing to capistrano-git-with-submodules
33
37
 
34
38
  * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -27,8 +27,17 @@ class Capistrano::SCM::Git::WithSubmodules < Capistrano::Plugin
27
27
  verbose = Rake.application.options.trace ? 'v' : ''
28
28
  quiet = Rake.application.options.trace ? '' : '--quiet'
29
29
 
30
- execute :git, :reset, '--mixed', quiet, fetch(:branch)
31
- execute :git, :submodule, 'update', '--init', '--checkout', '--recursive', quiet
30
+ execute :git, :reset, '--mixed', quiet, fetch(:branch), '--'
31
+ update_submodule = proc do
32
+ execute :git, :submodule, 'update',
33
+ '--init', '--checkout', '--recursive', '--remote', quiet
34
+ end
35
+ begin
36
+ update_submodule.call
37
+ rescue SSHKit::Command::Failed
38
+ execute :git, :submodule, 'sync', '--recursive', quiet
39
+ update_submodule.call
40
+ end
32
41
  execute :find, release_path, "-name '.git'", "|", "xargs -I {} rm -rf#{verbose} '{}'"
33
42
  execute :rm, "-f#{verbose}", temp_index_file_path.to_s
34
43
  end if test :test, '-f', release_path.join('.gitmodules')
@@ -2,7 +2,7 @@ module Capistrano
2
2
  module Git
3
3
  module With
4
4
  module Submodules
5
- VERSION = "2.0.2"
5
+ VERSION = "2.0.5"
6
6
  end
7
7
  end
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-git-with-submodules
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Boris Gorbylev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-02 00:00:00.000000000 Z
11
+ date: 2022-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capistrano
@@ -56,8 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
56
56
  - !ruby/object:Gem::Version
57
57
  version: 1.3.6
58
58
  requirements: []
59
- rubyforge_project:
60
- rubygems_version: 2.6.8
59
+ rubygems_version: 3.0.3.1
61
60
  signing_key:
62
61
  specification_version: 4
63
62
  summary: Git submodules support for Capistrano 3.7+