supply_drop 0.7.0 → 0.8.0

data/README.md

@@ -19,6 +19,7 @@ then at the top of your deploy.rb
 
     cap puppet:bootstrap:ubuntu
     cap puppet:bootstrap:osx
+    cap puppet:bootstrap:redhat
 
 This does a simple apt-get install of puppet on the target servers.
 
@@ -30,6 +31,11 @@ This will show you a list of the pending changes to be applied server-by-server.
 
 Applies the pending changes to all the servers.
 
+    cap puppet:syntax_check
+
+Locally syntax checks all the puppet files and erb templates. Requires you to have puppet installed locally.
+
+
 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
@@ -66,6 +72,13 @@ these are patterns that are passed as rsync --exclude flags when pushing your pu
 
 determines whether the rsync commands for multiple servers are run in parallel threads or serially
 
+    set :puppet_syntax_check, true
+
+when true, will syntax check your puppet files and erb templates before rsyncing them to your servers.
+
+    set :puppet_write_to_file, nil
+
+a file to additionally write puppet output to, useful for large noops with small scrollbacks.
 
 ### Handling Legacy Puppet
 

data/examples/vagrant/Capfile

@@ -14,6 +14,8 @@ require 'supply_drop'
 set :puppet_destination, "~/supply_drop"
 set :puppet_command, "puppet"
 set :puppet_stream_output, true
+set :puppet_syntax_check, false
+set :puppet_write_to_file, "puppet_output.txt"
 
 server '33.33.33.10', :web, :app
 role :db,  '33.33.33.11', :nopuppet => true

data/examples/vagrant/Vagrantfile

@@ -1,6 +1,6 @@
 Vagrant::Config.run do |config|
   config.vm.box = "lucid32"
-  config.vm.define(:web) { |c| c.vm.network("33.33.33.10") }
-  config.vm.define(:db) { |c| c.vm.network("33.33.33.11") }
+  config.vm.define(:web) { |c| c.vm.network(:hostonly, "33.33.33.10") }
+  config.vm.define(:db)  { |c| c.vm.network(:hostonly, "33.33.33.11") }
 end
 

data/examples/vendored-puppet/Vagrantfile

@@ -1,6 +1,6 @@
 Vagrant::Config.run do |config|
   config.vm.box = "lucid32"
-  config.vm.define(:web) { |c| c.vm.network("33.33.33.10") }
-  config.vm.define(:db) { |c| c.vm.network("33.33.33.11") }
+  config.vm.define(:web) { |c| c.vm.network(:hostonly, "33.33.33.10") }
+  config.vm.define(:db)  { |c| c.vm.network(:hostonly, "33.33.33.11") }
 end
 

data/lib/supply_drop.rb

@@ -1,6 +1,10 @@
 require 'supply_drop/rsync'
 require 'supply_drop/async_enumerable'
+require 'supply_drop/syntax_checker'
 require 'supply_drop/util'
+require 'supply_drop/writer/batched'
+require 'supply_drop/writer/file'
+require 'supply_drop/writer/streaming'
 
 Capistrano::Configuration.instance.load do
   namespace :puppet do
@@ -13,6 +17,8 @@ Capistrano::Configuration.instance.load do
     set :puppet_excludes, %w(.git .svn)
     set :puppet_stream_output, false
     set :puppet_parallel_rsync, true
+    set :puppet_syntax_check, true
+    set :puppet_write_to_file, nil
 
     namespace :bootstrap do
       desc "installs puppet via rubygems on an osx host"
@@ -38,6 +44,24 @@ Capistrano::Configuration.instance.load do
       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)
@@ -56,6 +80,10 @@ Capistrano::Configuration.instance.load do
       raise "rsync failed on #{failed_servers.join(',')}" if failed_servers.any?
     end
 
+    before :'puppet:update_code' do
+      syntax_check if puppet_syntax_check
+    end
+
     desc "runs puppet with --noop flag to show changes"
     task :noop, :except => { :nopuppet => true } do
       update_code
@@ -74,25 +102,21 @@ Capistrano::Configuration.instance.load do
     puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
     flag = command == :noop ? '--noop' : ''
 
-    outputs = {}
+    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|
-        if puppet_stream_output
-          print data
-          $stdout.flush
-        else
-          outputs[channel[:host]] ||= ""
-          outputs[channel[:host]] << data
-        end
+        writer.collect_output(channel[:host], data)
       end
       logger.debug "Puppet #{command} complete."
     ensure
-      unless puppet_stream_output
-        outputs.each_pair do |host, output|
-          logger.info "Puppet output for #{host}"
-          logger.debug output, "#{host}"
-        end
-      end
+      writer.all_output_collected
     end
   end
 end

data/lib/supply_drop/syntax_checker.rb

@@ -0,0 +1,21 @@
+module SupplyDrop
+  class SyntaxChecker
+    def initialize(path)
+      @path = path
+    end
+
+    def validate_puppet_files
+      Dir.glob("#{@path}/**/*.pp").map do |puppet_file|
+        output = `puppet parser validate #{puppet_file}`
+        $?.to_i == 0 ? nil : [puppet_file, output]
+      end.compact
+    end
+
+    def validate_templates
+      Dir.glob("#{@path}/**/*.erb").map do |template_file|
+        output = `erb -x -T '-' #{template_file} | ruby -c 2>&1`
+        $?.to_i == 0 ? nil : [template_file, output]
+      end.compact
+    end
+  end
+end

data/lib/supply_drop/writer/batched.rb

@@ -0,0 +1,22 @@
+module SupplyDrop
+  module Writer
+    class Batched
+      def initialize(logger)
+        @outputs = {}
+        @logger = logger
+      end
+
+      def collect_output(host, data)
+        @outputs[host] ||= ""
+        @outputs[host] << data
+      end
+
+      def all_output_collected
+        @outputs.keys.sort.each do |host|
+          @logger.info "Puppet output for #{host}"
+          @logger.debug @outputs[host], host
+        end
+      end
+    end
+  end
+end

data/lib/supply_drop/writer/file.rb

@@ -0,0 +1,23 @@
+module SupplyDrop
+  module Writer
+    class File
+      def initialize(writer, file)
+        @wrapped_writer = writer
+        @logger = Capistrano::Logger.new(:output => file)
+        @logger.level = Capistrano::Logger::TRACE
+        @file_writer = Batched.new(@logger)
+      end
+
+      def collect_output(host, data)
+        @wrapped_writer.collect_output(host, data)
+        @file_writer.collect_output(host, data)
+      end
+
+      def all_output_collected
+        @wrapped_writer.all_output_collected
+        @file_writer.all_output_collected
+        @logger.close
+      end
+    end
+  end
+end

data/lib/supply_drop/writer/streaming.rb

@@ -0,0 +1,16 @@
+module SupplyDrop
+  module Writer
+    class Streaming
+      def initialize(logger)
+        @logger = logger
+      end
+
+      def collect_output(host, data)
+        @logger.debug data, host
+      end
+
+      def all_output_collected
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supply_drop
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 63
+  prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-13 00:00:00 Z
+date: 2012-03-26 00:00:00 -05:00
+default_executable: 
 dependencies: []
 
 description: See http://github.com/pitluga/supply_drop
@@ -31,10 +32,12 @@ files:
 - Rakefile
 - lib/supply_drop/async_enumerable.rb
 - lib/supply_drop/rsync.rb
+- lib/supply_drop/syntax_checker.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
-- examples/Capfile
-- examples/config/deploy.rb
 - examples/ec2/Capfile
 - examples/ec2/puppet.pp
 - examples/vagrant/Capfile
@@ -1867,6 +1870,7 @@ 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: []
 
@@ -1896,7 +1900,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Masterless puppet with capistrano

data/examples/Capfile

@@ -1,4 +0,0 @@
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-
-load 'config/deploy' # remove this line to skip loading any of the default tasks

data/examples/config/deploy.rb

@@ -1,22 +0,0 @@
-set :application, "set your application name here"
-set :repository,  "set your repository location here"
-
-set :scm, :subversion
-# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
-
-role :web, "your web-server here"                          # Your HTTP server, Apache/etc
-role :app, "your app-server here"                          # This may be the same as your `Web` server
-role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
-role :db,  "your slave db-server here"
-
-# if you're still using the script/reaper helper you will need
-# these http://github.com/rails/irs_process_scripts
-
-# If you are using Passenger mod_rails uncomment this:
-# namespace :deploy do
-#   task :start do ; end
-#   task :stop do ; end
-#   task :restart, :roles => :app, :except => { :no_release => true } do
-#     run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
-#   end
-# end