capistrano-bundle_rsync 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729833358d2b8f992b042929584cd4a9bac680c6
-  data.tar.gz: 75ffda19038ade33a7b76c34a714e16642612dc6
+  metadata.gz: 4081c3980ab6875e68c72e7b8c3582b2e2edd2f8
+  data.tar.gz: 587a0ad49eae6c909c5a59470dd716bf4e736af4
 SHA512:
-  metadata.gz: 4fc0348121a5b5ade9a1b1510bb37528bb8fc785af148d6312f5b41476b2905e3914977b206b90bd0a47bcb6118c672b9159958cd6f8ff4b7f3f3b1308d83f44
-  data.tar.gz: f569840201a463109e537fd9007068a9d0bb7244096544f43c0a16105f6ab8a7faf281c2302079ebabaf0acd8ee68613be38fec010a127f3dedf78451d23e754
+  metadata.gz: cbb74da8fe02fae8f4675e0db703c3b23901c06f052f8e56c77bf86bc6fd10c7fb2613cb47c6d06f73a1dacb22cf11ec219a96c2e4bdafef160aa53f756753f8
+  data.tar.gz: d79a9c1d0cd7c430f019bdba761051a32bb85a8ef0e48e523398d249dbb249633dedfd587a31b74fb9f3aa545cc54008ab1897d2a22feb3fa82b2f2c28b0b938

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.2 (2014/07/17)
+
+Changes:
+
+* Split rsync tasks and reorder tasks to be better
+
 # 0.2.1 (2014/07/11)
 
 Fixes:

data/README.md

@@ -14,8 +14,8 @@ Capistrano::BundleRsync works as followings:
 
 1. Do `git clone --mirror URL .local_repo/mirror` on a deploy (local) machine.
 2. Extract a branch by `git archive {branch}` to `.local_repo/release_{time}`
-4. Deploy the `release` directory to remote machines by `rsync`. 
 3. Do `bundle --without development,test --path .local_repo/bundle` on a deploy (local) machine.
+4. Deploy the `release` directory to remote machines by `rsync`. 
 5. Deploy the `bundle` directory to remote machines by `rsync`.
 
 ## Prerequisites
@@ -50,6 +50,7 @@ branch        | `master` | The Git branch to checkout.
 ssh_options   | `{}`  | Configuration of ssh :user and :keys.
 keep\_releases | 5 | The number of releases to keep.
 scm | nil | Must be `bundle_rsync` to use capistrano-bundle_rsync.
+bundle_rsync_scm | `git` | SCM Strategy inside `bundle_rsync`. `git` uses git. `local_git` also uses git, but it enables to rsync the git repository located on local path directly without git clone. `repo_url` must be the local directory path to use `local_git`.
 bundle_rsync_local_base_path   | `$(pwd)/.local_repo` | The base directory to clone repository
 bundle_rsync_local_mirror_path | `#{base_path}/mirror"` | Path where to mirror your repository
 bundle_rsync_local_releases_path | `"#{base_path}/releases"` | Path of the directory to checkout your repository
@@ -61,7 +62,19 @@ bundle_rsync_keep_releases | `keep_releases` | The number of releases to keep on
 bundle_rsync_max_parallels | number of hosts | Number of concurrency. The default is the number of hosts to deploy.
 bundle_rsync_rsync_bwlimit | nil | Configuration of rsync --bwlimit (KBPS) option. Not Avabile if `bundle_rsync_rsync_options` is specified.
 bundle_rsync_rsync_options | `-az --delete` | Configuration of rsync options.
-bundle_rsync_scm | 'git' or 'local_git' | SCM Strategy inside `bundle_rsync`. `git` uses git. `local_git` also uses git, but it enables to rsync the git repository located on local path directly without git clone. `repo_url` must be the local directory path to use `local_git`.
+
+## Task Orders
+
+```
+** Execute bundle_rsync:check
+** Execute bundle_rsync:clone
+** Execute bundle_rsync:update
+** Execute bundle_rsync:create_release
+** Execute bundle_rsync:bundler:install
+** Execute bundle_rsync:rsync_release
+** Execute bundle_rsync:bundler:rsync
+** Execute bundle_rsync:set_current_revision
+```
 
 ## Installation
 

data/capistrano-bundle_rsync.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-bundle_rsync"
-  spec.version       = "0.2.1"
+  spec.version       = "0.2.2"
   spec.authors       = ["sonots", "tohae"]
   spec.email         = ["sonots@gmail.com", "tohaechan@gmail.com"]
   spec.description   = %q{Deploy an application and bundled gems via rsync}

data/lib/capistrano/bundle_rsync/bundler.rb

@@ -1,20 +1,19 @@
 require 'capistrano/bundle_rsync/base'
 
 class Capistrano::BundleRsync::Bundler < Capistrano::BundleRsync::Base
-  def prepare
+  def install
+    Bundler.with_clean_env do
+      execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test"
+    end
+  end
+
+  def rsync
     hosts = release_roles(:all)
     on hosts, in: :groups, limit: config.max_parallels(hosts) do
       within release_path do
         execute :mkdir, '-p', '.bundle'
       end
     end
-  end
-
-  def install
-    hosts = release_roles(:all)
-    Bundler.with_clean_env do
-      execute :bundle, "--gemfile #{config.local_release_path}/Gemfile --deployment --quiet --path #{config.local_bundle_path} --without development test"
-    end
 
     lines = <<-EOS
 ---

data/lib/capistrano/bundle_rsync/git.rb

@@ -21,13 +21,15 @@ class Capistrano::BundleRsync::Git < Capistrano::BundleRsync::SCM
   end
 
   def create_release
-    hosts = release_roles(:all)
     execute "mkdir -p #{config.local_release_path}"
 
     within config.local_mirror_path do
       execute :git, :archive, fetch(:branch), '| tar -x -C', "#{config.local_release_path}"
     end
+  end
 
+  def rsync_release
+    hosts = release_roles(:all)
     rsync_options = config.rsync_options
     Parallel.each(hosts, in_processes: config.max_parallels(hosts)) do |host|
       ssh = config.build_ssh_command(host)

data/lib/capistrano/bundle_rsync/local_git.rb

@@ -14,6 +14,9 @@ class Capistrano::BundleRsync::LocalGit < Capistrano::BundleRsync::SCM
   end
 
   def create_release
+  end
+
+  def rsync_release
     hosts = release_roles(:all)
     rsync_options = config.rsync_options
     Parallel.each(hosts, in_processes: config.max_parallels(hosts)) do |host|

data/lib/capistrano/tasks/bundle_rsync.rake

@@ -23,11 +23,16 @@ namespace :bundle_rsync do
 
   namespace :bundler do
     task :install do
-      bundler.prepare
       run_locally do
         bundler.install
       end
     end
+
+    task :rsync do
+      run_locally do
+        bundler.rsync
+      end
+    end
   end
 
   desc 'Check that the repository is reachable'
@@ -58,6 +63,14 @@ namespace :bundle_rsync do
     end
   end
 
+  # additional extra tasks of bundle_rsync scm
+  desc 'Rsync releases'
+  task :rsync_release do
+    run_locally do
+      scm.rsync_release
+    end
+  end
+
   desc 'Determine the revision that will be deployed'
   task :set_current_revision do
     run_locally do
@@ -65,6 +78,8 @@ namespace :bundle_rsync do
     end
   end
 
-  before 'deploy:updated', 'bundle_rsync:bundler:install'
+  after 'bundle_rsync:create_release', 'bundle_rsync:bundler:install'
+  after 'bundle_rsync:bundler:install', 'bundle_rsync:rsync_release'
+  after 'bundle_rsync:rsync_release', 'bundle_rsync:bundler:rsync'
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundle_rsync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - sonots
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano