capistrano-git-with-submodules 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369fba65acde05c8def4e1f53bf518cae8c6c943
-  data.tar.gz: 7a36a19ab3d2a320b0d9883452a31b9dbbbebaa0
+  metadata.gz: 9aad3b41b20c9296e52b0f7846d68aa21a411661
+  data.tar.gz: 85af7e6d2cdf2e139cbbddcf5a8386ca3dc40e44
 SHA512:
-  metadata.gz: 2da4ed36202e8f24202999ff4e544b8db8074af1725631c442ceabf244b8433c6ec67d7aaf65f209f9cde9993f8e7b7beffb9fc4eefba6c67a3dac7b50a1188a
-  data.tar.gz: 8d7e5f4d77b03eae94c11f7d7eeab54dc1bf36040ed2b9061797594885908e1d9efe0668cf39c8503711ceacee82510a9b46733c28ad782fdba7835d607078b8
+  metadata.gz: ce98c3410e3972868c18ebc971975238a70968939375f82348e8a38aeb4d496cf16197f80f0f1a47aed305685c4e38c686cf8dd10eda59617f006d068a11f5af
+  data.tar.gz: 8ba481914671ef9113a65b564130edc45b5f7b3baa6b47814daa7e4d8af06abb3e8ce4e220c0c6df3d14da0312c3b1b46abff3b58c2a421bb474938f7b6ae93b

data/README.md

@@ -9,21 +9,21 @@ 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

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

@@ -1,35 +1,40 @@
-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, 'update', '--init', '--depth', 1, '--checkout', '--recursive', quiet
+                execute :find, release_path, "-name '.git'", "-printf 'removed %p'", "-delete"
+                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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-with-submodules
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Boris Gorbylev
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Git submodules support for Capistrano 3.7+