veronic 0.0.8 → 0.0.9

data/bin/veronic

@@ -25,6 +25,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "     stop: stop box"
   opt.separator  "     start: start box"
   opt.separator  "     list: list boxes"
+  opt.separator  "     status: status boxes"
   opt.separator  ""
   opt.separator  "Options"
 
@@ -116,6 +117,8 @@ when "start"
 	Veronic::Deployer.new(options).start
 when "list"
   Veronic::Deployer.new(options).instances_list
+when "status"
+  puts Veronic::Deployer.new(options).status
 else
 	puts opt_parser
 end

data/lib/config/config.rb

@@ -26,10 +26,10 @@ module Veronic
 			@ssl_version                    	= options[:ssl_version] 												|| config_from_file['ssl_version']
 			@identity_file	                 	= options[:identity_file] 												|| config_from_file['identity_file']
 			@branch                         	= options[:branch] 														|| config_from_file['branch']
-			@environment                    	= options[:environment] 												|| config_from_file['environment'] || 'beta'
+			@environment                    	= options[:environment] 												|| config_from_file['environment']
 			@ssh_user                       	= options[:ssh_user] 													|| config_from_file['ssh_user']	|| 'ubuntu'
 			@ssh_port                       	= options[:ssh_port] 													|| config_from_file['ssh_port']	|| 22
-			@role                           	= options[:role] 														|| config_from_file['role'] || 'default'
+			@role                           	= options[:role] 														|| config_from_file['role']
 			@flavor                         	= options[:flavor] 														|| config_from_file['flavor'] || 'm1.medium'
 			@security_groups                	= [options[:security_groups]] 											|| [config_from_file['security_groups']]
 			@deploy_cmd                     	= options[:deploy_cmd] 													|| config_from_file['deploy_cmd'] || 'sudo chef-client'

data/lib/providers/chefserver/chefserver.rb

@@ -22,7 +22,7 @@ module Provider
 			Chef::Config[:validation_key] 			= config[:validation_key]
 			Chef::Config[:chef_server_url] 			= config[:chef_server_url]
 			Chef::Config[:ssl_version]				= config[:ssl_version]
-			Chef::Config[:log_level] 				= :debug
+			Chef::Config[:log_level] 				= config[:verbose]
 			@knife = knife
 		end
 

data/lib/providers/chefserver/instance.rb

@@ -6,6 +6,8 @@ require 'chef/knife/ssh'
 require 'chef/knife/node_run_list_add'
 require 'chef/knife/core/bootstrap_context'
 require 'chef/knife/ec2_base'
+require 'chef/node'
+
 require_relative 'rest_request'
 
 module Provider
@@ -27,6 +29,7 @@ module Provider
 				@flavor											= config[:flavor]
 				@region											= config[:region]
 				@availability_zone								= config[:availability_zone]
+				@verbose 										= config[:verbose]
 				Chef::Config[:knife][:image] 					= @image
 				Chef::Config[:knife][:aws_ssh_key_id] 			= @aws_ssh_key_id
 				Chef::Config[:knife][:aws_access_key_id] 		= @access_key_id
@@ -39,56 +42,61 @@ module Provider
 			def create
 				puts "Creating ec2 server #{@name} ..."
 				
-				create = Chef::Knife::Ec2ServerCreate.new()
-
-				create.config[:run_list]        	= [@roles]
-				create.config[:image]           	= @image
-				create.config[:flavor]          	= @flavor
-				create.config[:security_groups] 	= @security_groups
-				create.config[:ssh_user]        	= @ssh_user
-				create.config[:ssh_port]        	= @ssh_port
-				create.config[:chef_node_name]  	= @name
-				create.config[:identity_file]		= @identity_file
-				create.config[:environment]			= @environment
-				create.config[:log_level] 			= :debug
-
-				puts create.config
-				create.run
+				node = Chef::Knife::Ec2ServerCreate.new()
+
+				node.config[:run_list]        	= [@roles]
+				node.config[:image]           	= @image
+				node.config[:flavor]          	= @flavor
+				node.config[:security_groups] 	= @security_groups
+				node.config[:ssh_user]        	= @ssh_user
+				node.config[:ssh_port]        	= @ssh_port
+				node.config[:chef_node_name]  	= @name
+				node.config[:identity_file]		= @identity_file
+				node.config[:environment]		= @environment
+				node.config[:log_level] 		= @verbose
+
+				puts node.config
+				node.run
 			end
 
-			def bootstrap
+			def bootstrap(recursive_count=0)
 				puts "Bootstrapping ec2 server #{@name} ..."
 				
-				bootstrap = Chef::Knife::Ec2ServerCreate.new()
-
-				bootstrap.config[:image]           	= @image
-				bootstrap.config[:flavor]          	= @flavor
-				bootstrap.config[:security_groups] 	= @security_groups
-				bootstrap.config[:ssh_user]        	= @ssh_user
-				bootstrap.config[:ssh_port]        	= @ssh_port
-				bootstrap.config[:chef_node_name]  	= @name
-				bootstrap.config[:identity_file]	= @identity_file
-				bootstrap.config[:environment]		= @environment
-				bootstrap.config[:log_level] 		= :debug
-
-				puts bootstrap.config
-				bootstrap.run
+				node = Chef::Knife::Ec2ServerCreate.new()
+
+				node.config[:image]           	= @image
+				node.config[:flavor]          	= @flavor
+				node.config[:security_groups] 	= @security_groups
+				node.config[:ssh_user]        	= @ssh_user
+				node.config[:ssh_port]        	= @ssh_port
+				node.config[:chef_node_name]  	= @name
+				node.config[:identity_file]		= @identity_file
+				node.config[:environment]		= @environment
+				node.config[:log_level] 		= @verbose
+
+				puts node.config
+				begin
+					node.run
+				rescue
+					self.destroy([node.server.id])
+					self.bootstrap(recursive_count+=1) if recursive_count < 3
+				end
 			end
 
 			def destroy(instance_ids = [])
 				puts "Deleting ec2 server #{@name} ..."
 
-				destroy = Chef::Knife::Ec2ServerDelete.new()
+				node = Chef::Knife::Ec2ServerDelete.new()
 
-				destroy.config[:purge]        		= true
-				destroy.config[:chef_node_name]		= @name
-				destroy.config[:yes]				= true
-				destroy.name_args 					= instance_ids
+				node.config[:purge]        		= true
+				node.config[:chef_node_name]	= @name
+				node.config[:yes]				= true
+				node.name_args 					= instance_ids
 
-				puts destroy.config
-				destroy.run
-				destroy.destroy_item(Chef::Node, @name, "node")
-				destroy.destroy_item(Chef::ApiClient, @name, "client")
+				puts node.config
+				node.run
+				node.destroy_item(Chef::Node, @name, "node")
+				node.destroy_item(Chef::ApiClient, @name, "client")
 			end
 
 			def set_role
@@ -97,13 +105,22 @@ module Provider
 				node.run
 			end
 
+			def set_environment
+				node = Chef::Node.new.tap do |n|
+					n.name( @name )
+          			n.chef_environment( @environment )
+          		end
+          		node.save
+          		puts "Environment: #{@environment}"
+			end
+
 			def ssh(query, cmd_line, manual)
 				knife_ssh = Chef::Knife::Ssh.new()
 
 				knife_ssh.config[:manual] 			= manual
 				knife_ssh.config[:ssh_user] 		= @ssh_user
 				knife_ssh.config[:identity_file] 	= @identity_file
-				knife_ssh.config[:log_level] 		= :debug
+				knife_ssh.config[:log_level] 		= @verbose
 
 				knife_ssh.name_args = [query, cmd_line]
 				sys_status =  knife_ssh.run

data/lib/providers/ec2/ec2.rb

@@ -23,7 +23,9 @@ module Provider
 		end
 
 		def instances
-			@ec2.instances
+			AWS.memoize do
+				@instances ||= @ec2.instances
+			end
 		end
 
 		def ec2

data/lib/providers/ec2/instance.rb

@@ -5,32 +5,45 @@ module Provider
 			def initialize(ec2, name)
 				@ec2 = ec2
 				@name = name
-		        @instance = @ec2.instances.select {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated}.first
+		       	@instance = instance
 		    end
 
 			def stop
 				print "Stopping instance #{@name}..."
-				@i = 0
-				@instance.stop if @instance.status == :running
-				while @instance.status != :stopped && @i < 40
-					print "." ; sleep 3 ; @i += 1 || 1
+				if self.exist?
+					@instance.stop
+					@i = 0
+					while self.status != :stopped
+						if @i > 120 
+							return false
+						end
+						print "." ; sleep 3 ; @i += 1
+					end
 				end
 				puts "\nInstance #{@name} is stopped"
 			end
 
 			def start
 				print "Starting instance #{@name}..."
-				@i = 0
-				@instance.start if @instance.status == :stopped && @i < 40
-				while @instance.status != :running
-					print "." ; sleep 3 ; @i += 1 || 1
+				if self.exist?
+					while self.status == :stopping
+						sleep 2
+					end
+					@instance.start
+					@i = 0 					
+					while self.status != :running
+						if @i > 120 
+							return false
+						end
+						print "." ; sleep 3 ; @i += 1
+					end
 				end
 				puts "\nInstance #{@name} is started"
 			end
 
 			def exist?
 				puts "Checking for ec2 server #{@name} ..."
-				if @ec2.instances.any? {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated}
+				if AWS.memoize do @ec2.instances.any? {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated} end
 					puts "Instance #{@name} found"
 					return true
 				else
@@ -40,11 +53,7 @@ module Provider
 			end
 
 			def status
-				begin
-					@instance.status
-				rescue Exception => e
-					return :missing
-				end
+				@instance.status if @instance
 			end
 
 			def dns_name
@@ -58,6 +67,16 @@ module Provider
 			def id
 				@instance.id
 			end
+
+			def instance
+				@instance ||= get_instance
+			end
+
+			def get_instance
+				AWS.memoize do
+					@ec2.instances.select {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated}.first
+				end
+			end
 					
 		end
 	end

data/lib/providers/route53/record.rb

@@ -45,8 +45,9 @@ module Route53
 
 			def delete
 				if self.exist?
-					record = Route53::DNSRecord.new(@name, @type, @ttl, @values, @zone)
-					record.delete
+					record = self.get
+					delete_record = Route53::DNSRecord.new(record.name, record.type, record.ttl, record.values, @zone)
+					delete_record.delete
 				end
 			end
 			

data/lib/veronic.rb

@@ -54,7 +54,7 @@ module Veronic
 				deploy_stacks
 			end
 			query = cloudprovider.instance.dns_name
-			deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_deploy]" -l debug'
+			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_deploy]' #{config_hash[:verbose] ? '-l ' + config_hash[:verbose] : ''}"
 			manual = true
 			configprovider.ssh(query, deploy_cmd, manual)
 		end
@@ -65,7 +65,7 @@ module Veronic
 				deploy_apps
 			end
 			query = cloudprovider.instance.dns_name
-			deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_testing]" -l debug'
+			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_testing]' #{config_hash[:verbose] ? '-l ' + config_hash[:verbose] : ''}"
 			manual = true
 			configprovider.ssh(query, deploy_cmd, manual)
 		end
@@ -76,7 +76,7 @@ module Veronic
 				@config.zone_url 	= z['zone_url']
 				dns 				= "#{config_hash[:name]}.#{z['zone_name']}"
 				puts 				"Setting DNS #{dns} ..."
-				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.public_ip_address], "A", "10").delete
+				record 				= dnsprovider.zone.record(dns, [], "A", "1").delete
 				puts 				"DNS #{dns} deleted"
 			end
 			if cloudprovider.instance.exist?
@@ -106,7 +106,7 @@ module Veronic
 				@config.zone_url 	= z['zone_url']
 				dns 				= "#{config_hash[:name]}.#{z['zone_name']}"
 				puts 				"Setting DNS #{dns} ..."
-				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.public_ip_address], "A", "10").wait_set
+				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.public_ip_address], "A", "1").wait_set
 				puts 				"DNS #{dns} updated"
 			end
 		end
@@ -120,23 +120,51 @@ module Veronic
 		end
 
 		def start
-			cloudprovider.instance.start
-			update_instance_dns
+			unless cloudprovider.instance.start == false
+				update_instance_dns
+			end
+		end
+
+		def status
+			if config_hash[:name]
+				return cloudprovider.instance.status
+			else
+				return "Arguments name missing"
+			end
 		end
 
 		def bootstrap
-			@config.image = cloudprovider.image.id
+			get_image
 			if cloudprovider.instance.status == :running
-				configprovider.instance.bootstrap
+				puts "#{config_hash[:name]} is running"		
 			elsif cloudprovider.instance.status == :stopped
 				start
-				configprovider.instance.bootstrap
 			elsif cloudprovider.instance.exist? == false
-				configprovider.instance.bootstrap
-				configprovider.instance.set_role
+				configprovider.instance.bootstrap 
+				set_node
+				update_instance_dns
 				return true
 			else
-				raise ArgumentError.new('Error during connecting instance')  
+				abort('Error during connecting instance')  
+			end
+			set_node
+			return false
+		end
+
+		def set_node
+			if config_hash[:role] && config_hash[:environment]
+				configprovider.instance.set_environment
+				configprovider.instance.set_role
+			else
+				abort('Arguments "role" or "environment" missing') 
+			end
+		end
+
+		def get_image
+			if config_hash[:environment]
+				@config.image = cloudprovider.image.id
+			else
+				abort('Arguments "environment" missing') 
 			end
 		end
 	end

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.8'
+  s.version     = '0.0.9'
   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"

data/veronic.yml

@@ -21,4 +21,5 @@ ssh_port:
 role:
 flavor:
 security_groups: 
-deploy_cmd: 
+deploy_cmd: 
+verbose: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: