veronic 0.0.24 → 0.0.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQxNzQ2MmVkYTYzMjQyZGRmMzJiZjM4Y2QyMjRmNjU4ZTJjYWViYQ==
+    MWFmZDQxMDAyNTQxZDUzN2JmY2M1ZWMyZjJkM2FlOGU2ZWM2NTU4ZQ==
   data.tar.gz: !binary |-
-    ZTNkMWQ5ZWY0NmZhMmNiMTMyMmI5NTc4MGI2NzU4MjQzMjRhZWUxMw==
+    Y2Y1MzYyMGU5MjI3M2ViY2JlNGUwYzY3MDE0MmQwZjkxM2RlMDA1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmQ4MTY1ZDlkYjY5NjdjN2QxMDhlY2RjYzk2OWMyNjA1MzBkN2E0MTBmNDQ4
-    ZWVjZjA0NTI5ZTAxMTk2MTlmNGJlYmI1NjdmOGE1NmVhM2VhNTJiZTk2MzI5
-    MGUyMjFiMGNkZGUxMmRhYTUyOGE3NjU3MTlkMzVkZjEyYmMxYjE=
+    MDA0ZTc4ODVmZDZkZTM0NWFkYzEzNTdiMDcyZTdmNWE0ZTU4NzZjMWE5MDY2
+    MTk5NTM1MzM3N2U0NGJkODg5NTg0NGE1YmQ5YjBlOTMzZDJmNTMxOWQ2OTdj
+    MmYzZGQ4N2UzMWRhYzg3NGU0MjIyYWM1MTZhZGU2YjYwMTA4MjU=
   data.tar.gz: !binary |-
-    NzUwZDcyZDAwOTIxNGRlNjc1YjcyNmMwNDU1MmMzZjdlYmE1YTVjMWI1NWJi
-    NjA5YjJmYjM0M2RlNWY4NjUzNjk1OTdkNGRlYTQwMGM2NmY4MmE2MDc4ZjY5
-    ODkzMmNjNWM2ZGE1NmZmNDkwMTg1NDk3NmUwMzQyZjNiNmRmM2Q=
+    M2UwZjI2OTJmZDlkNTM5N2E1ZTFkYWE5N2FjM2MxNTljNzExZmNhNDUwM2Mx
+    Njk0NmM2NmJhMjBiZTM4M2U0MjZjZjEzM2U0MzM4NDc0N2Y4ZDU5ODdmZjg0
+    MzQ1OGU4NTEwZjkyYThjNGNmZGJjYjRiNWVmNDdjNTM3ZGQ5NTU=

data/bin/veronic

@@ -154,11 +154,11 @@ opt_parser.parse!
 
 case ARGV[0] || ENV['action']
 when "create"
-	Veronic::Deployer.new(options).create
+  Veronic::Deployer.new(options).create
 when "bootstrap"
   Veronic::Deployer.new(options).bootstrap
 when "destroy"
-	Veronic::Deployer.new(options).destroy
+  Veronic::Deployer.new(options).destroy
 when "deploy"
   Veronic::Deployer.new(options).deploy
 when "search_and_deploy"
@@ -170,11 +170,11 @@ when "deploy_apps"
 when "run_tests"
   Veronic::Deployer.new(options).run_tests
 when "update_instance_dns"
-	Veronic::Deployer.new(options).update_instance_dns
+  Veronic::Deployer.new(options).update_instance_dns
 when "stop"
-	Veronic::Deployer.new(options).stop
+  Veronic::Deployer.new(options).stop
 when "start"
-	Veronic::Deployer.new(options).start
+  Veronic::Deployer.new(options).start
 when "list"
   Veronic::Deployer.new(options).instances_list
 when "status"
@@ -183,5 +183,5 @@ when "create_image"
   image = Veronic::Deployer.new(options).create_image
   puts "ID: #{image.id}", "NAME: #{image.name}", "STATE: #{image.state}"
 else
-	puts opt_parser
+  puts opt_parser
 end

data/lib/config/config.rb

@@ -3,9 +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.exists?('./veronic.yml') ? './veronic.yml' : nil
-			if config_file || File.exists?(options[:config_file])
-				config_from_file = YAML.load_file(options[:config_file] || config_file)
+			default_config_file = "/etc/veronic/veronic.yml"
+			config_from_file = Hash.new(nil)
+			if options[:config_file] && File.exists?(options[:config_file])
+				config_from_file = YAML.load_file(options[:config_file])
+			elsif File.exists?(default_config_file)
+				config_from_file = YAML.load_file(default_config_file)
 			end
 
 			@dnsprovider                      = options[:dnsprovider]                      || config_from_file['dnsprovider'] || :route53
@@ -33,7 +36,7 @@ module Veronic
 			@ssh_port                         = options[:ssh_port]                         || config_from_file['ssh_port']	|| 22
 			@role                             = options[:role]                             || config_from_file['role']
 			@flavor                           = options[:flavor]                           || config_from_file['flavor'] || 'm1.medium'
-			@security_groups                  = options[:security_groups].split(',')       || config_from_file['security_groups'].split(',')
+			@security_groups                  = (options[:security_groups] || 'default').split(',')       || (config_from_file['security_groups'] || 'default').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']

data/lib/providers/chefserver/client.rb

@@ -4,17 +4,18 @@ module Provider
 
 			def initialize(name)
 				@name = name
+				@logger = Veronic::Deployer.new().logger
 			end
 
 			def destroy(name=nil)
-				puts "Destroying client #{@name} from chef-server ..."
+				@logger.info "Destroying client #{@name} from chef-server ..."
 				knife = Chef::Knife.new()
 				knife.config[:yes] = true
 				if self.exists?
 					knife.delete_object(Chef::ApiClient, @name)
-					puts "Client #{@name} destroy from chef-server"
+					@logger.info "Client #{@name} destroy from chef-server"
 				else
-					puts "Unabled to find client #{@name}"
+					@logger.info "Unabled to find client #{@name}"
 				end
 			end
 

data/lib/providers/chefserver/instance.rb

@@ -1,124 +1,125 @@
 module Provider
-	class ChefServer
-		class Instance
-
-			def initialize(config)
-				@access_key_id                                = config[:cloudprovider_access_key_id]
-				@secret_access_key                            = config[:cloudprovider_secret_access_key]
-				@name                                         = config[:name]
-				@image                                        = config[:image]
-				@security_groups                              = config[:security_groups]
-				@ssh_user                                     = config[:ssh_user]
-				@ssh_port                                     = config[:ssh_port]
-				@identity_file                                = config[:identity_file]
-				@aws_ssh_key_id                               = config[:aws_ssh_key_id]
-				@environment                                  = config[:environment]
+  class ChefServer
+    class Instance
+
+      def initialize(config)
+        @access_key_id                                = config[:cloudprovider_access_key_id]
+        @secret_access_key                            = config[:cloudprovider_secret_access_key]
+        @name                                         = config[:name]
+        @image                                        = config[:image]
+        @security_groups                              = config[:security_groups]
+        @ssh_user                                     = config[:ssh_user]
+        @ssh_port                                     = config[:ssh_port]
+        @identity_file                                = config[:identity_file]
+        @aws_ssh_key_id                               = config[:aws_ssh_key_id]
+        @environment                                  = config[:environment]
         @role                                         = config[:role]
-				@roles                                        = "role[#{config[:role]}]"
-				@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
-				Chef::Config[:knife][:aws_secret_access_key]  = @secret_access_key
-				Chef::Config[:knife][:region]                 = @region
-				Chef::Config[:knife][:availability_zone]      = @availability_zone
-				Chef::Config[:knife][:log_level]              = @verbose
-			end
-
-			def create
-				puts "Creating ec2 server #{@name} ..."
-				
-				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(recursive_count=0)
-				puts "Bootstrapping ec2 server #{@name} ..."
-				
-				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 => e
-					puts "Creation of #{@name} failed"
-					puts "Message: " + e.inspect
-					puts "Stacktrace:#{e.backtrace.map {|l| "  #{l}\n"}.join}"
-					self.destroy([node.server.id]) if node.server
-					if recursive_count < 10
-						puts "Creation of #{@name} retrying #{recursive_count}"
-						self.bootstrap(recursive_count+=1) 
-					else
-						puts "Creation of #{@name} failed after #{recursive_count} retry"
-						exit 1
-					end
-				end
-			end
-
-			def destroy(instance_ids=[])
-				puts "Deleting ec2 server #{@name} ..."
-
-				node = Chef::Knife::Ec2ServerDelete.new()
-
-				node.config[:purge]           = true
-				node.config[:chef_node_name]  = @name
-				node.config[:yes]             = true
-				node.name_args                = instance_ids
-
-				puts node.config
-				node.run
-				node.destroy_item(Chef::Node, @name, "node")
-				node.destroy_item(Chef::ApiClient, @name, "client")
-			end
-
-			def set_role
-				node = Chef::Knife::NodeRunListAdd.new()
-				node.name_args = [@name, @roles]
-				node.run
-			end
-
-			def set_environment
-				node = Chef::Node.new.tap do |n|
-					n.name( @name )
+        @roles                                        = "role[#{config[:role]}]"
+        @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
+        Chef::Config[:knife][:aws_secret_access_key]  = @secret_access_key
+        Chef::Config[:knife][:region]                 = @region
+        Chef::Config[:knife][:availability_zone]      = @availability_zone
+        Chef::Config[:knife][:log_level]              = @verbose
+        @logger = Veronic::Deployer.new().logger
+      end
+
+      def create
+        @logger.info "Creating ec2 server #{@name} ..."
+        
+        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
+
+        @logger.info node.config
+        node.run
+      end
+
+      def bootstrap(recursive_count=0)
+        @logger.info "Bootstrapping ec2 server #{@name} ..."
+        
+        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
+
+        @logger.info node.config
+        begin
+          node.run
+        rescue => e
+          @logger.info "Creation of #{@name} failed"
+          @logger.info "Message: " + e.inspect
+          @logger.info "Stacktrace:#{e.backtrace.map {|l| "  #{l}\n"}.join}"
+          self.destroy([node.server.id]) if node.server
+          if recursive_count < 10
+            @logger.info "Creation of #{@name} retrying #{recursive_count}"
+            self.bootstrap(recursive_count+=1) 
+          else
+            @logger.info "Creation of #{@name} failed after #{recursive_count} retry"
+            exit 1
+          end
+        end
+      end
+
+      def destroy(instance_ids=[])
+        @logger.info "Deleting ec2 server #{@name} ..."
+
+        node = Chef::Knife::Ec2ServerDelete.new()
+
+        node.config[:purge]           = true
+        node.config[:chef_node_name]  = @name
+        node.config[:yes]             = true
+        node.name_args                = instance_ids
+
+        @logger.info node.config
+        node.run
+        node.destroy_item(Chef::Node, @name, "node")
+        node.destroy_item(Chef::ApiClient, @name, "client")
+      end
+
+      def set_role
+        node = Chef::Knife::NodeRunListAdd.new()
+        node.name_args = [@name, @roles]
+        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
+        @logger.info "Environment: #{@environment}"
+      end
 
-			def ssh(query, cmd_line, manual)
-				knife_ssh = Chef::Knife::Ssh.new()
+      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]      = @verbose
+        knife_ssh.config[:manual]         = manual
+        knife_ssh.config[:ssh_user]       = @ssh_user
+        knife_ssh.config[:identity_file]  = @identity_file
+        knife_ssh.config[:log_level]      = @verbose
         
         unless manual
           if @environment
@@ -129,18 +130,18 @@ module Provider
           end
         end
 
-				knife_ssh.name_args = [query, cmd_line]
-				sys_status =  knife_ssh.run
-			end
+        knife_ssh.name_args = [query, cmd_line]
+        sys_status =  knife_ssh.run
+      end
 
-			def client
-				Provider::ChefServer::Client.new(@name)
-			end
+      def client
+        Provider::ChefServer::Client.new(@name)
+      end
 
-			def delete_client_key(node, client_key="/etc/chef/client.pem")
-				puts "Deleting client_key #{client_key}"
-				self.ssh(node, "sudo chef-client -W > /dev/null ; sudo rm -f #{client_key}", true)
-			end
-		end
-	end
+      def delete_client_key(node, client_key="/etc/chef/client.pem")
+        @logger.info "Deleting client_key #{client_key}"
+        self.ssh(node, "sudo chef-client -W > /dev/null ; sudo rm -f #{client_key}", true)
+      end
+    end
+  end
 end

data/lib/providers/ec2/image.rb

@@ -7,6 +7,7 @@ module Provider
 				@role = role
 				@ami_name = ami_name
 				@owner_id = owner_id
+				@logger = Veronic::Deployer.new().logger
 			end
 
 			def id
@@ -16,12 +17,12 @@ module Provider
 			end
 
 			def detroy
-				puts "Destroying image #{@ami_name} ..."
+				@logger.info "Destroying image #{@ami_name} ..."
 				if get_image
 					begin
 						get_image.deregister
 						sleep 5
-						puts "Image #{@ami_name} destroyed"
+						@logger.info "Image #{@ami_name} destroyed"
 					rescue
 						return false
 					end
@@ -35,24 +36,24 @@ module Provider
 
 			def get_image
 				@get_image || AWS.memoize do
-          puts "Getting image #{@ami_name}"
+          @logger.info "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}"
+              @logger.info "Unabled to found image #{@ami_name}"
 							return false
 						end
 					else
 						while my_image.exists? == false && my_image.state != :failed
-							print "."
+							@logger.info "."
 							sleep 1
 						end
 						while my_image.state == :pending && my_image.state != :failed
-							print "."
+							@logger.info "."
 							sleep 1
 						end
-						puts ""
+						@logger.info ""
 					end
           @get_image = my_image
 					return @get_image

data/lib/providers/ec2/instance.rb

@@ -7,24 +7,25 @@ module Provider
 				@name = name
 		    @instance = instance
         @ami_name = image || name
+        @logger = Veronic::Deployer.new().logger
 		  end
 
 			def stop
-				print "Stopping instance #{@name}..."
+				@logger.info "Stopping instance #{@name}..."
 				if self.exist?
 					@instance.stop
 					i = 0
 					while self.status != :stopped
-            print "." ; sleep 3 ; i += 1
+            @logger.info "." ; sleep 3 ; i += 1
 						return false if i > 120
 					end
-          puts "\nInstance #{@name} is stopped"
+          @logger.info "\nInstance #{@name} is stopped"
 				end
 				return true
 			end
 
 			def start
-				print "Starting instance #{@name}..."
+				@logger.info "Starting instance #{@name}..."
 				if self.exist?
 					while self.status == :stopping
 						sleep 2
@@ -32,21 +33,21 @@ module Provider
 					@instance.start
 					i = 0 					
 					while self.status != :running
-						print "." ; sleep 3 ; i += 1
+						@logger.info "." ; sleep 3 ; i += 1
 						return false if i > 120
 					end
-          puts "\nInstance #{@name} is started"
+          @logger.info "\nInstance #{@name} is started"
 				end
         return true
 			end
 
 			def exists?
-				puts "Checking for ec2 server #{@name} ..."
+				@logger.info "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"
+					@logger.info "Instance #{@name} found"
 					return true
 				else
-					puts "Instance #{@name} is misssing"
+					@logger.info "Instance #{@name} is misssing"
 					return false
 				end
 			end
@@ -78,24 +79,24 @@ module Provider
 			end
 
 			def create_image
-				puts "Create image #{@ami_name}"
+				@logger.info "Create image #{@ami_name}"
 				new_image = @instance.create_image(@ami_name, { :no_reboot => true })
 				while new_image.exists? == false && new_image.state != :failed
-					print "."
+					@logger.info "."
 					sleep 1
 				end
 				while new_image.state == :pending && new_image.state != :failed
-					print "."
+					@logger.info "."
 					sleep 1
 				end
-				puts ""
+				@logger.info ""
 				return new_image
 			end
 
 			def tags(hash={})
-				puts "Tagging instance ..."
+				@logger.info "Tagging instance ..."
 				hash.keys.each do |k|
-					puts k + ': ' + hash[k]
+					@logger.info k + ': ' + hash[k]
 					@instance.tags[k] = hash[k]
 				end
 			end

data/lib/providers/route53/record.rb

@@ -8,6 +8,7 @@ module Route53
 				@values = values
 				@type =  type
 				@ttl = ttl
+				@logger = Veronic::Deployer.new().logger
 			end
 			
 			def get
@@ -23,13 +24,13 @@ module Route53
 			end
 
 			def wait_set
-				print "Waitting for record { name: #{@name}, value: #{@values} }..."
+				@logger.info "Waitting for record { name: #{@name}, value: #{@values} }..."
 				while !self.match?
-					print "."
+					@logger.info "."
 					self.set
 					sleep 5
 				end
-				puts "\nRecord { name: #{@name}, value: #{@values} } updated"
+				@logger.info "\nRecord { name: #{@name}, value: #{@values} } updated"
 			end
 
 			def set

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.24'
+  s.version     = '0.0.26'
   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.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Gabriel Klein