veronic 0.0.4 → 0.0.5

data/bin/veronic

@@ -3,13 +3,10 @@
 require 'rubygems'
 require 'optparse'
 require 'yaml'
-require "cgi"
 
-require_relative '../lib/deployer'
+require_relative '../lib/veronic'
 
 file = __FILE__
-path = File.dirname($0)
-config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : path + '/veronic.yml'
 
 options = {}
 
@@ -31,18 +28,17 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  ""
   opt.separator  "Options"
 
-  options[:config_file] = ENV['config_file'] || config_file
+  options[:config_file] = ENV['config_file']
   opt.on("-c","--config_file veronic.yml","Use specific config file") do |c|
     options[:config_file] = c
   end
-  CONFIG = YAML.load_file(options[:config_file])
 
-  options[:environment] = ENV['environment'] || 'branch'
+  options[:environment] = ENV['environment']
   opt.on("-E","--environment ENVIRONMENT","Which environment you want box run") do |e|
     options[:environment] = e
   end
 
-  options[:name] = ENV['name'] || 'sitemap-generator-45625091'
+  options[:name] = ENV['name']
     opt.on("-N","--node-name NAME","Which node name you want for the box") do |n|
     options[:name] = n
   end
@@ -52,42 +48,42 @@ opt_parser = OptionParser.new do |opt|
     options[:branch] = b
   end
   
-  options[:ssh_user] = ENV['ssh_user'] || "ubuntu"
+  options[:ssh_user] = ENV['ssh_user']
   opt.on("-u","--ssh_user ssh_user","Which ssh user use to connect box") do |s|
     options[:ssh_user] = s
   end
   
-  options[:ssh_port] = ENV['ssh_port'] || 22
+  options[:ssh_port] = ENV['ssh_port']
   opt.on("-p","--ssh_port ssh_port","Which ssh port use to connect box") do |p|
     options[:ssh_port] = p
   end
 
-  options[:identity_file] = ENV['identity_file'] || CONFIG['identity_file']
+  options[:identity_file] = ENV['identity_file']
   opt.on("-i","--identity_file identity_file.pem","Which file use by ssh to connect box") do |i|
     options[:identity_file] = i
   end
 
-  options[:role] = ENV['role'] || 'beta'
+  options[:role] = ENV['role']
   opt.on("-r","--role role","Which role use to deploy the box") do |r|
     options[:role] = r
   end
 
-  options[:flavor] = ENV['flavor'] || 'm1.medium'
+  options[:flavor] = ENV['flavor']
   opt.on("-f","--flavor flavor","Which flavor use to deploy the box") do |f|
     options[:flavor] = f
   end
 
-  options[:dns_zone_name] = ENV['dns_zone_name'] || 'aipotfil.com'
+  options[:dnsprovider_zone_name] = ENV['dnsprovider_zone_name']
   opt.on("-d","--dns_zone_name dns_zone_name","Which dns zone use for the box's dns") do |d|
-    options[:dns_zone_name] = d
+    options[:dnsprovider_zone_name] = d
   end
 
-  options[:security_groups] = ENV['security_groups'] || 'public-web'
+  options[:security_groups] = ENV['security_groups']
   opt.on("-S","--security_groups security_groups","Which security groups use for the box") do |s|
     options[:security_groups] = s
   end
 
-  options[:deploy_cmd] = ENV['deploy_cmd'] || 'sudo chef-client'
+  options[:deploy_cmd] = ENV['deploy_cmd']
   opt.on("-D","--deploy_cmd security_groups","Which command line us to deploy the box") do |dc|
     options[:deploy_cmd] = dc
   end
@@ -97,64 +93,30 @@ end
 
 opt_parser.parse!
 
-config = {}
-config[:dnsprovider]                          = :route53
-config[:cloudprovider]                        = :ec2
-config[:configprovider]                       = :chefserver
-config[:dnsprovider_access_key_id]            = CONFIG['dnsprovider_access_key_id']
-config[:dnsprovider_secret_access_key]        = CONFIG['dnsprovider_secret_access_key']
-config[:cloudprovider_access_key_id]          = CONFIG['cloudprovider_access_key_id']
-config[:cloudprovider_secret_access_key]      = CONFIG['cloudprovider_secret_access_key']
-config[:cloudprovider_images_owner_id]        = CONFIG['cloudprovider_images_owner_id']
-config[:dnsprovider_zone_url]                 = CONFIG['dnsprovider_zone_url']
-config[:region]                               = CONFIG['us-east-1']
-config[:availability_zone]                    = CONFIG['us-east-1b']
-config[:aws_ssh_key_id]                       = CONFIG['aws_ssh_key_id']
-config[:node_name]                            = CONFIG['node_name']
-config[:client_key]                           = CONFIG['client_key']
-config[:validation_client_name]               = CONFIG['validation_client_name']
-config[:validation_key]                       = CONFIG['validation_key']
-config[:chef_server_url]                      = CONFIG['chef_server_url']
-config[:ssl_version]                          = CONFIG['ssl_version']
-config[:identity_file]                        = options[:identity_file]
-config[:dnsprovider_zone_name]                = "#{options[:dns_zone_name]}."
-config[:branch]                               = options[:branch]
-config[:environment]                          = options[:environment]
-config[:name]                                 = options[:branch] ? options[:branch] : options[:name]
-config[:ssh_user]                             = options[:ssh_user]
-config[:ssh_port]                             = options[:ssh_port]
-config[:role]                                 = options[:role]
-config[:roles]                                = "role[#{options[:role]}]"
-config[:flavor]                               = options[:flavor]
-config[:domain]                               = options[:dns_zone_name]
-config[:security_groups]                      = [options[:security_groups]]
-config[:deploy_cmd]                           = options[:deploy_cmd]
-config[:dns_array]                            = ["#{config[:name]}.#{options[:dns_zone_name]}", "#{config[:name]}.core.#{options[:dns_zone_name]}", "#{config[:name]}.store.#{options[:dns_zone_name]}", "*.#{config[:name]}.store.#{options[:dns_zone_name]}"]
-
 case ARGV[0] || ENV['action']
 when "create"
-	Deployer.new(config).create
+	Veronic::Deployer.new(options).create
 when "bootstrap"
-  Deployer.new(config).bootstrap
+  Veronic::Deployer.new(options).bootstrap
 when "destroy"
-	Deployer.new(config).destroy
+	Veronic::Deployer.new(options).destroy
 when "deploy"
-  Deployer.new(config).deploy
+  Veronic::Deployer.new(options).deploy
 when "deploy_stacks"
-  Deployer.new(config).deploy_stacks
+  Veronic::Deployer.new(options).deploy_stacks
 when "deploy_apps"
-  Deployer.new(config).deploy_apps
+  Veronic::Deployer.new(options).deploy_apps
 when "run_tests"
-  Deployer.new(config).run_tests
+  Veronic::Deployer.new(options).run_tests
 when "update_instance_dns"
-	Deployer.new(config).update_instance_dns
+	Veronic::Deployer.new(options).update_instance_dns
 when "stop"
-	Deployer.new(config).stop
+	Veronic::Deployer.new(options).stop
 when "start"
-	Deployer.new(config).start
-	Deployer.new(config).update_instance_dns
+	Veronic::Deployer.new(options).start
+	Veronic::Deployer.new(options).update_instance_dns
 when "list"
-  Deployer.new(config).instances_list
+  Veronic::Deployer.new(options).instances_list
 else
 	puts opt_parser
 end

data/lib/config/config.rb

@@ -0,0 +1,47 @@
+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
+
+		def initialize(options={})
+			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'
+			config_from_file 					= YAML.load_file(options[:config_file] 									|| config_file)
+
+			@dnsprovider                    	= :route53
+			@cloudprovider                  	= :ec2
+			@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']
+			@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']
+			@node_name                      	= options[:node_name] 													|| config_from_file['node_name']
+			@client_key                     	= options[:client_key] 													|| config_from_file['client_key']
+			@validation_client_name         	= options[:validation_client_name] 										|| config_from_file['validation_client_name']
+			@validation_key                 	= options[:validation_key]				 								|| config_from_file['validation_key']
+			@chef_server_url                	= options[:chef_server_url] 											|| config_from_file['chef_server_url']
+			@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'
+			@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'
+			@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'
+			@name                           	= (options[:branch] || config_from_file['branch']) ? (options[:branch] 	|| config_from_file['branch']) : (options[:name] || config_from_file['name'])
+			@image 								= nil
+		end
+
+		def to_hash
+			hash = {}
+			self.instance_variables.each {|var| hash[var.to_s.delete("@").to_sym] = self.instance_variable_get(var) }
+			return hash
+		end
+	end
+end

data/lib/providers/chefserver/instance.rb

@@ -23,7 +23,7 @@ module Provider
 				@identity_file									= config[:identity_file]
 				@aws_ssh_key_id									= config[:aws_ssh_key_id]
 				@environment									= config[:environment]
-				@roles											= config[:roles]
+				@roles											= "role[#{config[:role]}]"
 				@flavor											= config[:flavor]
 				@region											= config[:region]
 				@availability_zone								= config[:availability_zone]

data/lib/providers/route53/r53.rb

@@ -8,7 +8,7 @@ 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
@@ -19,7 +19,7 @@ module Provider
 		end
 
 		def zone
-			Provider::R53::Zone.new(@r53, @zone_name, @zone_url)
+			Provider::R53::Zone.new(@r53, @zone_name, @zone_url) rescue puts 'Bad DNS settings'
 		end
 		
 	end

data/lib/veronic.rb

@@ -0,0 +1,130 @@
+require_relative 'config/config'
+require_relative 'providers/cloudprovider'
+require_relative 'providers/dnsprovider'
+require_relative 'providers/configprovider'
+
+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]
+		end
+		
+		def config
+			@config || Veronic::Config.new
+		end
+
+		def config(options={})
+			@config || Veronic::Config.new(options)
+		end
+
+		def configprovider
+			ConfigProvider.new(@config_hash) 
+		end
+
+		def dnsprovider
+			DnsProvider.new(@config_hash)
+		end
+
+		def cloudprovider
+			CloudProvider.new(@config_hash)
+		end
+
+		def create
+			unless bootstrap
+				configprovider.instance.create
+			end
+		end
+
+		def deploy_stacks
+			bootstrap
+			query = cloudprovider.instance.dns_name
+			deploy_cmd = 'sudo chef-client -l debug'
+			manual = true
+			configprovider.ssh(query, deploy_cmd, manual)
+		end
+
+		def deploy_apps
+			if bootstrap
+				deploy_stacks
+			end
+			query = cloudprovider.instance.dns_name
+			deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_deploy]" -l debug'
+			manual = true
+			configprovider.ssh(query, deploy_cmd, manual)
+		end
+
+		def run_tests
+			if bootstrap
+				deploy_stacks
+				deploy_apps
+			end
+			query = cloudprovider.instance.dns_name
+			deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_testing]" -l debug'
+			manual = true
+			configprovider.ssh(query, deploy_cmd, manual)
+		end
+
+		def destroy
+			if cloudprovider.instance.exist?
+				configprovider.instance.destroy([cloudprovider.instance.id])
+			else
+				configprovider.instance.destroy([])
+			end
+		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
+		end
+
+		def update_instance_dns
+			@dns_array.each do |dns|
+				puts "Setting DNS #{dns} ..."
+			    dnsprovider.zone.record.new(dnsprovider.zone, dns, [cloudprovider.instance.public_ip_address], "A", "10")
+			    puts "DNS #{dns} updated"
+			end
+		end
+
+		def instances_list
+			cloudprovider.instances_list
+		end
+
+		def stop
+			cloudprovider.instance.stop
+		end
+
+		def start
+			cloudprovider.instance.start
+			update_instance_dns
+		end
+
+		def bootstrap
+			@config.image = cloudprovider.image.id
+			if cloudprovider.instance.status == :running
+				return false
+			elsif cloudprovider.instance.status == :stopped
+				start
+				return false
+			elsif cloudprovider.instance.exist? == false
+				configprovider.instance.bootstrap
+				configprovider.instance.set_role
+				return true
+			else
+				raise ArgumentError.new('Error during connecting instance')  
+			end
+		end
+	end
+end

data/veronic.gemspec

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

@@ -1,16 +1,25 @@
-dnsprovider_access_key_id: 
-dnsprovider_secret_access_key: 
-dnsprovider_zone_url: 
-cloudprovider_access_key_id: 
-cloudprovider_secret_access_key: 
-cloudprovider_images_owner_id: 
-region: 
-availability_zone: 
-aws_ssh_key_id: 
+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:
-chef_server_url: 
-validation_client_name: 
+client_key:
+validation_client_name:
 validation_key:
-client_key: 
-identity_file: 
-ssl_version: 
+chef_server_url:
+ssl_version:
+identity_file:
+branch:
+environment: 
+ssh_user:
+ssh_port:
+role:
+flavor:
+security_groups: 
+deploy_cmd: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -21,7 +21,7 @@ files:
 - .gitignore
 - README.md
 - bin/veronic
-- lib/deployer.rb
+- lib/config/config.rb
 - lib/providers/chefserver/chefserver.rb
 - lib/providers/chefserver/instance.rb
 - lib/providers/chefserver/rest_request.rb
@@ -34,6 +34,7 @@ files:
 - lib/providers/route53/r53.rb
 - lib/providers/route53/record.rb
 - lib/providers/route53/zone.rb
+- lib/veronic.rb
 - veronic.gemspec
 - veronic.yml
 homepage: http://github.com/GabKlein/veronic

data/lib/deployer.rb

@@ -1,109 +0,0 @@
-require_relative 'providers/cloudprovider'
-require_relative 'providers/dnsprovider'
-require_relative 'providers/configprovider'
-
-class Deployer
-
-	def initialize(config)
-		@role			= config[:role]
-		@environment	= config[:environment]	
-		@deploy_cmd		= config[:deploy_cmd]
-		@dns_array 		= config[:dns_array] 
-		@cloudprovider 	= CloudProvider.new(config)
-		config[:image]	= @cloudprovider.image.id
-		@dnsprovider 	= DnsProvider.new(config)
-		@configprovider = ConfigProvider.new(config)
-	end
-
-	def create
-		if bootstrap
-			@configprovider.instance.create
-		end
-	end
-
-	def deploy_stacks
-		bootstrap
-		query = @cloudprovider.instance.dns_name
-		deploy_cmd = 'sudo chef-client -l debug'
-		manual = true
-		@configprovider.ssh(query, deploy_cmd, manual)
-	end
-
-	def deploy_apps
-		unless bootstrap
-			deploy_stacks
-		end
-		query = @cloudprovider.instance.dns_name
-		deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_deploy]" -l debug'
-		manual = true
-		@configprovider.ssh(query, deploy_cmd, manual)
-	end
-
-	def run_tests
-		unless bootstrap
-			deploy_stacks
-			deploy_apps
-		end
-		query = @cloudprovider.instance.dns_name
-		deploy_cmd = 'sudo chef-client -o "recipe[lift_envs::app_testing]" -l debug'
-		manual = true
-		@configprovider.ssh(query, deploy_cmd, manual)
-	end
-
-	def destroy
-		if @cloudprovider.instance.exist?
-			@configprovider.instance.destroy([@cloudprovider.instance.id])
-		else
-			@configprovider.instance.destroy([])
-		end
-	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
-	end
-
-	def update_instance_dns
-		@dns_array.each do |dns|
-			puts "Setting DNS #{dns} ..."
-		    @dnsprovider.zone.record.new(@dnsprovider.zone, dns, [@cloudprovider.instance.public_ip_address], "A", "10")
-		    puts "DNS #{dns} updated"
-		end
-	end
-
-	def instances_list
-		@cloudprovider.instances_list
-	end
-
-	def stop
-		@cloudprovider.instance.stop
-	end
-
-	def start
-		@cloudprovider.instance.start
-		update_instance_dns
-	end
-
-	def bootstrap		
-		if @cloudprovider.instance.status == :running
-			return true
-		elsif @cloudprovider.instance.status == :stopped
-			start
-			return true
-		elsif @cloudprovider.instance.exist? == false
-			@configprovider.instance.bootstrap
-			@configprovider.instance.set_role
-			return false
-		else
-			raise ArgumentError.new('Error during connecting instance')  
-		end
-	end
-end