supply_drop 0.11.1 → 0.12.0

data/lib/supply_drop.rb

@@ -1,198 +1,12 @@
 require 'supply_drop/rsync'
 require 'supply_drop/async_enumerable'
+require 'supply_drop/plugin'
 require 'supply_drop/syntax_checker'
 require 'supply_drop/thread_pool'
 require 'supply_drop/util'
 require 'supply_drop/writer/batched'
 require 'supply_drop/writer/file'
 require 'supply_drop/writer/streaming'
+require 'supply_drop/tasks'
 
-Capistrano::Configuration.instance.load do
-  namespace :puppet do
-    set :puppet_source, '.'
-    set :puppet_destination, '/tmp/supply_drop'
-    set :puppet_command, 'puppet apply'
-    set :puppet_lib, lambda { "#{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
-    set :puppet_parallel_rsync_pool_size, 10
-    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"
-      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
-
-      desc "installs puppet via yum on a centos/red hat host"
-      task :redhat do
-        run "mkdir -p #{puppet_destination}"
-        run "#{sudo} yum -y install puppet rsync"
-      end
-    end
-
-    desc "checks the syntax of all *.pp and *.erb files"
-    task :syntax_check do
-      checker = SupplyDrop::SyntaxChecker.new(puppet_source)
-      logger.info "Sytax Checking..."
-      errors = false
-      checker.validate_puppet_files.each do |file, error|
-        logger.important "Puppet error: #{file}"
-        logger.important error
-        errors = true
-      end
-      checker.validate_templates.each do |file, error|
-        logger.important "Template error: #{file}"
-        logger.important error
-        errors = true
-      end
-      raise "syntax errors" if errors
-    end
-
-    desc "pushes the current puppet configuration to the server"
-    task :update_code, :except => { :nopuppet => true } do
-      servers = SupplyDrop::Util.optionally_async(find_servers_for_task(current_task), puppet_parallel_rsync)
-      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 => { :keys => ssh_options[:keys], :config => ssh_options[:config], :port => fetch(:port, nil) }
-        )
-        logger.debug rsync_cmd
-        server.host unless system rsync_cmd
-      end.compact
-
-      raise "rsync failed on #{failed_servers.join(',')}" if failed_servers.any?
-    end
-
-    before :'puppet:update_code' do
-      _set_threadpool_size
-      syntax_check if puppet_syntax_check
-    end
-
-    before 'puppet:noop' do
-      _prep_destination
-      _lock
-    end
-
-    before 'puppet:apply' do
-      _prep_destination
-      _lock
-    end
-
-    desc "runs puppet with --noop flag to show changes"
-    task :noop, :except => { :nopuppet => true } do
-      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
-      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 _set_threadpool_size
-    SupplyDrop::Util.thread_pool_size = puppet_parallel_rsync_pool_size
-  end
-
-  def _red_text(text)
-    "\033[0;31m#{text}\033[0m"
-  end
-
-  def _prep_destination
-    run "mkdir -p #{puppet_destination}"
-    run "#{sudo} chown -R $USER: #{puppet_destination}"
-  end
-
-  def _lock
-    if _should_lock?
-      run <<-GETLOCK
-if [ ! -f #{puppet_lock_file} ]; then
-    touch #{puppet_lock_file};
-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 "#{sudo} 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)
-    puppet_cmd = "cd #{puppet_destination} && #{_sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
-    flag = command == :noop ? '--noop' : ''
-
-    writer = if puppet_stream_output
-               SupplyDrop::Writer::Streaming.new(logger)
-             else
-               SupplyDrop::Writer::Batched.new(logger)
-             end
-
-    writer = SupplyDrop::Writer::File.new(writer, puppet_write_to_file) unless puppet_write_to_file.nil?
-
-    begin
-      run "#{puppet_cmd} #{flag}" do |channel, stream, data|
-        writer.collect_output(channel[:host], data)
-      end
-      logger.debug "Puppet #{command} complete."
-    ensure
-      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
+Capistrano.plugin :supply_drop, SupplyDrop::Plugin

data/lib/supply_drop/plugin.rb

@@ -0,0 +1,93 @@
+module SupplyDrop
+  module Plugin
+
+    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)
+      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 => { :keys => ssh_options[:keys], :config => ssh_options[:config], :port => fetch(:port, nil) }
+        )
+        logger.debug rsync_cmd
+        server.host unless system rsync_cmd
+      end.compact
+
+      raise "rsync failed on #{failed_servers.join(',')}" if failed_servers.any?
+    end
+
+    def prepare
+      run "mkdir -p #{puppet_destination}"
+      run "#{sudo} chown -R $USER: #{puppet_destination}"
+    end
+
+    def noop
+      puppet(:noop)
+    end
+
+    def apply
+      puppet(:apply)
+    end
+
+    def lock
+      if should_lock?
+        run <<-GETLOCK
+if [ ! -f #{puppet_lock_file} ]; then
+    touch #{puppet_lock_file};
+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 "#{sudo} rm -f #{puppet_lock_file}; true" if should_lock?
+    end
+
+    private
+
+    def should_lock?
+      puppet_lock_file && !ENV['NO_PUPPET_LOCK']
+    end
+
+    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
+                 SupplyDrop::Writer::Streaming.new(logger)
+               else
+                 SupplyDrop::Writer::Batched.new(logger)
+               end
+
+      writer = SupplyDrop::Writer::File.new(writer, puppet_write_to_file) unless puppet_write_to_file.nil?
+
+      begin
+        run "#{puppet_cmd} #{flag}" do |channel, stream, data|
+          writer.collect_output(channel[:host], data)
+        end
+        logger.debug "Puppet #{command} complete."
+      ensure
+        writer.all_output_collected
+      end
+    end
+
+    def red_text(text)
+      "\033[0;31m#{text}\033[0m"
+    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
+end

data/lib/supply_drop/tasks.rb

@@ -0,0 +1,96 @@
+Capistrano::Configuration.instance.load do
+  namespace :puppet do
+    set :puppet_source, '.'
+    set :puppet_destination, '/tmp/supply_drop'
+    set :puppet_command, 'puppet apply'
+    set :puppet_lib, lambda { "#{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
+    set :puppet_parallel_rsync_pool_size, 10
+    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"
+      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
+
+      desc "installs puppet via yum on a centos/red hat host"
+      task :redhat do
+        run "mkdir -p #{puppet_destination}"
+        run "#{sudo} yum -y install puppet rsync"
+      end
+    end
+
+    desc "checks the syntax of all *.pp and *.erb files"
+    task :syntax_check do
+      checker = SupplyDrop::SyntaxChecker.new(puppet_source)
+      logger.info "Sytax Checking..."
+      errors = false
+      checker.validate_puppet_files.each do |file, error|
+        logger.important "Puppet error: #{file}"
+        logger.important error
+        errors = true
+      end
+      checker.validate_templates.each do |file, error|
+        logger.important "Template error: #{file}"
+        logger.important error
+        errors = true
+      end
+      raise "syntax errors" if errors
+    end
+
+    desc "pushes the current puppet configuration to the server"
+    task :update_code, :except => { :nopuppet => true } do
+      syntax_check if puppet_syntax_check
+      supply_drop.rsync
+    end
+
+    desc "runs puppet with --noop flag to show changes"
+    task :noop, :except => { :nopuppet => true } do
+      transaction do
+        on_rollback { supply_drop.unlock }
+        supply_drop.prepare
+        supply_drop.lock
+        update_code
+        supply_drop.noop
+        supply_drop.unlock
+      end
+    end
+
+    desc "applies the current puppet config to the server"
+    task :apply, :except => { :nopuppet => true } do
+      transaction do
+        on_rollback { supply_drop.unlock }
+        supply_drop.prepare
+        supply_drop.lock
+        update_code
+        supply_drop.apply
+        supply_drop.unlock
+      end
+    end
+
+    desc "clears the puppet lockfile on the server."
+    task :remove_lock, :except => { :nopuppet => true} do
+      supply_drop.lock
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: 
+  hash: 47
+  prerelease: false
   segments: 
   - 0
-  - 11
-  - 1
-  version: 0.11.1
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-10-16 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -48,14 +49,17 @@ files:
 - README.md
 - Rakefile
 - lib/supply_drop/async_enumerable.rb
+- lib/supply_drop/plugin.rb
 - lib/supply_drop/rsync.rb
 - lib/supply_drop/syntax_checker.rb
+- lib/supply_drop/tasks.rb
 - lib/supply_drop/thread_pool.rb
 - lib/supply_drop/util.rb
 - lib/supply_drop/writer/batched.rb
 - lib/supply_drop/writer/file.rb
 - lib/supply_drop/writer/streaming.rb
 - lib/supply_drop.rb
+has_rdoc: true
 homepage: http://github.com/pitluga/supply_drop
 licenses: []
 
@@ -85,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Masterless puppet with capistrano