dploy 0.0.8 → 0.0.9

data/lib/dploy/client.rb

@@ -14,23 +14,30 @@ module Dploy
   
     def deploy
       deploy_data = JSON.parse((RestClient.post "http://#{@server}/deploy", { :project => @project, :environment => @environment, :version => @version }.to_json, :content_type => :json, :accept => :json))
-      get_deploy_logs(deploy_data['id'])
+      monitor_deploy(deploy_data['id'])
     end
     
-    def get_deploy_logs(deploy_id)
+    def monitor_deploy(deploy_id)
+      failed = false
       finished = false
-      start_id = "000000000000000000000000"
+      last_id = "000000000000000000000000"
       
       while not finished
-        logs = JSON.parse(RestClient.get( "http://#{@server}/logs/#{deploy_id}/?start_id=#{start_id}", :accept => :json), :symbolize_keys => true)
+        logs = JSON.parse(RestClient.get( "http://#{@server}/logs/#{deploy_id}/?start_id=#{last_id}", :accept => :json), :symbolize_names => true)
         logs.each do |row|
-          puts "!!!!!!!!!!!!!!!!!!!SOME LOGS!!!!!!!!!!!!!!!!!!1"
-          puts "#{row[:log_type]} #{row[:message]}"
+          puts "#{row[:log_type]}: #{row[:message]}"
           STDOUT.flush
-          finished = true if row[:log_type] == "completion"
+          last_id = row[:_id]
+          if row[:log_type] == "completion"
+            finished = true 
+            if row[:status] == "failure"
+              failed = true
+            end
+          end    
         end
         sleep 1
       end
+      exit 1 if failed
     end 
     
   end

data/lib/dploy/deployer.rb

@@ -50,14 +50,15 @@ module Dploy
 
           #Run Chef client
           @log.debug("Running Chef Client for #{node_name} (#{instance.dns_name})")
-          ShellCmd.run("ssh  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{DPLOY_CONFIG['ec2_ssh_key_path']} ubuntu@#{instance.dns_name} sudo chef-client", @deploy_data[:id])
+          ShellCmd.run("ssh  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{DPLOY_CONFIG['ec2_ssh_key_path']} ubuntu@#{instance.dns_name} sudo chef-client", @log)
+          
 
           #TODO Test
           
           @log.completion("Completed",{:status => "Success"})
         end
-      rescue Exception
-          @log.error($!)
+      rescue 
+          @log.error("#{$!}")
           @log.completion("Failed",{:status => "failure"})
       end 
     end  

data/lib/dploy/shell_command.rb

@@ -1,28 +1,33 @@
 require 'pty'
 
 module Dploy
-	
-	class ShellCmd
-		
-		def self.run(command, log)
-			PTY.spawn(command) do |output, input, pid|
-				begin 
-					while !PTY.check(pid)
-						if log != nil
-						  line = output.gets
-						  if line.upcase.include? "ERROR"
-							  log.error(line)
-							else
-							  log.debug(line)
-							end
-						end
-					end
-				rescue Errno::EIO
-					puts "end"
-				end
-			end
-		end
-		
-	end
-	
+
+  class ShellCmd
+
+    def self.run(command, log = nil)
+      error_found = false
+      PTY.spawn(command) do |output, input, pid|
+        begin 
+          while result = !PTY.check(pid)
+            if log != nil
+                line = output.gets
+              if line.upcase.include? "ERROR"
+                log.error(line)
+                error_found = true
+              else
+                log.debug(line)
+              end
+            end
+          end
+        rescue Errno::EIO
+          #no more output
+        end
+        puts "*" * 200 if error_found || $?.exitstatus != 0 if $? != nil
+        raise "command: #{command} failed!" if error_found || $?.exitstatus != 0 if $? != nil
+      end
+    end
+  end
 end
+
+
+

data/lib/dploy/version.rb

@@ -1,3 +1,3 @@
 module Dploy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dploy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2011-11-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &25285820 !ruby/object:Gem::Requirement
+  requirement: &18070520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25285820
+  version_requirements: *18070520
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &25282440 !ruby/object:Gem::Requirement
+  requirement: &18068340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25282440
+  version_requirements: *18068340
 description: deploymoent module for chef and aws
 email:
 - james@stylesaint.com