capistrano-bundle_rsync 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90d50f28156ca6735117d30e27e8e7b314dbc58
-  data.tar.gz: d8316808133e0c4f0c1603814b2a456921ea747f
+  metadata.gz: 63590982f55043e42dd7b1d9295aa885f265b8d6
+  data.tar.gz: 10f89bb5c7f34feeae5efafd0c7f67394b646b7c
 SHA512:
-  metadata.gz: 4afc9dbd2074b3fcf99f7cd39e2a2b3ceee5987c3dc037c2dc6d871c6687ca035e5c6e80ced33817d3fa6df7a30e5ce3abc89156106ca6543e1a3b13a9995372
-  data.tar.gz: 174c5c142f974acb7eaa7b64886ee34e50ef19065f9f98178714d61bfb64cde754810b36fdd0a5f6580289a1c2b595a37ff018eaa35864aa5ea6b45411ef213e
+  metadata.gz: 43f1ab1478797a5a701209a52039978b84da445711c67d807bd4b601c59518912cbfc0e1e10f9de7ba29b56c5a3f29650a53c915b08d0d368824679bdefb2117
+  data.tar.gz: 1fd91e762d4e034f9abd49cab993b21121a585b59e0da75f3cbd9d025145ad4a3635e54008e156eda2f546ce0154bb992b60364f661843388edf66a629056dff

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.5 (2014/08/05)
+
+Enhancements:
+
+* Add `bundle_rsync_shared_dirs` and `bundle_rsync_shared_rsync_options` options
+
 # 0.2.4 (2014/07/28)
 
 Changes:

data/README.md

@@ -56,12 +56,14 @@ bundle_rsync_local_mirror_path | `#{base_path}/mirror"` | Path where to mirror y
 bundle_rsync_local_releases_path | `"#{base_path}/releases"` | Path of the directory to checkout your repository
 bundle_rsync_local_release_path | `"#{releases_path}/#{datetime}"` | Path to checkout your repository (releases_path + release_name)
 bundle_rsync_local_bundle_path | `"#{base_path}/bundle"` | Path where to bundle install gems.
-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_keep_releases | `keep_releases` | The number of releases to keep on .local_repo
 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_config_files | `nil` | Additional files to rsync. Specified files are copied into `config` directory.
+bundle_rsync_shared_dirs | `nil` | Additional directories to rsync. Specified directories are copied into `shared` directory.
+bundle_rsync_shared_rsync_options | `-az` | Configuration of rsync options for `config_files` and `shared_dirs`
 bundle_rsync_skip_bundle | false | (Secret option) Do not `bundle` and rsync bundle.
 
 ## Task Orders
@@ -73,6 +75,7 @@ bundle_rsync_skip_bundle | false | (Secret option) Do not `bundle` and rsync bun
 ** Execute bundle_rsync:create_release
 ** Execute bundle_rsync:bundler:install
 ** Execute bundle_rsync:rsync_release
+** Execute bundle_rsync:rsync_shared
 ** Execute bundle_rsync:bundler:rsync
 ** Execute bundle_rsync:set_current_revision
 ```

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.4"
+  spec.version       = "0.2.5"
   spec.authors       = ["sonots", "tohae"]
   spec.email         = ["sonots@gmail.com", "tohaechan@gmail.com"]
   spec.description   = %q{Deploy an application and bundled gems via rsync}

data/example/config/deploy.rb

@@ -14,6 +14,7 @@ set :deploy_to, "#{ENV['HOME']}/sample"
 set :scm, :bundle_rsync
 set :bundle_rsync_max_parallels, ENV['PARA']
 set :bundle_rsync_rsync_bwlimit, ENV['BWLIMIT'] # like 20000
+set :bundle_rsync_shared_dirs, File.expand_path('..', __dir__) # rsync example to shared/example
 
 namespace :deploy do
   desc 'Restart web application'

data/lib/capistrano/bundle_rsync/config.rb

@@ -25,6 +25,11 @@ module Capistrano::BundleRsync
       config_files.is_a?(Array) ? config_files : [config_files]
     end
 
+    def self.shared_dirs
+      return nil unless shared_dirs = fetch(:bundle_rsync_shared_dirs)
+      shared_dirs.is_a?(Array) ? shared_dirs : [shared_dirs]
+    end
+
     # Build ssh command options for rsync
     #
     # First, search available user and keys configurations for each role:
@@ -84,6 +89,11 @@ module Capistrano::BundleRsync
       fetch(:bundle_rsync_rsync_options) || "-az --delete#{bwlimit}"
     end
 
+    def self.shared_rsync_options
+      bwlimit = fetch(:bundle_rsync_rsync_bwlimit) ? " --bwlimit #{fetch(:bundle_rsync_rsync_bwlimit)}" : ""
+      fetch(:bundle_rsync_shared_sync_options) || "-az#{bwlimit}"
+    end
+
     def self.skip_bundle
       fetch(:bundle_rsync_skip_bundle)
     end

data/lib/capistrano/bundle_rsync/scm.rb

@@ -80,6 +80,38 @@ class Capistrano::BundleRsync::SCM < Capistrano::BundleRsync::Base
     )
   end
 
+  # @abstract
+  #
+  # Rsync arbitrary contents to shared directory
+  #
+  # This is an additional task endpoint provided by capistrano-bundle_rsync
+  #
+  # @return void
+  def rsync_shared
+    hosts = release_roles(:all)
+    rsync_options = config.shared_rsync_options
+
+    if config_files = config.config_files
+      Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
+        ssh = config.build_ssh_command(host)
+        config_files.each do |config_file|
+          basename = File.basename(config_file)
+          execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{config_file} #{host}:#{release_path}/config/#{basename}"
+        end
+      end
+    end
+
+    if shared_dirs = config.shared_dirs
+      Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
+        ssh = config.build_ssh_command(host)
+        shared_dirs.each do |shared_dir|
+          basename = File.basename(shared_dir)
+          execute :rsync, "#{rsync_options} --rsh='#{ssh}' #{shared_dir}/ #{host}:#{shared_path}/#{basename}/"
+        end
+      end
+    end
+  end
+
   # @abstract
   #
   # Identify the SHA of the commit that will be deployed.  This will most likely involve SshKit's capture method.

data/lib/capistrano/tasks/bundle_rsync.rake

@@ -83,6 +83,14 @@ namespace :bundle_rsync do
     end
   end
 
+  # additional extra tasks of bundle_rsync scm
+  desc 'Rsync shared'
+  task :rsync_shared do
+    run_locally do
+      scm.rsync_shared
+    end
+  end
+
   desc 'Determine the revision that will be deployed'
   task :set_current_revision do
     run_locally do
@@ -92,6 +100,7 @@ namespace :bundle_rsync do
 
   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'
+  after 'bundle_rsync:rsync_release', 'bundle_rsync:rsync_shared'
+  after 'bundle_rsync:rsync_shared', '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.4
+  version: 0.2.5
 platform: ruby
 authors:
 - sonots
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano