capistrano-rsync-bladrak 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aad8058edbb6d63689d89ba247c46ef40620c1f
-  data.tar.gz: 91cbb9e32694722e57f15873d962acb11509c08f
+  metadata.gz: 6b76adfe7757ac58921b5d2de5d5ba2c00cf2a02
+  data.tar.gz: 2e932bb014c955142d65fd4a408861a3819a580c
 SHA512:
-  metadata.gz: f512d8a02917dcfa824fa92573adce449de47f85ceffd6d32086641a8e10e4a7ba9dab7d78d2a57483115eabe5a49a58c803ca190953c391ec50d0972230a9b2
-  data.tar.gz: 7709ba55f56cf97c1046baadd8408826a15e0be330b35a82d829a31f758d942cada45f120a0c25746e11d4f84b434f2edbc7da0c536e11d81189ea4c36e6d614
+  metadata.gz: 5b43d974bd1c6904fc95a86d8f1e5263af62a297806c69db873450f552cd99548687e335fc9b9f0864fc36cbc379d03bc15e33d5226bafb63d08ade9004848a8
+  data.tar.gz: 9fb48e3646db6c892598f99b332c26029c4382dc662c474fad5f0d0ea0d344e2b75f568334848ff353e2bf476f3c8e71b328c7df0fcc953673d0615f9e2133d0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.3.3 (Jul 15, 2015)
+- Adds support for checking out revisions on top of tags and branches (rsync_checkout_tag is now deprecated)
+
 ## 1.3.0 (Jul 2, 2015)
 - Refactored library to use run_locally and execute from Capistrano, so the output is uniformized & we exit on failed commands
 - Added some options as well (see README.md for complete list)

data/README.md

@@ -131,7 +131,8 @@ rsync_cache   | `shared/deploy` | Path where to cache your repository on the ser
 rsync_options | `[]` | Array of options to pass to `rsync`.
 rsync_sparse_checkout | `[]` | Array of directories to checkout (checks out all if empty)
 rsync_depth   | `1` | Sets the --depth argument value for the git operations; this is set to 1 by default as you won't need the git history
-rsync_checkout_tag  | `false` | Is the ``:branch`` symbol containing a branch or a tag?
+rsync_checkout | `branch` | Is the ``:branch`` symbol containing a branch, tag or revision?
+rsync_checkout_tag  | `false` | Is the ``:branch`` symbol containing a branch or a tag? ``Deprecated``
 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?

data/lib/capistrano/rsync.rb

@@ -8,9 +8,17 @@ set_if_empty :rsync_copy, "rsync --archive --acls --xattrs"
 # Sparse checkout allows to checkout only part of the repository
 set_if_empty :rsync_sparse_checkout, []
 
-# Sparse checkout allows to checkout only part of the repository
+# Merely here for backward compatibility reasons
 set_if_empty :rsync_checkout_tag, false
 
+# Option states what to checkout
+set_if_empty :rsync_checkout, "branch"
+
+# To be somewhat backward compatible to the previous checkout_tag option
+if fetch(:rsync_checkout_tag, false)
+  set :rsync_checkout, "tag"
+end
+
 # You may not need the whole history, put to false to get it whole
 set_if_empty :rsync_depth, 1
 
@@ -40,12 +48,24 @@ rsync_cache = lambda do
 end
 
 rsync_target = lambda do
-  target = !!fetch(:rsync_checkout_tag, false) ? "tags/#{fetch(:branch)}" : "origin/#{fetch(:branch)}"
+  case fetch(:rsync_checkout)
+    when "tag"
+      target = "tags/#{fetch(:branch)}"
+    when "revision"
+      target = fetch(:branch)
+    else
+      target = "origin/#{fetch(:branch)}"
+    end
   target
 end
 
 rsync_branch = lambda do
-  branch = !!fetch(:rsync_checkout_tag, false) ? "tags/#{fetch(:branch)}" : fetch(:branch)
+  if fetch(:rsync_checkout) == "tag"
+    branch = "tags/#{fetch(:branch)}"
+  else
+    branch = fetch(:branch)
+  end
+
   branch
 end
 

data/lib/capistrano/rsync/version.rb

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

metadata

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