capistrano-bundle_rsync 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 230c7ac05986a116441bf2c1d1322efc1ad936b3
-  data.tar.gz: e9919ec57dddf809f1757f7d00feb0b27431ef5f
+  metadata.gz: 947571b6493b5ee9d817038173d85843861ee994
+  data.tar.gz: 81ad9af1b67a3fe55548e179bca2db5f12ea61aa
 SHA512:
-  metadata.gz: 8394fcb8707bbaecf7185b2b80dc947677c58228127391b67cdb636f5c075596475e2ccf56a66972a96d7c34f5f65ed4a95c919df3fda5637e3ca8223d187162
-  data.tar.gz: 726fbbab18998b824396c1f266a4e2fa36e9f44ed36950ba412e08855b3c7cc933a0dc5ed8dff2d314b8433ea4b386813774f35f294f8b3c3cb8661b5f9e6dfb
+  metadata.gz: 15002e2ae62bd357856bedb2e9baba480a65457fc26765f11ebb40a26d8d8c0f20071a2c184ef298b04b606ec2424dbf20a35785b42ed231b043f604d52b6746
+  data.tar.gz: 2472e6d00b1da760721fa0ebd7122cb97df1c2319ea8b0e48f35ae9e3401dc580a5485246500b3a3477ac4f9b59f581de57941970ad472911fa0e1e327693d07

data/CHANGELOG.md

@@ -1,3 +1,11 @@
-# 0.0.2 (2014/07/08)
+# 0.1.1 (2014/07/09)
+
+Enhancements:
+
+* Support `bundle_rsync_rsync_options` configuration
+* Support `bundle_rsync_rsync_bwlimit` configuration
+
+# 0.1.0 (2014/07/08)
 
 First version
+

data/README.md

@@ -4,8 +4,7 @@ Deploy an application and bundled gems via rsync
 
 ## What is this for?
 
-Capistrano::BundleRsync requires to bundle gems only once on the deploy machine,
-which saves you from building gems on each your production machine. 
+Capistrano::BundleRsync builds (bundle) gems only once on a deploy machine and transfers gems to your production machines via rsync, which saves you from building gems on each your production machine. 
 
 Also saves you from having to install Git and Build Tools on your production machine.
 
@@ -57,6 +56,8 @@ bundle_rsync_local_bin_path | `"#{base_path}/bin"` | Path where to bundle instal
 bundle_rsync_config_files | `nil` | Additional files to rsync. Specified files are copied into `config` directory.
 bundle_rsync_ssh_options | `ssh_options` | Configuration of ssh for rsync. Default uses the value of `ssh_options`
 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.
 
 ## Installation
 
@@ -135,6 +136,7 @@ set :linked_dirs, %w(bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public
 set :keep_releases, 5
 set :scm, :bundle_rsync # Need this
 set :bundle_rsync_max_parallels, ENV['PARA']
+set :bundle_rsync_rsync_bwlimit, ENV['BWLIMIT'] # like 20000
 set :bundle_rsync_config_files, ['~/config/database.yml']
 
 set :application, 'sample'
@@ -160,7 +162,6 @@ A. capistrano-bundle\_rsync does `bundle install` at the deploy machine, not on
 
 ## ToDo
 
-1. Support rsync_options
 2. Support other SCMs than `git`. 
 
 ## ChangeLog

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.1.0"
+  spec.version       = "0.1.1"
   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/config.rb

@@ -74,5 +74,10 @@ module Capistrano::BundleRsync
     def self.max_parallels(hosts)
       fetch(:bundle_rsync_max_parallels) || hosts.size
     end
+
+    def self.rsync_options
+      bwlimit = fetch(:bundle_rsync_rsync_bwlimit) ? " --bwlimit #{fetch(:bundle_rsync_rsync_bwlimit)}" : ""
+      fetch(:bundle_rsync_rsync_options) || "-az --delete#{bwlimit}"
+    end
   end
 end

data/lib/capistrano/tasks/bundle_rsync.rake

@@ -33,18 +33,19 @@ BUNDLE_BIN: #{shared_path.join('bin')}
         bundle_config_path = "#{config.local_base_path}/bundle_config"
         File.open(bundle_config_path, "w") {|file| file.print(lines) }
 
+        rsync_options = config.rsync_options
         Parallel.each(hosts, in_processes: config.max_parallels(hosts)) do |host|
           ssh = config.build_ssh_command(host)
           if config_files = config.config_files
             config_files.each do |config_file|
               basename = File.basename(config_file)
-              execute :rsync, "-az --delete --rsh='#{ssh}' #{config_file} #{host}:#{release_path}/config/#{basename}"
+              execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config_file} #{host}:#{release_path}/config/#{basename}"
             end
           end
 
-          execute :rsync, "-az --delete --rsh='#{ssh}' #{config.local_bundle_path}/ #{host}:#{shared_path}/bundle/"
-          execute :rsync, "-az --delete --rsh='#{ssh}' #{config.local_bin_path}/ #{host}:#{shared_path}/bin/"
-          execute :rsync, "-az --delete --rsh='#{ssh}' #{bundle_config_path} #{host}:#{release_path}/.bundle/config"
+          execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bundle_path}/ #{host}:#{shared_path}/bundle/"
+          execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_bin_path}/ #{host}:#{shared_path}/bin/"
+          execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{bundle_config_path} #{host}:#{release_path}/.bundle/config"
         end
 
         FileUtils.rm_rf(config.local_release_path)
@@ -91,9 +92,10 @@ BUNDLE_BIN: #{shared_path.join('bin')}
         execute :git, :archive, fetch(:branch), '| tar -x -C', "#{config.local_release_path}"
       end
 
+      rsync_options = config.rsync_options
       Parallel.each(hosts, in_processes: config.max_parallels(hosts)) do |host|
         ssh = config.build_ssh_command(host)
-        execute :rsync, "-az --delete --rsh='#{ssh}' #{config.local_release_path}/ #{host}:#{release_path}/"
+        execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config.local_release_path}/ #{host}:#{release_path}/"
       end
     end
   end

metadata

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