veronic 0.0.5 → 0.0.7

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'chef'
+gem 'knife-ec2'
+gem 'route53'
+gem 'aws-sdk'

data/bin/veronic

@@ -114,7 +114,6 @@ when "stop"
 	Veronic::Deployer.new(options).stop
 when "start"
 	Veronic::Deployer.new(options).start
-	Veronic::Deployer.new(options).update_instance_dns
 when "list"
   Veronic::Deployer.new(options).instances_list
 else

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_zone_url, :dnsprovider_zone_name, :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
 
 		def initialize(options={})
 			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'
@@ -11,11 +11,10 @@ module Veronic
 			@configprovider                 	= :chefserver
 			@dnsprovider_access_key_id      	= options[:dnsprovider_access_key_id] 									|| config_from_file['dnsprovider_access_key_id']
 			@dnsprovider_secret_access_key  	= options[:dnsprovider_secret_access_key] 								|| config_from_file['dnsprovider_secret_access_key']
+			@dnsprovider_zones           		= options[:dnsprovider_zones]		 									|| config_from_file['dnsprovider_zones']
 			@cloudprovider_access_key_id	   	= options[:cloudprovider_access_key_id] 								|| config_from_file['cloudprovider_access_key_id']
 			@cloudprovider_secret_access_key	= options[:cloudprovider_secret_access_key] 							|| config_from_file['cloudprovider_secret_access_key']
 			@cloudprovider_images_owner_id  	= options[:cloudprovider_images_owner_id] 								|| config_from_file['cloudprovider_images_owner_id']
-			@dnsprovider_zone_url           	= options[:dnsprovider_zone_url] 										|| config_from_file['dnsprovider_zone_url']
-			@dnsprovider_zone_name          	= options[:dnsprovider_zone_name] 										|| config_from_file['dnsprovider_zone_name']
 			@region                         	= options[:region] 														|| config_from_file['region']
 			@availability_zone              	= options[:availability_zone] 											|| config_from_file['availability_zone']
 			@aws_ssh_key_id                 	= options[:aws_ssh_key_id] 												|| config_from_file['aws_ssh_key_id']

data/lib/providers/dnsprovider.rb

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

data/lib/providers/route53/r53.rb

@@ -8,18 +8,21 @@ 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_name = config[:dnsprovider_zone_name]
 			@zone_url = config[:dnsprovider_zone_url]
 			@r53 = r53
-			@zone = zone
 		end
 		
 		def r53
 			Route53::Connection.new(@access_key_id, @secret_access_key)
 		end
 
-		def zone
-			Provider::R53::Zone.new(@r53, @zone_name, @zone_url) rescue puts 'Bad DNS settings'
+		def zone(zone_name, zone_url)
+			begin
+				Provider::R53::Zone.new(@r53, zone_name, zone_url)
+			rescue
+				puts 'Bad DNS settings'
+			end
 		end
 		
 	end

data/lib/providers/route53/record.rb

@@ -8,7 +8,6 @@ module Provider
 				@values = values
 				@type =  type
 				@ttl = ttl
-				@update = wait_set
 			end
 			
 			def get

data/lib/providers/route53/zone.rb

@@ -6,7 +6,7 @@ module Provider
 				@zone_name = zone_name
 				@zone_url = zone_url
 				@r53 = r53
-				@zone =  zone
+				@zone = zone
 			end
 
 			def record
@@ -18,7 +18,7 @@ module Provider
 			end
 
 			def zone
-				zone = Route53::Zone.new(@zone_name, @zone_url, @r53)
+				Route53::Zone.new(@zone_name, @zone_url, @r53)
 			end
 
 		end

data/lib/veronic.rb

@@ -7,11 +7,7 @@ module Veronic
 	class Deployer
 
 		def initialize(options={})
-			@config 		= config(options)
-			@config_hash	= @config.to_hash
-			@role 			= @config_hash[:role]
-			@environment	= @config_hash[:environment]	
-			@deploy_cmd		= @config_hash[:deploy_cmd]
+			@config = config(options)
 		end
 		
 		def config
@@ -22,16 +18,20 @@ module Veronic
 			@config || Veronic::Config.new(options)
 		end
 
+		def config_hash
+			@config.to_hash
+		end		
+
 		def configprovider
-			ConfigProvider.new(@config_hash) 
+			ConfigProvider.new(config_hash) 
 		end
 
 		def dnsprovider
-			DnsProvider.new(@config_hash)
+			DnsProvider.new(config_hash)
 		end
 
 		def cloudprovider
-			CloudProvider.new(@config_hash)
+			CloudProvider.new(config_hash)
 		end
 
 		def create
@@ -91,9 +91,13 @@ module Veronic
 		end
 
 		def update_instance_dns
-			@dns_array.each do |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} ..."
-			    dnsprovider.zone.record.new(dnsprovider.zone, dns, [cloudprovider.instance.public_ip_address], "A", "10")
+				zone 		= dnsprovider.zone(zone_name, zone_url)
+			    record 		= zone.record.new(zone, dns, [cloudprovider.instance.public_ip_address], "A", "10")
 			    puts "DNS #{dns} updated"
 			end
 		end

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.5'
+  s.version     = '0.0.7'
   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"
@@ -10,4 +10,8 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
   s.homepage    = 'http://github.com/GabKlein/veronic'
+  s.add_dependency('chef')
+  s.add_dependency('knife-ec2')
+  s.add_dependency('aws-sdk')
+  s.add_dependency('route53')
 end

data/veronic.yml

@@ -1,10 +1,9 @@
 dnsprovider_access_key_id:
 dnsprovider_secret_access_key:
+dnsprovider_zones:
 cloudprovider_access_key_id:
 cloudprovider_secret_access_key:
 cloudprovider_images_owner_id:
-dnsprovider_zone_url:
-dnsprovider_zone_name:
 region:
 availability_zone:
 aws_ssh_key_id:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-04-05 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: knife-ec2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: route53
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple cloud deployer
 email: gabriel.klein.fr@gmail.com
 executables:
@@ -19,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - README.md
 - bin/veronic
 - lib/config/config.rb