supply_drop 0.9.0 → 0.10.0

data/README.md

@@ -35,6 +35,10 @@ Applies the pending changes to all the servers.
 
 Locally syntax checks all the puppet files and erb templates. Requires you to have puppet installed locally.
 
+    cap puppet:remove_lock
+
+Remove any stale lock files created by supply_drop when locking is used and something went wrong.
+
 
 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.
 
@@ -77,6 +81,10 @@ determines whether the rsync commands for multiple servers are run in parallel t
 when true, will syntax check your puppet files and erb templates before rsyncing them to your servers. This is an
 experimental feature and is quite slow at the moment.
 
+    set :puppet_stream_output, false
+
+will write the incremental output from the hosts to the screen instead of waiting until complete and printing by host.
+
     set :puppet_write_to_file, nil
 
 a file to additionally write puppet output to, useful for large noops with small scrollbacks.
@@ -85,6 +93,10 @@ a file to additionally write puppet output to, useful for large noops with small
 
 allows you to specify the user to execute the puppet command as. Like running sudo -u puppet args from the command line.
 
+    set :puppet_lock_file, '/tmp/puppet.lock'
+
+sets a lockfile on each remote host to prevent multiple users from puppeting the same node simultaneously. Set to nil to disable locking. You can alternately temporarily disable locking by setting the NO_PUPPET_LOCKING environment variable to any value.
+
 ### Handling Legacy Puppet
 
 Puppet deprecated the implicit invocation of apply [in the 2.6.x series](https://github.com/puppetlabs/puppet/commit/a23cfd869f90ae4456dded6e5a1c82719b128f01).
@@ -105,4 +117,5 @@ If you write anything complicated, write a test for it. Test that your changes w
 * Paul Gross [pgr0ss](https://github.com/pgr0ss "github")
 * Drew Olson [drewolson](https://github.com/drewolson "github")
 * Dave Pirotte [dpirotte](https://github.com/dpirotte "github")
+* Mike Pilat [mikepilat](https://github.com/mikepilat "github")
 * Dan Manges [dan-manges](https://github.com/dan-manges "github") (one soda's worth)

data/lib/supply_drop.rb

@@ -20,6 +20,7 @@ Capistrano::Configuration.instance.load do
     set :puppet_syntax_check, false
     set :puppet_write_to_file, nil
     set :puppet_runner, nil
+    set :puppet_lock_file, '/tmp/puppet.lock'
 
     namespace :bootstrap do
       desc "installs puppet via rubygems on an osx host"
@@ -72,6 +73,7 @@ Capistrano::Configuration.instance.load do
           SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
           :excludes => puppet_excludes,
+          :world_writable => true,
           :ssh => { :keys => ssh_options[:keys], :config => ssh_options[:config], :port => fetch(:port, nil) }
         )
         logger.debug rsync_cmd
@@ -85,17 +87,71 @@ Capistrano::Configuration.instance.load do
       syntax_check if puppet_syntax_check
     end
 
+    before 'puppet:noop' do
+      _lock if _should_lock?
+    end
+
+    before 'puppet:apply' do
+      _lock if _should_lock?
+    end
+
     desc "runs puppet with --noop flag to show changes"
     task :noop, :except => { :nopuppet => true } do
-      update_code
-      _puppet :noop
+      transaction do
+        on_rollback { _unlock }
+        update_code
+        _puppet :noop
+      end
     end
 
     desc "applies the current puppet config to the server"
     task :apply, :except => { :nopuppet => true } do
-      update_code
-      _puppet :apply
+      transaction do
+        on_rollback { _unlock }
+        update_code
+        _puppet :apply
+      end
     end
+
+    desc "clears the puppet lockfile on the server."
+    task :remove_lock, :except => { :nopuppet => true} do
+      _unlock
+    end
+
+    after 'puppet:noop' do
+      _unlock
+    end
+
+    after 'puppet:apply' do
+      _unlock
+    end
+  end
+
+  def _red_text(text)
+    "\033[0;31m#{text}\033[0m"
+  end
+
+  def _lock
+    if puppet_lock_file
+      run <<-GETLOCK
+if [ ! -f #{puppet_lock_file} ]; then
+    touch #{puppet_lock_file}
+    mkdir -p #{remote_puppet_destination}
+    chmod o+w #{remote_puppet_destination}
+else
+    stat -c "#{_red_text("Puppet in progress, #{puppet_lock_file} owned by %U since %x")}" #{puppet_lock_file} >&2
+    exit 1
+fi"
+      GETLOCK
+    end
+  end
+
+  def _unlock
+    run "rm -f #{puppet_lock_file}; true" if _should_lock?
+  end
+
+  def _should_lock?
+    puppet_lock_file && !ENV['NO_PUPPET_LOCK']
   end
 
   def _puppet(command = :noop)

data/lib/supply_drop/rsync.rb

@@ -3,6 +3,7 @@ module SupplyDrop
     class << self
       def command(from, to, options={})
         flags = ['-az']
+        flags << '--chmod=o+w' if options[:world_writable]
         flags << '--delete' if options[:delete]
         flags << excludes(options[:excludes]) if options.has_key?(:excludes)
         flags << ssh_options(options[:ssh]) if options.has_key?(:ssh)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 55
+  prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 -05:00
-default_executable: 
+date: 2012-06-26 00:00:00 Z
 dependencies: []
 
 description: See http://github.com/pitluga/supply_drop
@@ -1873,7 +1872,6 @@ files:
 - examples/vendored-puppet/vendor/puppet-2.7.8/test/util/storage.rb
 - examples/vendored-puppet/vendor/puppet-2.7.8/test/util/subclass_loader.rb
 - examples/vendored-puppet/vendor/puppet-2.7.8/test/util/utiltest.rb
-has_rdoc: true
 homepage: http://github.com/pitluga/supply_drop
 licenses: []
 
@@ -1903,7 +1901,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Masterless puppet with capistrano