supply_drop 0.4.0 → 0.5.0

data/README.md

@@ -46,7 +46,7 @@ defines the base directory containing your puppet configs that will be rsynced t
 
 defines where on the server the puppet configuration files are synced to.
 
-    set :puppet_command, 'puppet'
+    set :puppet_command, 'puppet apply'
 
 allows you to override the puppet command that is run if puppet is not on the path.
 
@@ -62,11 +62,28 @@ the parameters that are passed to the puppet call.
 
 these are patterns that are passed as rsync --exclude flags when pushing your puppet configs to the box.
 
+    set :puppet_parallel_rsync, true
+
+determines whether the rsync commands for multiple servers are run in parallel threads or serially
+
+
+### Handling Legacy Puppet
+
+Puppet deprecated the implicit invocation of apply [in the 2.6.x series](https://github.com/puppetlabs/puppet/commit/a23cfd869f90ae4456dded6e5a1c82719b128f01).
+
+The default behavior of supply_drop includes `apply` keyword in its commands, but if you need compatibility with older versions of puppet, set the `puppet_command` variable to omit it.
+
+You'll need to do this if you see errors like this:
+
+    Could not parse for environment production: Could not find file /home/.../supply_drop/apply.pp
+
 ### How to contribute
 
 If you write anything complicated, write a test for it. Test that your changes work using vagrant. Send a pull request. Easy peezy.
 
 ### Contributors
 
+* Paul Hinze [phinze](https://github.com/phinze "github")
 * Paul Gross [pgr0ss](https://github.com/pgr0ss "github")
 * Drew Olson [drewolson](https://github.com/drewolson "github")
+* Dave Pirotte [dpirotte](https://github.com/dpirotte "github")

data/lib/supply_drop.rb

@@ -1,15 +1,18 @@
 require 'supply_drop/rsync'
+require 'supply_drop/async_enumerable'
+require 'supply_drop/util'
 
 Capistrano::Configuration.instance.load do
   namespace :puppet do
     set :puppet_source, '.'
     set :puppet_destination, '/tmp/supply_drop'
-    set :puppet_command, 'puppet'
+    set :puppet_command, 'puppet apply'
     set :puppet_lib, "#{puppet_destination}/modules"
     set :puppet_parameters, lambda { puppet_verbose ? '--debug --trace puppet.pp' : 'puppet.pp' }
     set :puppet_verbose, false
     set :puppet_excludes, %w(.git .svn)
     set :puppet_stream_output, false
+    set :puppet_parallel_rsync, true
 
     namespace :bootstrap do
       desc "installs puppet via rubygems on an osx host"
@@ -31,10 +34,11 @@ Capistrano::Configuration.instance.load do
 
     desc "pushes the current puppet configuration to the server"
     task :update_code, :except => { :nopuppet => true } do
-      find_servers_for_task(current_task).each do |server|
-        rsync_cmd = Rsync.command(
+      servers = SupplyDrop::Util.optionally_async(find_servers_for_task(current_task), puppet_parallel_rsync)
+      servers.each do |server|
+        rsync_cmd = SupplyDrop::Rsync.command(
           puppet_source,
-          Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
+          SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
           :excludes => puppet_excludes,
           :ssh => { :keys => ssh_options[:keys], :config => ssh_options[:config] }

data/lib/supply_drop/async_enumerable.rb

@@ -0,0 +1,9 @@
+module SupplyDrop
+  module AsyncEnumerable
+    def each(&block)
+      self.map do |item|
+        Thread.new { block.call(item) }
+      end.each(&:join)
+    end
+  end
+end

data/lib/supply_drop/rsync.rb

@@ -1,34 +1,36 @@
-class Rsync
-  class << self
-    def command(from, to, options={})
-      flags = ['-az']
-      flags << '--delete' if options[:delete]
-      flags << excludes(options[:excludes]) if options.has_key?(:excludes)
-      flags << ssh_options(options[:ssh]) if options.has_key?(:ssh)
+module SupplyDrop
+  class Rsync
+    class << self
+      def command(from, to, options={})
+        flags = ['-az']
+        flags << '--delete' if options[:delete]
+        flags << excludes(options[:excludes]) if options.has_key?(:excludes)
+        flags << ssh_options(options[:ssh]) if options.has_key?(:ssh)
 
-      "rsync #{flags.compact.join(' ')} #{from} #{to}"
-    end
+        "rsync #{flags.compact.join(' ')} #{from} #{to}"
+      end
 
-    def remote_address(user, host, path)
-      user_with_host = [user, host].compact.join('@')
-      [user_with_host, path].join(':')
-    end
+      def remote_address(user, host, path)
+        user_with_host = [user, host].compact.join('@')
+        [user_with_host, path].join(':')
+      end
 
-    def excludes(patterns)
-      [patterns].flatten.map { |p| "--exclude=#{p}" }
-    end
+      def excludes(patterns)
+        [patterns].flatten.map { |p| "--exclude=#{p}" }
+      end
 
-    def ssh_options(options)
-      mapped_options = options.map do |key, value|
-        next unless value
+      def ssh_options(options)
+        mapped_options = options.map do |key, value|
+          next unless value
 
-        case key
-        when :keys then [value].flatten.select { |k| File.exist?(k) }.map { |k| "-i #{k}" }
-        when :config then "-F #{value}"
-        end
-      end.compact
+          case key
+          when :keys then [value].flatten.select { |k| File.exist?(k) }.map { |k| "-i #{k}" }
+          when :config then "-F #{value}"
+          end
+        end.compact
 
-      %[-e "ssh #{mapped_options.join(' ')}"] unless mapped_options.empty?
+        %[-e "ssh #{mapped_options.join(' ')}"] unless mapped_options.empty?
+      end
     end
   end
 end

data/lib/supply_drop/util.rb

@@ -0,0 +1,11 @@
+module SupplyDrop
+  module Util
+    def self.optionally_async(collection, async)
+      if async
+        collection.extend SupplyDrop::AsyncEnumerable
+      else
+        collection
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -05:00
-default_executable: 
+date: 2011-12-05 00:00:00 Z
 dependencies: []
 
 description: See http://github.com/pitluga/supply_drop
@@ -30,14 +29,15 @@ extra_rdoc_files: []
 files: 
 - README.md
 - Rakefile
+- lib/supply_drop/async_enumerable.rb
 - lib/supply_drop/rsync.rb
+- lib/supply_drop/util.rb
 - lib/supply_drop.rb
 - examples/ec2/Capfile
 - examples/ec2/puppet.pp
 - examples/vagrant/Capfile
 - examples/vagrant/puppet.pp
 - examples/vagrant/Vagrantfile
-has_rdoc: true
 homepage: http://github.com/pitluga/supply_drop
 licenses: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Serverless puppet with capistrano