veronic 0.0.22 → 0.0.23

data/Gemfile

@@ -4,4 +4,4 @@ gem 'chef'
 gem 'knife-ec2'
 gem 'route53'
 gem 'aws-sdk'
-gem 'excon', '= 0.21.0'
+gem 'excon', '~> 0.23.0'

data/Gemfile.lock

@@ -0,0 +1,87 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk (1.11.2)
+      json (~> 1.4)
+      nokogiri (< 1.6.0)
+      uuidtools (~> 2.1)
+    builder (3.2.2)
+    chef (11.4.4)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (~> 1.3.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
+    erubis (2.7.0)
+    excon (0.23.0)
+    fog (1.12.1)
+      builder
+      excon (~> 0.23.0)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.4)
+    highline (1.6.19)
+    hpricot (0.8.6)
+    ipaddress (0.8.0)
+    json (1.7.7)
+    knife-ec2 (0.6.4)
+      chef (>= 0.10.10)
+      fog (~> 1.6)
+    mime-types (1.23)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.1.0)
+    multi_json (1.7.6)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    nokogiri (1.5.10)
+    ohai (6.16.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    route53 (0.2.1)
+      builder
+      hpricot
+      ruby-hmac
+    ruby-hmac (0.4.0)
+    systemu (2.5.2)
+    uuidtools (2.1.4)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aws-sdk
+  chef
+  excon (~> 0.23.0)
+  knife-ec2
+  route53

data/bin/veronic

@@ -36,6 +36,47 @@ opt_parser = OptionParser.new do |opt|
     options[:config_file] = c
   end
 
+  options[:dnsprovider] = ENV['dnsprovider']
+  opt.on("--dnsprovider","--dnsprovider r53","Use specific dnsprovider") do |dns|
+    options[:dnsprovider] = dns
+  end
+  options[:cloudprovider] = ENV['cloudprovider']
+  opt.on("--cloudprovider","--cloudprovider ec2","Use specific cloudprovider") do |cloud|
+    options[:cloudprovider] = cloud
+  end
+  options[:configprovider] = ENV['configprovider']
+  opt.on("--configprovider","--configprovider chef","Use specific configprovider") do |config|
+    options[:configprovider] = config
+  end
+  options[:dnsprovider_access_key_id] = ENV['dnsprovider_access_key_id']
+  opt.on("--dnsprovider_access_key_id","--dnsprovider_access_key_id","Use specific dnsprovider_access_key_id") do |d|
+    options[:dnsprovider_access_key_id] = d
+  end
+  options[:dnsprovider_secret_access_key] = ENV['dnsprovider_secret_access_key']
+  opt.on("--dnsprovider_secret_access_key","--dnsprovider_secret_access_key","Use specific dnsprovider_secret_access_key") do |d|
+    options[:dnsprovider_secret_access_key] = d
+  end
+  options[:dnsprovider_zones] = ENV['dnsprovider_zones']
+  opt.on("--dnsprovider_zones","--dnsprovider_zones","Use specific dnsprovider_zones") do |d|
+    options[:dnsprovider_zones] = d
+  end
+  options[:cloudprovider_access_key_id] = ENV['cloudprovider_access_key_id']
+  opt.on("--cloudprovider_access_key_id","--cloudprovider_access_key_id","Use specific cloudprovider_access_key_id") do |c|
+    options[:cloudprovider_access_key_id] = c
+  end
+  options[:cloudprovider_secret_access_key] = ENV['cloudprovider_secret_access_key']
+  opt.on("--cloudprovider_secret_access_key","--cloudprovider_secret_access_key","Use specific cloudprovider_secret_access_keye") do |c|
+    options[:cloudprovider_secret_access_key] = c
+  end
+  options[:cloudprovider_images_owner_id] = ENV['cloudprovider_images_owner_id']
+  opt.on("--cloudprovider_images_owner_id","--cloudprovider_images_owner_id","Use specific cloudprovider_images_owner_id") do |c|
+    options[:cloudprovider_images_owner_id] = c
+  end
+  options[:region] = ENV['region']
+  opt.on("--region","--region","Use specific region") do |r|
+    options[:region] = r
+  end
+
   options[:environment] = ENV['environment']
   opt.on("-E","--environment ENVIRONMENT","Which environment you want box run") do |e|
     options[:environment] = e

data/lib/config/config.rb

@@ -3,12 +3,12 @@ module Veronic
 		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, :verbose, :query
 
 		def initialize(options={})
-			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'
+			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : File.exists?('./veronic.yml') ? './veronic.yml' : nil
 			config_from_file = YAML.load_file(options[:config_file] || config_file)
 
-			@dnsprovider                      = :route53
-			@cloudprovider                    = :ec2
-			@configprovider                   = :chefserver
+			@dnsprovider                      = options[:dnsprovider]                      || config_from_file['dnsprovider'] || :route53
+			@cloudprovider                    = options[:cloudprovider]                    || config_from_file['cloudprovider'] || :ec2
+			@configprovider                   = options[:configprovider]                   || config_from_file['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']
@@ -34,9 +34,9 @@ module Veronic
 			@security_groups                  = options[:security_groups].split(',')       || config_from_file['security_groups'].split(',')
 			@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                            = options[:ami_image]                         || config_from_file['ami_image']
-			@verbose                          = options[:verbose]                           || config_from_file['verbose']
-			@query                            = options[:query]                         	|| config_from_file['query']
+			@image                            = options[:ami_image]                        || config_from_file['ami_image']
+			@verbose                          = options[:verbose]                          || config_from_file['verbose']
+			@query                            = options[:query]                            || config_from_file['query']
 		end
 
 		def to_hash

data/lib/providers/chefserver/chefserver.rb

@@ -32,14 +32,13 @@ module Provider
 			Chef::Config[:client_key]              = config[:client_key]
 			Chef::Config[:validation_client_name]  = config[:validation_client_name]
 			Chef::Config[:validation_key]          = config[:validation_key]
-			Chef::Config[:chef_server_url]         = config[:chef_server_url]
+			Chef::Config[:chef_server_url]         = config[:chef_server_url] if config[:chef_server_url]
 			Chef::Config[:ssl_version]             = config[:ssl_version]
 			Chef::Config[:log_level]               = config[:verbose]
-			@knife = knife
 		end
 
 		def knife
-			knife = Provider::ChefServer::Instance.new(@config)	
+			@knife = @knife || Provider::ChefServer::Instance.new(@config)	
 		end
 
 		def instances(query)
@@ -55,7 +54,7 @@ module Provider
 		end
 
 		def ssh(query, deploy_cmd, manual)
-			@knife.ssh(query, deploy_cmd, manual)
+			knife.ssh(query, deploy_cmd, manual)
 		end
 
 		def instance

data/lib/providers/ec2/ec2.rb

@@ -12,7 +12,7 @@ module Provider
 			@access_key_id       = config[:cloudprovider_access_key_id]
 			@secret_access_key   = config[:cloudprovider_secret_access_key]
 			@owner_id            = config[:cloudprovider_images_owner_id]
-			@image               = config[:image]
+			@image               = config[:image] || config[:name]
 			@ec2                 = ec2
 		end
 

data/lib/providers/ec2/image.rb

@@ -10,16 +10,16 @@ module Provider
 			end
 
 			def id
-				if image
-					@image.id
+				if get_image
+					get_image.id
 				end
 			end
 
 			def detroy
-				puts "Destroying image #{@ami_name}..."
-				if image
+				puts "Destroying image #{@ami_name} ..."
+				if get_image
 					begin
-						@image.deregister
+						get_image.deregister
 						sleep 5
 						puts "Image #{@ami_name} destroyed"
 					rescue
@@ -29,17 +29,18 @@ module Provider
 				return true
 			end
 
-			def image
-				puts "Getting image #{@ami_name}..."
-				@image ||= get_image
+			def exists?
+				get_image
 			end
 
 			def get_image
-				AWS.memoize do
+				@get_image || AWS.memoize do
+          puts "Getting image #{@ami_name}"
 					my_image = @ec2.images.with_owner(@owner_id).select {|x| x.name == @ami_name}.first
 					unless my_image
 						my_image = @ec2.images[@ami_name]
 						unless my_image.exists?
+              puts "Unabled to found image #{@ami_name}"
 							return false
 						end
 					else
@@ -53,7 +54,8 @@ module Provider
 						end
 						puts ""
 					end
-					return my_image
+          @get_image = my_image
+					return @get_image
 				end
 			end
 

data/lib/providers/ec2/instance.rb

@@ -6,7 +6,7 @@ module Provider
 				@ec2 = ec2
 				@name = name
 		    @instance = instance
-		    @image = image
+        @ami_name = image || name
 		  end
 
 			def stop
@@ -40,7 +40,7 @@ module Provider
         return true
 			end
 
-			def exist?
+			def exists?
 				puts "Checking for ec2 server #{@name} ..."
 				if AWS.memoize do @ec2.instances.any? {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated} end
 					puts "Instance #{@name} found"
@@ -78,19 +78,18 @@ module Provider
 			end
 
 			def create_image
-				@ami_name = @image || @name
 				puts "Create image #{@ami_name}"
-				image = @instance.create_image(@ami_name, { :no_reboot => true })
-				while image.exists? == false && image.state != :failed
+				new_image = @instance.create_image(@ami_name, { :no_reboot => true })
+				while new_image.exists? == false && new_image.state != :failed
 					print "."
 					sleep 1
 				end
-				while image.state == :pending && image.state != :failed
+				while new_image.state == :pending && new_image.state != :failed
 					print "."
 					sleep 1
 				end
 				puts ""
-				return image
+				return new_image
 			end
 
 			def tags(hash={})

data/lib/veronic.rb

@@ -79,7 +79,7 @@ module Veronic
 				record 				= dnsprovider.zone.record(dns, [], "A", "1").delete
 				puts 				"DNS #{dns} deleted"
 			end
-			if cloudprovider.instance.exist?
+			if cloudprovider.instance.exists?
 				configprovider.instance.destroy([cloudprovider.instance.id])
 			else
 				configprovider.instance.destroy([])
@@ -107,14 +107,18 @@ module Veronic
 		end
 
 		def update_instance_dns
-			@config.dnsprovider_zones.each do |z|
-				@config.zone_name 	= z['zone_name']
-				@config.zone_url 	= z['zone_url']
-				dns 				= "#{@config.name}.#{z['zone_name']}"
-				puts 				"Setting DNS #{dns} ..."
-				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.dns_name], "CNAME", "1").wait_set
-				puts 				"DNS #{dns} updated"
-			end
+			if @config.dnsprovider_zones
+  			@config.dnsprovider_zones.each do |z|
+  				@config.zone_name 	= z['zone_name']
+  				@config.zone_url 	= z['zone_url']
+  				dns 				= "#{@config.name}.#{z['zone_name']}"
+  				puts 				"Setting DNS #{dns} ..."
+  				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.dns_name], "CNAME", "1").wait_set
+  				puts 				"DNS #{dns} updated"
+        end
+      else
+        puts "Unabled to update DNS"
+      end
 		end
 
 		def instances_list
@@ -145,7 +149,7 @@ module Veronic
 				puts "#{@config.name} is running"	
 			elsif cloudprovider.instance.status == :stopped
 				start
-			elsif cloudprovider.instance.exist? == false
+			elsif cloudprovider.instance.exists? == false
 				@config.availability_zone = get_availability_zone
 				get_image
 				configprovider.instance.client.destroy
@@ -175,7 +179,7 @@ module Veronic
 					configprovider.instance.client.destroy
 				end
 			else
-				abort('Arguments --role or --environment is missing') 
+				puts 'Unable to set_node arguments --role or --environment is missing'
 			end
 		end
 

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.22'
+  s.version     = '0.0.23'
   s.date        = '2013-04-05'
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.summary     = "Veronic, a simple cloud deployer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -100,6 +100,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - README.md
 - bin/veronic
 - lib/config/config.rb