capistrano-bundle_rsync 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c2743195991ea4910fac6fae9e521b7a4c4fb9
-  data.tar.gz: 3b56d781ba6bb30bc140aba5048225c62c2bc76c
+  metadata.gz: c2b3294286dea3b0a2436175976e3ba1dd9ec905
+  data.tar.gz: 218228ef3e963c2cc48af03c2ed1dead69cd2ec3
 SHA512:
-  metadata.gz: c1ecb673add2d7e4ebc3fb8b172212a2b7e1d9a911f329a14331c5a0059c91f1171fe8c62c634c480683f2ba74a1a6fc5b496ed1ea2b5df011a4eeefdec1abaf
-  data.tar.gz: 9fbff9b33e2cb0cdc464ecd0a7da0dc2a2a0708e943b591d36bf496d2fd13f8a9d49b67471c082657160cbf292018c35b2b759e21a3da7a278d8df36cae10d0e
+  metadata.gz: 74b4cc2705cf7bb8e79c54603136fd17b9f1e96d11c4617f31813c195e967af576ac0e614eb5cd0735c78ca6616eed48f7c6daa7abddb09dd1fe268c37d0ca11
+  data.tar.gz: 372481372e8012703e5bcefedc878fe4c38915c6c66890b61bbe4d77542c7c384a48c9a83adf5d5eb9e42eada8a59da8902643c1e1cf9cc3e8b9433888892d1b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.4.1 (2015/03/16)
+
+Fixes:
+
+* Fix --hosts and --roles options to work (thanks to @niku4i)
+* Fix to config.bundle_rsync_max_parallels to be integer always (thanks to @niku4i)
+* Fix for the case `bundle_rsync_ssh_options` and `ssh_options` are not configured (thanks to @niku4i)
+
 # 0.4.0 (2015/03/04)
 
 Enhancements:

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.4.0"
+  spec.version       = "0.4.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/bundler.rb

@@ -1,4 +1,5 @@
 require 'capistrano/bundle_rsync/base'
+require 'capistrano/configuration/filter'
 
 class Capistrano::BundleRsync::Bundler < Capistrano::BundleRsync::Base
   def install
@@ -28,6 +29,7 @@ BUNDLE_BIN: #{release_path.join('bin')}
     bundle_config_path = "#{config.local_base_path}/bundle_config"
     File.open(bundle_config_path, "w") {|file| file.print(lines) }
 
+    hosts = ::Capistrano::Configuration.env.filter(hosts)
     rsync_options = config.rsync_options
     Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
       ssh = config.build_ssh_command(host)

data/lib/capistrano/bundle_rsync/config.rb

@@ -60,7 +60,7 @@ module Capistrano::BundleRsync
     # NOTE: :password is not supported.
     def self.build_ssh_command(host)
       user_opt, key_opt, port_opt = "", "", ""
-      ssh_options = fetch(:bundle_rsync_ssh_options) || fetch(:ssh_options)
+      ssh_options = fetch(:bundle_rsync_ssh_options) || fetch(:ssh_options) || {}
       if user = host.user || ssh_options[:user]
         user_opt = " -l #{user}"
       end
@@ -81,7 +81,7 @@ module Capistrano::BundleRsync
     # Fetch the :bundle_rsync_max_parallels,
     # where the default is the number of hosts
     def self.max_parallels(hosts)
-      fetch(:bundle_rsync_max_parallels) || hosts.size
+      fetch(:bundle_rsync_max_parallels, hosts.size).to_i
     end
 
     def self.rsync_options

data/lib/capistrano/bundle_rsync/git.rb

@@ -1,4 +1,5 @@
 require 'capistrano/bundle_rsync/scm'
+require 'capistrano/configuration/filter'
 
 class Capistrano::BundleRsync::Git < Capistrano::BundleRsync::SCM
   def check
@@ -35,7 +36,7 @@ class Capistrano::BundleRsync::Git < Capistrano::BundleRsync::SCM
   end
 
   def rsync_release
-    hosts = release_roles(:all)
+    hosts = ::Capistrano::Configuration.env.filter(release_roles(:all))
     rsync_options = config.rsync_options
     Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
       ssh = config.build_ssh_command(host)

data/lib/capistrano/bundle_rsync/local_git.rb

@@ -1,4 +1,5 @@
 require 'capistrano/bundle_rsync/scm'
+require 'capistrano/configuration/filter'
 
 class Capistrano::BundleRsync::LocalGit < Capistrano::BundleRsync::SCM
   def check
@@ -17,7 +18,7 @@ class Capistrano::BundleRsync::LocalGit < Capistrano::BundleRsync::SCM
   end
 
   def rsync_release
-    hosts = release_roles(:all)
+    hosts = ::Capistrano::Configuration.env.filter(release_roles(:all))
     rsync_options = config.rsync_options
     Parallel.each(hosts, in_threads: config.max_parallels(hosts)) do |host|
       ssh = config.build_ssh_command(host)

data/lib/capistrano/bundle_rsync/scm.rb

@@ -1,4 +1,5 @@
 require 'capistrano/bundle_rsync/base'
+require 'capistrano/configuration/filter'
 
 # Base class for SCM strategy providers.
 #
@@ -88,7 +89,7 @@ class Capistrano::BundleRsync::SCM < Capistrano::BundleRsync::Base
   #
   # @return void
   def rsync_shared
-    hosts = release_roles(:all)
+    hosts = ::Capistrano::Configuration.env.filter(release_roles(:all))
     rsync_options = config.rsync_options
 
     if config_files = config.config_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundle_rsync
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - sonots
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano