supply_drop 0.3.0 → 0.4.0

data/README.md

@@ -17,7 +17,8 @@ then at the top of your deploy.rb
 
 ### Tasks
 
-    cap puppet:bootstrap
+    cap puppet:bootstrap:ubuntu
+    cap puppet:bootstrap:osx
 
 This does a simple apt-get install of puppet on the target servers.
 
@@ -29,7 +30,7 @@ This will show you a list of the pending changes to be applied server-by-server.
 
 Applies the pending changes to all the servers.
 
-You can specify that one of your servers should be puppet by setting the :nopuppet flag to true, like so. It will then be skipped by all the above commands.
+You can specify that one of your servers should not be puppeted by setting the :nopuppet flag to true, like so. It will then be skipped by all the above commands.
 
     role :weird_thing, '33.33.33.33', :nopuppet => true
 
@@ -51,12 +52,16 @@ allows you to override the puppet command that is run if puppet is not on the pa
 
     set :puppet_lib, "#{puppet_destination}/modules"
 
-the value of the PUPPETLIB environment variable, the location of your puppet modules
+the value of the PUPPETLIB environment variable, the location of your puppet modules.
 
     set :puppet_parameters, 'puppet.pp'
 
 the parameters that are passed to the puppet call.
 
+    set :puppet_excludes, %w(.git .svn)
+
+these are patterns that are passed as rsync --exclude flags when pushing your puppet configs to the box.
+
 ### 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.

data/lib/supply_drop.rb

@@ -6,13 +6,27 @@ Capistrano::Configuration.instance.load do
     set :puppet_destination, '/tmp/supply_drop'
     set :puppet_command, 'puppet'
     set :puppet_lib, "#{puppet_destination}/modules"
-    set :puppet_parameters, 'puppet.pp'
+    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
 
-    desc "installs puppet"
-    task :bootstrap, :except => { :nopuppet => true } do
-      run "mkdir -p #{puppet_destination}"
-      run "#{sudo} apt-get update"
-      run "#{sudo} apt-get install -y puppet rsync"
+    namespace :bootstrap do
+      desc "installs puppet via rubygems on an osx host"
+      task :osx do
+        if fetch(:use_sudo, true)
+          run "#{sudo} gem install puppet --no-ri --no-rdoc"
+        else
+          run "gem install puppet --no-ri --no-rdoc"
+        end
+      end
+
+      desc "installs puppet via apt on an ubuntu host"
+      task :ubuntu do
+        run "mkdir -p #{puppet_destination}"
+        run "#{sudo} apt-get update"
+        run "#{sudo} apt-get install -y puppet rsync"
+      end
     end
 
     desc "pushes the current puppet configuration to the server"
@@ -20,10 +34,10 @@ Capistrano::Configuration.instance.load do
       find_servers_for_task(current_task).each do |server|
         rsync_cmd = Rsync.command(
           puppet_source,
-          "#{server.user || user}@#{server.host}:#{puppet_destination}/",
+          Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
-          :excludes => ['.git'],
-          :ssh => { :keys => ssh_options[:keys] }
+          :excludes => puppet_excludes,
+          :ssh => { :keys => ssh_options[:keys], :config => ssh_options[:config] }
         )
         logger.debug rsync_cmd
         system rsync_cmd
@@ -44,20 +58,28 @@ Capistrano::Configuration.instance.load do
   end
 
   def puppet(command = :noop)
-    puppet_cmd = "cd #{puppet_destination} && #{sudo} PUPPETLIB=#{puppet_lib} #{puppet_command} #{puppet_parameters}"
+    sudo_cmd = fetch(:use_sudo, true) ? sudo : ''
+    puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
     flag = command == :noop ? '--noop' : ''
 
     outputs = {}
     begin
       run "#{puppet_cmd} #{flag}" do |channel, stream, data|
-        outputs[channel[:host]] ||= ""
-        outputs[channel[:host]] << data
+        if puppet_stream_output
+          print data
+          $stdout.flush
+        else
+          outputs[channel[:host]] ||= ""
+          outputs[channel[:host]] << data
+        end
       end
       logger.debug "Puppet #{command} complete."
     ensure
-      outputs.each_pair do |host, output|
-        logger.info "Puppet output for #{host}"
-        logger.debug output, "#{host}"
+      unless puppet_stream_output
+        outputs.each_pair do |host, output|
+          logger.info "Puppet output for #{host}"
+          logger.debug output, "#{host}"
+        end
       end
     end
   end

data/lib/supply_drop/rsync.rb

@@ -9,18 +9,26 @@ class Rsync
       "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 excludes(patterns)
       [patterns].flatten.map { |p| "--exclude=#{p}" }
     end
 
     def ssh_options(options)
       mapped_options = options.map do |key, value|
-        if key == :keys && value != nil
-          [value].flatten.select { |k| File.exist?(k) }.map { |k| "-i #{k}" }
+        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
+      end.compact
 
-      %[-e "ssh #{mapped_options.join(' ')}"]
+      %[-e "ssh #{mapped_options.join(' ')}"] unless mapped_options.empty?
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -05:00
+date: 2011-07-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Serverless puppet with capistrano