capistrano-rsync-local 1.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d1fcc7d4d2f98eda52ad8311bdf6d95b7f614c
-  data.tar.gz: cf6589920a479ffc19d02a6b8abd3e349cab1452
+  metadata.gz: d61cfcaba0fd9157085b08907d67b0ad584f637a
+  data.tar.gz: 21bf85381764e4dc4b0bf54f924907ded4f8d684
 SHA512:
-  metadata.gz: cf7b9b71cc9462a0765dea9117a5a103cc6b5e42c56d1aaefb38ab91b628cbd8438a1bc6b48f8e265f93f9db51cf92dbaf2491dcc8278de266800b6724b3a0a5
-  data.tar.gz: b0a8b87faf18adb0f0ff223e3f4df025aeda1b3841a816268c3983a6c847e9c8a756c80e627d25bc7cf06577107b912b3dbade0ec1e0ac7f4d1a8ecc6e25a334
+  metadata.gz: 8138f91c8695c3f4dc21853798d15d85300755251c870d2a03c457c62f3659452058a9a99af902ae488eb1c5138cb56e4076812e748f4aa6a3e66bad3a634c0c
+  data.tar.gz: 46ed927ebad4b994fe1a5c1b46366ba4e0a1ffa859d4709d21371ce46f4804f1dec014543d3e3e8cfa0cb251f799e7755c704a2a7417e5eb26825ad294ce673c

data/README.md

@@ -9,20 +9,18 @@ you want to deploy. Also allows you to easily precompile things on your local
 machine before deploying.
 
 ### Tour
-- Works with the new [**Capistrano v3**](http://www.capistranorb.com/) ([source
+- Works with [**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.
 - 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.
+- Works with git and svn.
 
 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.
 
-
 Using
 -----
 Install with:

data/capistrano-rsync-local.gemspec

@@ -1,8 +1,6 @@
-require File.expand_path('../lib/capistrano/rsync/version', __FILE__)
-
 Gem::Specification.new do |gem|
   gem.name = 'capistrano-rsync-local'
-  gem.version = Capistrano::Rsync::VERSION
+  gem.version = '2.0'
   gem.homepage = 'https://github.com/tonkonogov/capistrano-rsync'
   gem.summary = <<-end.strip.gsub(/\s*\n\s*/, " ")
     Deploy with Rsync from any local (or remote) repository.

data/lib/capistrano/rsync.rb

@@ -1,107 +1 @@
-require File.expand_path("../rsync/version", __FILE__)
-require File.expand_path("../rsync/scm/base", __FILE__)
-require File.expand_path("../rsync/scm/git", __FILE__)
-require File.expand_path("../rsync/scm/svn", __FILE__)
-
-# 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
-# be public for extending and hooking, please let me know!
-
-rsync_cache = lambda do
-  cache = fetch(:rsync_cache)
-  cache = deploy_to + "/" + cache if cache && cache !~ /^\//
-  cache
-end
-
-
-Rake::Task["load:defaults"].enhance ["rsync:defaults"]
-Rake::Task["deploy:check"].enhance ["rsync:hook_scm"]
-Rake::Task["deploy:updating"].enhance ["rsync:hook_scm"]
-
-
-desc "Stage and rsync to the server (or its cache)."
-task :rsync => %w[rsync:stage rsync:ext_stage] do
-  roles(:all).each do |role|
-    user = role.user + "@" if !role.user.nil?
-
-    rsync = %w[rsync]
-    rsync.concat fetch(:rsync_options)
-    rsync << fetch(:rsync_stage) + "/"
-    rsync << "#{user}#{role.hostname}:#{rsync_cache.call || release_path}"
-
-    Kernel.system *rsync
-  end
-end
-
-namespace :rsync do
-  desc "Load rsync default options."
-  task :defaults do
-    set :rsync_options, []
-    set :rsync_copy, "rsync --archive --acls --xattrs"
-
-    # Scm to use.
-    set :rsync_scm, "git"
-
-    # Stage is used on your local machine for rsyncing from.
-    set :rsync_stage, "tmp/deploy"
-
-    # Cache is used on the server to copy files to from to the release directory.
-    # Saves you rsyncing your whole app folder each time.  If you nil rsync_cache,
-    # 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"
-  task :set_current_revision do
-    Dir.chdir fetch(:rsync_stage) do
-      cmd = scm_instance.call.get_current_revision_cmd
-      rev = `#{cmd}`
-      set :current_revision, rev
-    end
-  end
-
-  task :hook_scm do
-    Rake::Task.define_task("#{scm}:check") do
-      invoke "rsync:check"
-    end
-
-    Rake::Task.define_task("#{scm}:create_release") do
-      invoke "rsync:release"
-    end
-  end
-
-  task :check do
-    # Everything's a-okay inherently!
-  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 do
-    next if fetch(:rsync_local_repo)
-    scm_instance.call.get_last_main_stage
-  end
-
-  desc "Copy the code to the releases directory."
-  task :release => %w[rsync] do
-    # Skip copying if we've already synced straight to the release directory.
-    next if !fetch(:rsync_cache)
-
-    copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}/" "#{release_path}/")
-    on roles(:all) do |host|
-      execute copy
-    end
-  end
-
-  # Matches the naming scheme of git tasks.
-  # Plus was part of the public API in Capistrano::Rsync <= v0.2.1.
-  task :create_release => %w[release]
-end
+require_relative 'rsync/tasks'

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

@@ -1,7 +1,6 @@
 module Capistrano
   module Rsync
     module Scm
-
       class Svn < Capistrano::Rsync::Scm::Base
         attr_reader :context
 
@@ -9,21 +8,21 @@ module Capistrano
           "svn info | grep '^Revision:' | sed -e 's/^Revision: //'"
         end
 
-        def run_cmds (list = [])
-          list.each { |cmd| Kernel.system *cmd }
+        def run_cmd(list = [])
+          Kernel.system *list
         end
 
         def create_stage(repo, path)
           cmd = []
 
           clone = %W[svn checkout]
-          clone << context.fetch(repo, ".")
-          clone << context.fetch(path)
+          clone << repo || "."
+          clone << 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)
 
-          run_cmds clone.flatten
+          run_cmd clone.flatten
         end
 
         def update_stage
@@ -33,18 +32,20 @@ module Capistrano
           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)
 
-          run_cmds update.flatten
+          run_cmd update.flatten
 
           checkout = %W[svn revert --recursive .]
-          run_cmds checkout
+          run_cmd checkout
         end
 
+
         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

data/lib/capistrano/rsync/tasks.rb

@@ -0,0 +1,5 @@
+require_relative 'scm/base'
+require_relative 'scm/git'
+require_relative 'scm/svn'
+
+load File.expand_path('../../tasks/rsync.cap', __FILE__)

data/lib/capistrano/tasks/rsync.cap

@@ -0,0 +1,100 @@
+rsync_cache = lambda do
+  cache = fetch(:rsync_cache)
+  cache = deploy_to + "/" + cache if cache && cache !~ /^\//
+  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"]
+Rake::Task["deploy:updating"].enhance ["rsync:hook_scm"]
+
+desc "Stage and rsync to the server (or its cache)."
+task :rsync => %w[rsync:stage rsync:ext_stage] do
+  roles(:all).each do |role|
+    user = role.user + "@" if !role.user.nil?
+
+    rsync = %w[rsync]
+    rsync.concat fetch(:rsync_options)
+    rsync << fetch(:rsync_stage) + "/"
+    rsync << "#{user}#{role.hostname}:#{rsync_cache.call || release_path}"
+
+    Kernel.system *rsync
+  end
+end
+
+namespace :rsync do
+  desc "Load rsync default options."
+  task :defaults do
+    set :rsync_options, []
+    set :rsync_copy, "rsync --archive --acls --xattrs"
+
+    # Scm to use.
+    set :rsync_scm, "git"
+
+    # Stage is used on your local machine for rsyncing from.
+    set :rsync_stage, "tmp/deploy"
+
+    # Cache is used on the server to copy files to from to the release directory.
+    # Saves you rsyncing your whole app folder each time.  If you nil rsync_cache,
+    # 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"
+  task :set_current_revision do
+    Dir.chdir fetch(:rsync_stage) do
+      cmd = scm_instance.call.get_current_revision_cmd
+      rev = `#{cmd}`
+      set :current_revision, rev
+    end
+  end
+
+  task :hook_scm do
+    Rake::Task.define_task("#{scm}:check") do
+      invoke "rsync:check"
+    end
+
+    Rake::Task.define_task("#{scm}:create_release") do
+      invoke "rsync:release"
+    end
+  end
+
+  task :check do
+    # Everything's a-okay inherently!
+  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 do
+    next if fetch(:rsync_local_repo)
+    scm_instance.call.get_last_main_stage
+  end
+
+  desc "Copy the code to the releases directory."
+  task :release => %w[rsync] do
+    # Skip copying if we've already synced straight to the release directory.
+    next if !fetch(:rsync_cache)
+
+    copy = %(#{fetch(:rsync_copy)} "#{rsync_cache.call}/" "#{release_path}/")
+    on roles(:all) do |host|
+      execute copy
+    end
+  end
+
+  # Matches the naming scheme of git tasks.
+  # Plus was part of the public API in Capistrano::Rsync <= v0.2.1.
+  task :create_release => %w[release]
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rsync-local
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '2.0'
 platform: ruby
 authors:
 - Dmitry Tonkonogov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -49,11 +49,13 @@ files:
 - README.md
 - Vagrantfile
 - capistrano-rsync-local.gemspec
+- lib/capistrano-rsync.rb
 - lib/capistrano/rsync.rb
 - lib/capistrano/rsync/scm/base.rb
 - lib/capistrano/rsync/scm/git.rb
 - lib/capistrano/rsync/scm/svn.rb
-- lib/capistrano/rsync/version.rb
+- lib/capistrano/rsync/tasks.rb
+- lib/capistrano/tasks/rsync.cap
 - provision.sh
 homepage: https://github.com/tonkonogov/capistrano-rsync
 licenses:

data/lib/capistrano/rsync/version.rb

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