veronic 0.0.13 → 0.0.14

data/README.md

@@ -1,7 +1,7 @@
 Veronic
 =======
 
-Veronic, deux qui la tiennent trois qui la niquent is a simple cloud deployer
+Veronic, a simple cloud deployer
 
 1) Create veronic directory:
 
@@ -23,4 +23,4 @@ Usage
 ````
 $ gem install veronic
 $ veronic --help
-````
+````

data/lib/providers/chefserver/instance.rb

@@ -66,12 +66,13 @@ module Provider
 				begin
 					node.run
 				rescue
+					puts "Creation of #{@name} failed"
 					self.destroy([node.server.id])
 					self.bootstrap(recursive_count+=1) if recursive_count < 3
 				end
 			end
 
-			def destroy(instance_ids = [])
+			def destroy(instance_ids=[])
 				puts "Deleting ec2 server #{@name} ..."
 
 				node = Chef::Knife::Ec2ServerDelete.new()

data/lib/providers/ec2/image.rb

@@ -32,29 +32,29 @@ module Provider
 
 			def image
 				puts "Getting image #{@ami_name}..."
-				@image = get_image
-				unless @image
-					sleep 5
-					@image = get_image
-				end
-				if @image
-					while @image.exists? == false && @image.state != :failed
+				@image ||= get_image
+			end
+
+			def get_image
+				images = @ec2.images
+				my_image = images.with_owner(@owner_id).select {|x| x.name == @ami_name}.first
+				unless my_image
+					my_image = images[@name]
+					unless my_image.exists?
+						return false
+					end
+				else
+					while my_image.exists? == false && my_image.state != :failed
 						print "."
 						sleep 1
 					end
-					while @image.state == :pending && @image.state != :failed
+					while my_image.state == :pending && my_image.state != :failed
 						print "."
 						sleep 1
 					end
 					puts ""
-					return @image
-				else
-					return false
 				end
-			end
-
-			def get_image
-				@ec2.images.with_owner(@owner_id).select {|x| x.name == @ami_name}.first
+				return my_image
 			end
 
 		end

data/lib/veronic.rb

@@ -88,16 +88,13 @@ module Veronic
 		end
 
 		def deploy
-			if cloudprovider.instance.exist?
-				if @environment == 'branch'
-					query = cloudprovider.instance.dns_name
-					manual = true
-				else
-					query = "role:#{@role}"
-					manual = false
-				end
-				configprovider.ssh(query, @deploy_cmd, manual)
-			end
+			unless @config.deploy_cmd
+				abort('Arguments --deploy_cmd is missing')
+			end 
+			bootstrap
+			query = cloudprovider.instance.dns_name
+			manual = true
+			configprovider.ssh(query, @config.deploy_cmd, manual)
 		end
 
 		def update_instance_dns
@@ -129,7 +126,7 @@ module Veronic
 			if @config.name
 				return cloudprovider.instance.status
 			else
-				return "Arguments name missing"
+				return "Arguments --name is missing"
 			end
 		end
 
@@ -154,7 +151,7 @@ module Veronic
 
 		def create_image
 			unless @config.environment
-				abort('Arguments "environment" missing') 
+				abort('Arguments --environment is missing') 
 			else
 				configprovider.instance.delete_client_key(cloudprovider.instance.dns_name)
 				configprovider.instance.client.destroy
@@ -168,14 +165,14 @@ module Veronic
 				configprovider.instance.set_environment
 				configprovider.instance.set_role
 			else
-				abort('Arguments "role" or "environment" missing') 
+				abort('Arguments --role or --environment is missing') 
 			end
 		end
 
 		def get_image
 			if @config.image.nil?
 				unless @config.environment
-					abort('Arguments "environment" missing') 
+					abort('Arguments --environment is missing') 
 				else
 					@config.image = cloudprovider.image.id
 				end

data/veronic.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.13'
+  s.version     = '0.0.14'
   s.date        = '2013-04-05'
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.summary     = "Veronic, deux qui la tiennent trois qui la niquent"
+  s.summary     = "Veronic, a simple cloud deployer"
   s.description = "A simple cloud deployer"
   s.authors     = ["Gabriel Klein"]
   s.email       = 'gabriel.klein.fr@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -126,5 +126,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Veronic, deux qui la tiennent trois qui la niquent
+summary: Veronic, a simple cloud deployer
 test_files: []