dploy 0.0.2 → 0.0.4

data/lib/dploy/deployer.rb

@@ -5,64 +5,56 @@ require 'dploy/logger'
 require 'dploy/shell_command'
 
 module Dploy
-
   class Deployer
-	   
-	  attr_accessor :deploy_data
-    
+  
     def initialize(deploy_data)
-		    	
-    	@deploy_data = deploy_data
-
+      @deploy_data = deploy_data
       @ec2 = EC2Client.new(
-        DPLOY_CONFIG['ec2_access_key_id'],
-        DPLOY_CONFIG['ec2_access_key'],
-        DPLOY_CONFIG['ec2_endpoint'])
-        
+      DPLOY_CONFIG['ec2_access_key_id'],
+      DPLOY_CONFIG['ec2_access_key'],
+      DPLOY_CONFIG['ec2_endpoint'])
       @chef = ChefClient.new(
-        DPLOY_CONFIG['chef_api_url'],
-        DPLOY_CONFIG['chef_api_user'],
-        DPLOY_CONFIG['chef_api_key'])
-        
-      
+      DPLOY_CONFIG['chef_api_url'],
+      DPLOY_CONFIG['chef_api_user'],
+      DPLOY_CONFIG['chef_api_key'])
+
       #TODO validate deploy data
-			      
+
       @deploy_data[:id] = "#{@deploy_data[:project]}-#{@deploy_data[:environment]}-#{@deploy_data[:version].gsub('.','-')}-#{Time.now.to_i}"
-			@log = Dploy::Logger.new(DPLOY_CONFIG['mongo_server'], @deploy_data[:id])
+      @log = Dploy::Logger.new(DPLOY_CONFIG['mongo_server'], @deploy_data[:id])
     end
-  
+
     def deploy()
       begin
         #Get Instances
         search_tags = { 'project' => @deploy_data[:project], 'environment' => @deploy_data[:environment] }
-			  @log.debug("Searching For EC2 Instances")
-			  @log.debug("Search tags: #{search_tags}")
+        @log.debug("Searching For EC2 Instances")
+        @log.debug("Search tags: #{search_tags}")
         instances = @ec2.get_instances_by_tags(search_tags)
         @log.debug("#{instances.count} matching instances found")
-        
+
         instances.each do |instance|
-          
+
           @log.debug("Starting deploy for instance: #{instance.id}")
           #TODO Remove from LB
-          
+
           #update chef node
           node_name = "#{@deploy_data[:environment]}-#{@deploy_data[:project]}-#{instance.id}"
           @log.debug("Updating chef node: #{node_name}")
           attributes = { :dploy => { :target_version => @deploy_data[:version], :status => 'deploying' } }
           @chef.update_node_attributes(node_name, attributes)
-          
+
           #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])
-          
+
           #TODO Test
+          
+        end
       rescue Exception
-       @log.error($!) 
-      end
-      
-    end
-  
+          @log.error($!)
+      end 
+    end  
   end
-  
 end
 

data/lib/dploy/logger.rb

@@ -3,35 +3,34 @@ require 'mongo'
 module Dploy
 
   class Logger
-  
-    def	initialize(mongo_host, deploy_id)
-	    @log = Mongo::Connection.new(mongo_host).db('log')[deploy_id]
+
+    def initialize(mongo_host, deploy_id)
+      @log = Mongo::Connection.new(mongo_host).db('log')[deploy_id]
     end
-    
     private :log
-    def log(message, meta_data )
+    def log(message, meta_data = {} )
       @log.insert({:meta_data => meta_data, :message => message})
     end
-    
+
     def debug(message, meta_data = {})
       meta_data.merge({:log_type => 'debug' })
       log(message, metadata)
     end
-    
+
     def error(message, meta_data = {})
       meta_data.merge({:log_type => 'debug' })
       log(message, metadata)
     end
-    
+
     def completion(message, meta_data = {})
       meta_data.merge({:log_type => 'debug' })
       log(message, metadata)
     end
 
     def get_messages(collection, start_id = "000000000000000000000000")
-      @@db[collection].find(:_id => {"$gt" => BSON::ObjectId(start_id)}).map {|row| row}
+       @log.find(:_id => {"$gt" => BSON::ObjectId(start_id)}).map {|row| row}
     end 
-  
+
   end 
 
 end

data/lib/dploy/version.rb

@@ -1,3 +1,3 @@
 module Dploy
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   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: &24476420 !ruby/object:Gem::Requirement
+  requirement: &9448920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24476420
+  version_requirements: *9448920
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &24475920 !ruby/object:Gem::Requirement
+  requirement: &9448500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24475920
+  version_requirements: *9448500
 description: deploymoent module for chef and aws
 email:
 - james@stylesaint.com
@@ -54,6 +54,7 @@ files:
 - lib/dploy/logger.rb
 - lib/dploy/shell_command.rb
 - lib/dploy/version.rb
+- ubuntu@dploy.internal.stylesaint.com
 homepage: ''
 licenses: []
 post_install_message: