capistrano-rsync-local 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e113f8f3985d6de97d1781c7846e94a873334a
-  data.tar.gz: 5146c44c34e11c3d5430267b503d34efc591a545
+  metadata.gz: d2d1fcc7d4d2f98eda52ad8311bdf6d95b7f614c
+  data.tar.gz: cf6589920a479ffc19d02a6b8abd3e349cab1452
 SHA512:
-  metadata.gz: 7af134741ddc04303887c0699fda9ab809059a5749b3a7ed5390b175299979081b418652d219ffaedcd5ba5a10590bb43f0b08eb3a5c2365b250690b93892893
-  data.tar.gz: 51d02b90070b9ae18dd76d9b79af7f89cd725521d271f52dc3c695ac71a7e1a847e42cb24ed8292f8778e90a88efe5496d8f7f77bebded33587eaa0c5745dd19
+  metadata.gz: cf7b9b71cc9462a0765dea9117a5a103cc6b5e42c56d1aaefb38ab91b628cbd8438a1bc6b48f8e265f93f9db51cf92dbaf2491dcc8278de266800b6724b3a0a5
+  data.tar.gz: b0a8b87faf18adb0f0ff223e3f4df025aeda1b3841a816268c3983a6c847e9c8a756c80e627d25bc7cf06577107b912b3dbade0ec1e0ac7f4d1a8ecc6e25a334

data/README.md

@@ -1,7 +1,6 @@
 Capistrano::Rsync for Capistrano v3
 ===================================
-[![Gem version][gem-badge]](http://badge.fury.io/rb/capistrano-rsync)
-[gem-badge]: https://badge.fury.io/rb/capistrano-rsync.png
+[![Gem Version](https://badge.fury.io/rb/capistrano-rsync-local.svg)](http://badge.fury.io/rb/capistrano-rsync-local)
 
 **Deploy with Rsync** to your server from any local (or remote) repository when
 using [**Capistrano**](http://www.capistranorb.com/).  Saves you from having to
@@ -13,14 +12,14 @@ machine before deploying.
 - Works with the new [**Capistrano v3**](http://www.capistranorb.com/) ([source
   code](https://github.com/capistrano/capistrano)) versions `>= 3.0.0pre14` and
   `< 4`.
-- Suitable for deploying any apps, be it Ruby, Rails, Node.js or others.  
+- Suitable for deploying any apps, be it Ruby, Rails, Node.js or others.
 - Exclude files from being deployed with Rsync's `--exclude` options.
 - Precompile files or assets easily before deploying, like JavaScript or CSS.
 - Caches your previously deployed code to speed up deployments ~1337%.
 - Currently works only with Git (as does Capistrano v3), so please shout out
   your interest in other SCMs.
 
-Using [Mina](http://nadarei.co/mina/) instead of Capistrano? I've built
+Using [Mina](http://nadarei.co/mina/) instead of Capistrano? I've (actuall not me, but Moll) built
 [Mina::Rsync](https://github.com/moll/mina-rsync) as well.
 
 
@@ -28,7 +27,7 @@ Using
 -----
 Install with:
 ```
-gem install capistrano-rsync
+gem install capistrano-rsync-local
 ```
 
 Require it at the top of your `Capfile` (or `config/deploy.rb`):
@@ -93,16 +92,20 @@ Configuration
 -------------
 Set Capistrano variables with `set name, value`.
 
-Name          | Default | Description
---------------|---------|------------
-rsync_scm     | `git`   | Available options: `git`, `svn`.
-rsync_scm_username | nil | Used for Svn (Optional).
-rsync_scm_password | nil | Used for Svn (Optional).
-repo_url      | `.` | The path or URL to a SCM repository to clone from.
-branch        | `master` | The Git branch to checkout. This is ignored for Svn.
-rsync_stage   | `tmp/deploy` | Path where to clone your repository for staging, checkouting and rsyncing. Can be both relative or absolute.
-rsync_cache   | `shared/deploy` | Path where to cache your repository on the server to avoid rsyncing from scratch each time. Can be both relative or absolute.<br> Set to `nil` if you want to disable the cache.
-rsync_options | `[]` | Array of options to pass to `rsync`.  
+Name               | Default  | Description
+-------------------|----------|------------
+rsync_scm          | `git`    | Available options: `git`, `svn`.
+rsync_scm_username | nil      | Used for Svn (Optional).
+rsync_scm_password | nil      | Used for Svn (Optional).
+repo_url           | `.`      | The path or URL to a SCM repository to clone from.
+branch             | `master` | The Git branch to checkout. This is ignored for Svn.
+rsync_stage        | `tmp/deploy` | Path where to clone your repository for staging, checkouting and rsyncing. Can be both relative or absolute.
+rsync_cache        | `shared/deploy` | Path where to cache your repository on the server to avoid rsyncing from scratch each time. Can be both relative or absolute.<br> Set to `nil` if you want to disable the cache.
+rsync_options      | `[]`     | Array of options to pass to `rsync`.
+rsync_local_repo   | false    | The flag of the local repository, it disables any request to the scm
+rsync_with_ext     | false    | Enables checking out an external project
+repo_ext_url       | nil      | The URL of the external project. Required if `rsync_with_ext` is true.
+rsync_ext_stage    | `tmp/deploy_ext` | Path where to clone the external project.
 
 
 License
@@ -117,13 +120,3 @@ License*, which in summary means:
   program.
 
 For more convoluted language, see the `LICENSE` file.
-
-
-About
------
-**[Andri Möll](http://themoll.com)** made this happen.  
-[Monday Calendar](https://mondayapp.com) was the reason I needed this.
-
-If you find Capistrano::Rsync needs improving, please don't hesitate to type to
-me now at [andri@dot.ee](mailto:andri@dot.ee) or [create an issue
-online](https://github.com/moll/capistrano-rsync/issues).

data/lib/capistrano/rsync.rb

@@ -14,10 +14,6 @@ rsync_cache = lambda do
   cache
 end
 
-scm_instance = lambda do
-  scm_class = Capistrano::Rsync::Scm.const_get(:"#{fetch(:rsync_scm).capitalize}")
-  scm_class.new(self)
-end
 
 Rake::Task["load:defaults"].enhance ["rsync:defaults"]
 Rake::Task["deploy:check"].enhance ["rsync:hook_scm"]
@@ -25,7 +21,7 @@ Rake::Task["deploy:updating"].enhance ["rsync:hook_scm"]
 
 
 desc "Stage and rsync to the server (or its cache)."
-task :rsync => %w[rsync:stage] do
+task :rsync => %w[rsync:stage rsync:ext_stage] do
   roles(:all).each do |role|
     user = role.user + "@" if !role.user.nil?
 
@@ -55,6 +51,9 @@ namespace :rsync do
     # Capistrano::Rsync will sync straight to the release path.
     set :rsync_cache, "shared/deploy"
     set :rsync_local_repo, false
+
+    set :rsync_with_ext, false
+    set :rsync_ext_stage, 'tmp/deploy_ext'
   end
 
   # internally needed by capistrano's "deploy.rake"
@@ -80,22 +79,15 @@ namespace :rsync do
     # Everything's a-okay inherently!
   end
 
-  desc "Create the stage repository in a local directory."
-  task :create_stage do
-    next if File.directory?(fetch(:rsync_stage)) || fetch(:rsync_local_repo)
-    scm_instance.call.create_stage_cmds.each do |cmd|
-      Kernel.system *cmd
-    end
+  task :ext_stage do
+    next unless fetch(:rsync_with_ext)
+    scm_instance.call.get_last_ext_stage
   end
 
   desc "Update and freshen the stage repository."
-  task :stage => %w[create_stage] do
+  task :stage do
     next if fetch(:rsync_local_repo)
-    Dir.chdir fetch(:rsync_stage) do
-      scm_instance.call.update_stage_cmds.each do |cmd|
-        Kernel.system *cmd
-      end
-    end
+    scm_instance.call.get_last_main_stage
   end
 
   desc "Copy the code to the releases directory."

data/lib/capistrano/rsync/scm/svn.rb

@@ -9,37 +9,56 @@ module Capistrano
           "svn info | grep '^Revision:' | sed -e 's/^Revision: //'"
         end
 
-        def create_stage_cmds
+        def run_cmds (list = [])
+          list.each { |cmd| Kernel.system *cmd }
+        end
+
+        def create_stage(repo, path)
           cmd = []
 
           clone = %W[svn checkout]
-          clone << context.fetch(:repo_url, ".")
-          clone << context.fetch(:rsync_stage)
+          clone << context.fetch(repo, ".")
+          clone << context.fetch(path)
 
           clone << %W[--username #{context.fetch(:rsync_scm_username)}] if context.fetch(:rsync_scm_username)
           clone << %W[--password #{context.fetch(:rsync_scm_password)}] if context.fetch(:rsync_scm_password)
 
-          cmd << clone.flatten
-
-          cmd
+          run_cmds clone.flatten
         end
 
-        def update_stage_cmds
+        def update_stage
           cmd = []
 
           update = %W[svn update]
           update << %W[--username #{context.fetch(:rsync_scm_username)}] if context.fetch(:rsync_scm_username)
           update << %W[--password #{context.fetch(:rsync_scm_password)}] if context.fetch(:rsync_scm_password)
 
-          cmd << update.flatten
+          run_cmds update.flatten
 
           checkout = %W[svn revert --recursive .]
-          cmd << checkout
+          run_cmds checkout
+        end
 
-          cmd
+        def get_stage(repo_key, path_key)
+          if File.directory?(fetch(path_key))
+            repo = context.fetch(repo_key, ".")
+            path = context.fetch(path_key)
+            create_stage(repo, path)
+          else
+            Dir.chdir fetch(path_key) do
+              update_stage
+            end
+          end
         end
-      end
 
+        def get_last_ext_stage
+          get_stage :repo_ext_url, :rsync_ext_stage
+        end
+
+        def get_last_main_stage
+          get_stage :repo_url, :rsync_stage
+        end
+      end
     end
   end
 end

data/lib/capistrano/rsync/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Rsync
-    VERSION = '1.1'
+    VERSION = '1.2'
   end
 end

data/provision.sh

@@ -38,3 +38,5 @@ rbenv local ${RUBY_VERSION}
 gem update --system
 gem install bundler -N
 rbenv local --unset
+
+git config --global push.default simple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rsync-local
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Dmitry Tonkonogov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano