supply_drop 0.8.1 → 0.9.0

data/README.md

@@ -81,6 +81,10 @@ experimental feature and is quite slow at the moment.
 
 a file to additionally write puppet output to, useful for large noops with small scrollbacks.
 
+    set :puppet_runner, nil
+
+allows you to specify the user to execute the puppet command as. Like running sudo -u puppet args from the command line.
+
 ### Handling Legacy Puppet
 
 Puppet deprecated the implicit invocation of apply [in the 2.6.x series](https://github.com/puppetlabs/puppet/commit/a23cfd869f90ae4456dded6e5a1c82719b128f01).

data/lib/supply_drop.rb

@@ -19,6 +19,7 @@ Capistrano::Configuration.instance.load do
     set :puppet_parallel_rsync, true
     set :puppet_syntax_check, false
     set :puppet_write_to_file, nil
+    set :puppet_runner, nil
 
     namespace :bootstrap do
       desc "installs puppet via rubygems on an osx host"
@@ -87,19 +88,18 @@ Capistrano::Configuration.instance.load do
     desc "runs puppet with --noop flag to show changes"
     task :noop, :except => { :nopuppet => true } do
       update_code
-      puppet :noop
+      _puppet :noop
     end
 
     desc "applies the current puppet config to the server"
     task :apply, :except => { :nopuppet => true } do
       update_code
-      puppet :apply
+      _puppet :apply
     end
   end
 
-  def puppet(command = :noop)
-    sudo_cmd = fetch(:use_sudo, true) ? sudo : ''
-    puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
+  def _puppet(command = :noop)
+    puppet_cmd = "cd #{puppet_destination} && #{_sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
     flag = command == :noop ? '--noop' : ''
 
     writer = if puppet_stream_output
@@ -119,4 +119,13 @@ Capistrano::Configuration.instance.load do
       writer.all_output_collected
     end
   end
+
+  def _sudo_cmd
+    if fetch(:use_sudo, true)
+      sudo(:as => puppet_runner)
+    else
+      logger.info "NOTICE: puppet_runner configuration invalid when use_sudo is false, ignoring..." unless puppet_runner.nil?
+      ''
+    end
+  end
 end

metadata

@@ -1,26 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tony Pitluga
+- Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 -05:00
+date: 2012-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
 description: See http://github.com/pitluga/supply_drop
-email: tony.pitluga@gmail.com
+email: 
+- tony.pitluga@gmail.com
+- paul.t.hinze@gmail.com
 executables: []
 
 extensions: []