supply_drop 0.13.0 → 0.13.1

data/lib/supply_drop/plugin.rb

@@ -4,13 +4,16 @@ module SupplyDrop
     def rsync
       SupplyDrop::Util.thread_pool_size = puppet_parallel_rsync_pool_size
       servers = SupplyDrop::Util.optionally_async(find_servers_for_task(current_task), puppet_parallel_rsync)
+      overrides = {}
+      overrides[:user] = fetch(:user, ENV['USER'])
+      overrides[:port] = fetch(:port) if exists?(:port)
       failed_servers = servers.map do |server|
         rsync_cmd = SupplyDrop::Rsync.command(
           puppet_source,
           SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
           :excludes => puppet_excludes,
-          :ssh => ssh_options.merge(server.options[:ssh_options]||{})
+          :ssh => ssh_options.merge(server.options[:ssh_options]||{}).merge(overrides)
         )
         logger.debug rsync_cmd
         server.host unless system rsync_cmd

metadata

@@ -1,43 +1,53 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: supply_drop
-version: !ruby/object:Gem::Version
-  version: 0.13.0
+version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 1
+  version: 0.13.1
 platform: ruby
-authors:
+authors: 
 - Tony Pitluga
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.21
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 2
+        - 5
+        - 21
         version: 2.5.21
+  type: :runtime
+  version_requirements: *id001
 description: See http://github.com/pitluga/supply_drop
-email:
+email: 
 - tony.pitluga@gmail.com
 - paul.t.hinze@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - Rakefile
+- lib/supply_drop.rb
 - lib/supply_drop/async_enumerable.rb
 - lib/supply_drop/plugin.rb
 - lib/supply_drop/rsync.rb
@@ -48,29 +58,38 @@ files:
 - lib/supply_drop/writer/batched.rb
 - lib/supply_drop/writer/file.rb
 - lib/supply_drop/writer/streaming.rb
-- lib/supply_drop.rb
 homepage: http://github.com/pitluga/supply_drop
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Masterless puppet with capistrano
 test_files: []
+