veronic 0.0.7 → 0.0.8

data/lib/config/config.rb

@@ -1,6 +1,6 @@
 module Veronic
 	class Config
-		attr_accessor  :dnsprovider, :cloudprovider, :configprovider, :dnsprovider_access_key_id, :dnsprovider_secret_access_key, :cloudprovider_access_key_id, :cloudprovider_secret_access_key, :cloudprovider_images_owner_id, :dnsprovider_zones, :region, :availability_zone, :aws_ssh_key_id, :node_name, :client_key, :validation_client_name, :validation_key, :chef_server_url, :ssl_version, :identity_file, :branch, :environment, :ssh_user, :ssh_port, :role, :flavor, :security_groups, :deploy_cmd, :name, :image
+		attr_accessor  :dnsprovider, :cloudprovider, :configprovider, :dnsprovider_access_key_id, :dnsprovider_secret_access_key, :cloudprovider_access_key_id, :cloudprovider_secret_access_key, :cloudprovider_images_owner_id, :dnsprovider_zones, :region, :availability_zone, :aws_ssh_key_id, :node_name, :client_key, :validation_client_name, :validation_key, :chef_server_url, :ssl_version, :identity_file, :branch, :environment, :ssh_user, :ssh_port, :role, :flavor, :security_groups, :deploy_cmd, :name, :image, :zone_name, :zone_url
 
 		def initialize(options={})
 			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'

data/lib/providers/chefserver/rest_request.rb

@@ -13,7 +13,7 @@ class Chef
         end
         if url.scheme == HTTPS
           @http_client.use_ssl = true
-          if config[:ssl_version].to_sym == :SSLv3
+          if config[:ssl_version] == :SSLv3
           	@http_client.ssl_version = :SSLv3
           end
           if config[:ssl_verify_mode] == :verify_none

data/lib/providers/dnsprovider.rb

@@ -13,7 +13,8 @@ class DnsProvider
 		DNSPROVIDERS[@config[:dnsprovider]].new(@config)
 	end
 
-	def zone(zone_name, zone_url)
-		@dnsprovider.zone(zone_name, zone_url)
+	def zone
+		@dnsprovider.zone
 	end
+	
 end

data/lib/providers/ec2/instance.rb

@@ -10,6 +10,7 @@ module Provider
 
 			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
@@ -19,6 +20,7 @@ module Provider
 
 			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

data/lib/providers/route53/r53.rb

@@ -8,22 +8,19 @@ module Provider
 		def initialize(config)
 			@access_key_id = config[:dnsprovider_access_key_id]
 			@secret_access_key = config[:dnsprovider_secret_access_key]
-			@zone_name = config[:dnsprovider_zone_name]
-			@zone_url = config[:dnsprovider_zone_url]
+			@zone_name = config[:zone_name]
+			@zone_url = config[:zone_url]
 			@r53 = r53
+			@zone = zone
 		end
 		
 		def r53
 			Route53::Connection.new(@access_key_id, @secret_access_key)
 		end
 
-		def zone(zone_name, zone_url)
-			begin
-				Provider::R53::Zone.new(@r53, zone_name, zone_url)
-			rescue
-				puts 'Bad DNS settings'
-			end
+		def zone
+			Route53::Zone.new(@zone_name, @zone_url, @r53)
 		end
-		
+
 	end
 end

data/lib/providers/route53/record.rb

@@ -1,5 +1,5 @@
-module Provider
-	class R53::Zone
+module Route53
+	class Zone
 		class Record
 
 			def initialize(zone, name, values=[], type, ttl)
@@ -36,14 +36,19 @@ module Provider
 				if self.exist?
 					record = self.get
 					new_record = Route53::DNSRecord.new(record.name, record.type, record.ttl, record.values, @zone)
-					action = "update"
 					record.update(@name, @type, @ttl, @values, @zone)
 				else
 					record = Route53::DNSRecord.new(@name, @type, @ttl, @values, @zone)
-					action = "create"
 					record.create
 				end
 			end
+
+			def delete
+				if self.exist?
+					record = Route53::DNSRecord.new(@name, @type, @ttl, @values, @zone)
+					record.delete
+				end
+			end
 			
 		end
 	end

data/lib/providers/route53/zone.rb

@@ -1,26 +1,13 @@
-module Provider
-	class R53
-		class Zone
+module Route53
+	class Zone
 
-			def initialize(r53, zone_name, zone_url)
-				@zone_name = zone_name
-				@zone_url = zone_url
-				@r53 = r53
-				@zone = zone
-			end
-
-			def record
-				Provider::R53::Zone::Record
-			end
-
-			def records
-				@zone.get_records
-			end
-
-			def zone
-				Route53::Zone.new(@zone_name, @zone_url, @r53)
-			end
+		def record(name, values=[], type, ttl)
+			Route53::Zone::Record.new(self, name, values, type, ttl)
+		end
 
+		def records
+			self.get_records
 		end
+
 	end
 end

data/lib/veronic.rb

@@ -2,6 +2,7 @@ require_relative 'config/config'
 require_relative 'providers/cloudprovider'
 require_relative 'providers/dnsprovider'
 require_relative 'providers/configprovider'
+require 'pp'
 
 module Veronic
 	class Deployer
@@ -70,11 +71,20 @@ module Veronic
 		end
 
 		def destroy
+			config_hash[:dnsprovider_zones].each do |z|
+				@config.zone_name 	= z['zone_name']
+				@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
+				puts 				"DNS #{dns} deleted"
+			end
 			if cloudprovider.instance.exist?
 				configprovider.instance.destroy([cloudprovider.instance.id])
 			else
 				configprovider.instance.destroy([])
 			end
+
 		end
 
 		def deploy
@@ -92,13 +102,12 @@ module Veronic
 
 		def update_instance_dns
 			config_hash[:dnsprovider_zones].each do |z|
-				zone_name 	= z['zone_name']
-				zone_url 	= z['zone_url']
-				dns 		= "*.#{config_hash[:name]}.#{zone_name}"
-				puts "Setting DNS #{dns} ..."
-				zone 		= dnsprovider.zone(zone_name, zone_url)
-			    record 		= zone.record.new(zone, dns, [cloudprovider.instance.public_ip_address], "A", "10")
-			    puts "DNS #{dns} updated"
+				@config.zone_name 	= z['zone_name']
+				@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
+				puts 				"DNS #{dns} updated"
 			end
 		end
 
@@ -118,10 +127,10 @@ module Veronic
 		def bootstrap
 			@config.image = cloudprovider.image.id
 			if cloudprovider.instance.status == :running
-				return false
+				configprovider.instance.bootstrap
 			elsif cloudprovider.instance.status == :stopped
 				start
-				return false
+				configprovider.instance.bootstrap
 			elsif cloudprovider.instance.exist? == false
 				configprovider.instance.bootstrap
 				configprovider.instance.set_role

data/veronic.gemspec

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

metadata

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