dploy 0.0.6 → 0.0.7

data/lib/dploy/client.rb

@@ -3,20 +3,32 @@ require 'rest_client'
 
 module Dploy
 
-  module Client
+  class Client
   
-    def self.deploy(server, project, environment, version)
-      deploy_data = JSON.parse((RestClient.post "http://#{server}/deploy", { :project => project, :environment => environment, :version => version }.to_json, :content_type => :json, :accept => :json))
-      self.get_deploy_logs(server, deploy_data['id'])
+    def initialize(server, project, environment, version)
+      @server = server
+      @project = project
+      @environment = environment
+      @version = version
+    end
+  
+    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'])
     end
     
-    def self.get_deploy_logs(server, deploy_id)
+    def get_deploy_logs(deploy_id)
+      finished = false
       start_id = "000000000000000000000000"
-      while true
-        logs = JSON.parse(RestClient.get( "http://#{server}/logs/#{deploy_id}/?start_id=#{start_id}", :accept => :json))
+      
+      while not finished
+        logs = JSON.parse(RestClient.get( "http://#{@server}/logs/#{deploy_id}/?start_id=#{start_id}", :accept => :json), :symbolize_keys => true)
         logs.each do |row|
-          puts row
+          puts "#{row[:log_type]} #{row[:message]}"
+          STDOUT.flush
+          finished = true if row[:log_type] = "completion"
         end
+        sleep 1
       end
     end 
     
@@ -24,4 +36,6 @@ module Dploy
 
 end
 
-Dploy::Client.deploy("dploy.internal.stylesaint.com:3000", "community", "test", ENV['VERSION'])
+
+deployer = Dploy::Client.new("dploy.internal.stylesaint.com:3000", "community", "test", ENV['VERSION'])
+deployer.deploy

data/lib/dploy/logger.rb

@@ -9,21 +9,21 @@ module Dploy
     end
 
     def debug(message, metadata = {})
-      metadata.merge({:log_type => 'debug' })
+      metadata = metadata.merge({:log_type => 'debug' })
       log(message, metadata)
     end
 
     def error(message, metadata = {})
-      metadata.merge({:log_type => 'debug' })
+      metadata = metadata.merge({:log_type => 'error' })
       log(message, metadata)
     end
 
     def completion(message, metadata = {})
-      metadata.merge({:log_type => 'debug' })
+      metadata = metadata.merge({:log_type => 'completion' })
       log(message, metadata)
     end
 
-    def get_messages(collection, start_id = "000000000000000000000000")
+    def get_messages(start_id = "000000000000000000000000")
        @log.find(:_id => {"$gt" => BSON::ObjectId(start_id)}).map {|row| row}
     end
     

data/lib/dploy/version.rb

@@ -1,3 +1,3 @@
 module Dploy
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dploy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &12814260 !ruby/object:Gem::Requirement
+  requirement: &16246120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12814260
+  version_requirements: *16246120
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &12813760 !ruby/object:Gem::Requirement
+  requirement: &16245620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12813760
+  version_requirements: *16245620
 description: deploymoent module for chef and aws
 email:
 - james@stylesaint.com