capistrano-rsync-bladrak 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efdf0954c09848c97c6233be699529ead9bff3ca
-  data.tar.gz: 61aad85bfcf9d29573b7e00fb3f8e174849c35e7
+  metadata.gz: 5aad8058edbb6d63689d89ba247c46ef40620c1f
+  data.tar.gz: 91cbb9e32694722e57f15873d962acb11509c08f
 SHA512:
-  metadata.gz: 3ec33760e1b9a51505275ee9ce74a2c9904ccf794d3d54f74d41c29eb0a0f5a8d499e32b8eba5f150bdbfea63757b9d2ef5431a65ac7752642664fee94378fba
-  data.tar.gz: fb4277c381c4d877ab57ed0aa62af842564339559c03b4c2e7690f5ce3f0d38aa2afb432fe166186dac16b08c1984e1f28d6a83a815f097f452f387d9586fc87
+  metadata.gz: f512d8a02917dcfa824fa92573adce449de47f85ceffd6d32086641a8e10e4a7ba9dab7d78d2a57483115eabe5a49a58c803ca190953c391ec50d0972230a9b2
+  data.tar.gz: 7709ba55f56cf97c1046baadd8408826a15e0be330b35a82d829a31f758d942cada45f120a0c25746e11d4f84b434f2edbc7da0c536e11d81189ea4c36e6d614

data/README.md

@@ -49,7 +49,7 @@ Set rsync as the SCM to use
 set :scm, :rsync
 ```
 
-Set some `rsync_options` to your liking:
+Optionally set some `rsync_options` to your liking:
 ```ruby
 set :rsync_options, %w[--recursive --delete --delete-excluded --exclude .git*]
 ```
@@ -135,6 +135,7 @@ rsync_checkout_tag  | `false` | Is the ``:branch`` symbol containing a branch or
 rsync_copy    | `rsync --archive --acls --xattrs` | The command used to copy from remote cache to remote release
 rsync_target_dir | `.` | The local directory within ``:rsync_stage`` to clone to & deploy (useful if you want to keep cache of several branches/tags for instance)
 enable_git_submodules | `false` | Should we fetch submodules as well?
+reset_git_submodules_before_update | `false` | Do a reset hard on submodules (in case you do modifications on working copies)?
 
 
 License

data/lib/capistrano/rsync.rb

@@ -26,6 +26,8 @@ set_if_empty :rsync_target_dir, "."
 
 set_if_empty :enable_git_submodules, false
 
+set_if_empty :reset_git_submodules_before_update, false
+
 # NOTE: Please don't depend on tasks without a description (`desc`) as they
 # might change between minor or patch version releases. They make up the
 # private API and internals of Capistrano::Rsync. If you think something should
@@ -158,12 +160,19 @@ namespace :rsync do
 
     run_locally do
       within fetch(:rsync_stage) do
-        tags = !!fetch(:rsync_checkout_tag, false) ? '--tags' : ''
-        execute :git, :fetch, '--quiet --all --prune', "#{tags}", "#{git_depth.call}"
+        execute :git, :fetch, '--quiet --all --prune', "#{git_depth.call}"
+
+        if !!fetch(:rsync_checkout_tag, false)
+          execute :git, :fetch, '--quiet --tags'
+        end
 
         execute :git, :reset, '--quiet', '--hard', "#{rsync_target.call}"
 
         if fetch(:enable_git_submodules)
+          if fetch(:reset_git_submodules_before_update)
+            execute :git, :submodule, :foreach, "git reset --hard HEAD"
+          end
+
           execute :git, :submodule, :update
         end
       end
@@ -180,7 +189,7 @@ namespace :rsync do
     next if !has_roles?
 
     copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}/" "#{release_path}/")
-    on roles(:all) do |host|
+    on release_roles(:all) do |host|
       execute copy
     end
   end

data/lib/capistrano/rsync/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Rsync
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rsync-bladrak
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Hugo Briand, Andri Möll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano