caterer 0.7.10 → 0.8.0

data/lib/caterer/environment.rb

@@ -34,7 +34,7 @@ module Caterer
       @action_runner ||= Vli::Action::Runner.new(action_registry) do
         {
           :action_runner  => action_runner,
-          :ui             => @ui,
+          :ui             => ui,
           :uuid           => uuid
         }
       end

data/lib/caterer/provisioner/chef_solo.rb

@@ -104,7 +104,11 @@ module Caterer
         with_bootstrap_scripts do |script, count|
 
           server.ui.info "Running #{script}..."
-          server.ssh.sudo "#{target_bootstrap_path}-#{count}", :stream => true
+          res = server.ssh.sudo "#{target_bootstrap_path}-#{count}", :stream => true
+
+          unless res == 0
+            server.ui.error "#{script} failed with exit code: #{res}"
+          end
 
         end
 
@@ -133,7 +137,11 @@ module Caterer
 
         # run
         server.ui.info "Installing chef-solo..."
-        server.ssh.sudo "#{target_install_path}", :stream => true
+        res = server.ssh.sudo "#{target_install_path}", :stream => true
+
+        unless res == 0
+          server.ui.error "install failed with exit code: #{res}"
+        end
       end
 
       def provision(server)
@@ -181,7 +189,10 @@ module Caterer
 
         # run
         server.ui.info "Running chef-solo..."
-        server.ssh.sudo command_string, :stream => true
+        res = server.ssh.sudo command_string, :stream => true
+        unless res == 0
+          server.ui.error "chef-solo failed with exit code: #{res}"
+        end
       end
 
       def cleanup(server)

data/lib/caterer/server.rb

@@ -1,4 +1,5 @@
 require 'etc'
+require 'digest'
 
 module Caterer
   class Server
@@ -51,7 +52,7 @@ module Caterer
         @images.each do |i|
           ui.info "*** Up'ing image: #{i} ***"
           run_action(:up, opts.merge({:image => i}))
-        end        
+        end
       else
         ui.info "*** Up'ing ***"
         run_action(:up, opts.merge({:engine => @engine}))
@@ -179,7 +180,7 @@ module Caterer
         else
           # yuck. Heaven help the poor soul who hath not rsync...
           ui.warn "Rsync unavailable, falling back to scp (slower)..."
-          unique = Digest::MD5.hexdigest(from)
+          unique = ::Digest::MD5.hexdigest(from)
           ssh.sudo "rm -rf #{to}/*", :stream => true
           ssh.sudo "mkdir -p #{to}/#{unique}", :stream => true
           ssh.sudo "chown -R #{username} #{to}/#{unique}", :stream => true

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.7.10"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r