ec2launcher 1.0.10 → 1.0.11

data/lib/ec2launcher/dsl/email_notification.rb

@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+
+module EC2Launcher
+  module DSL
+    module EmailNotifications
+      attr_reader :email_notifications
+
+      def email_notification(&block)
+        notifications = EC2Launcher::DSL::EmailNotification.new
+        notifications.instance_exec(&block)
+        @email_notifications = notifications
+      end
+    end
+
+    class EmailNotification
+      def initialize()
+      end
+
+      def from(*from)
+        if from.empty?
+          @from
+        else
+          @from = from[0]
+          self
+        end
+      end
+
+      def to(*to)
+        if to.empty?
+          @to
+        else
+          @to = to[0]
+          self
+        end
+      end
+
+      def ses_access_key(*ses_access_key)
+        if ses_access_key.empty?
+          @ses_access_key
+        else
+          @ses_access_key = ses_access_key[0]
+          self
+        end
+      end
+
+      def ses_secret_key(*ses_secret_key)
+        if ses_secret_key.empty?
+          @ses_secret_key
+        else
+          @ses_secret_key = ses_secret_key[0]
+          self
+        end
+      end
+
+      def to_json(*a)
+        {
+          "from" => @from,
+          "to" => @to,
+          "ses_access_key" => @ses_access_key,
+          "ses_secret_key" => @ses_secret_key
+        }.to_json(*a)
+      end
+    end
+  end
+end

data/lib/ec2launcher/dsl/environment.rb

@@ -0,0 +1,221 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'ec2launcher/dsl/email_notification'
+require 'ec2launcher/security_group_handler'
+
+module EC2Launcher
+	module DSL
+		class Environment
+			include EC2Launcher::DSL::EmailNotifications
+			include EC2Launcher::SecurityGroupHandler
+
+			attr_reader :name
+			attr_reader :precommands
+			attr_reader :postcommands
+
+			def initialize()
+				@aliases = []
+				@email_notifications = nil
+				@gems = []
+				@packages = []
+				@precommands = []
+				@postcommands = []
+				@roles = []
+				@security_groups = {}
+			end
+
+			def environment(name)
+				@name = name
+				yield self
+				self
+			end
+
+			def aws_keyfile(*aws_keyfile)
+				if aws_keyfile.empty?
+					@aws_keyfile
+				else
+					@aws_keyfile = aws_keyfile[0]
+					self
+				end
+			end
+
+			def aliases(*aliases)
+				if aliases.empty?
+					@aliases
+				else
+					if aliases[0].kind_of? String
+						@aliases = [ aliases[0] ]
+					else
+						@aliases = aliases[0]
+					end
+				end
+			end
+
+			def ami_name(*ami_name)
+				if ami_name.empty?
+					@ami_name
+				else
+					if ami_name[0].kind_of? String
+						@ami_name = /#{ami_name[0]}/
+					else
+						@ami_name = ami_name[0]
+					end
+					self
+				end
+			end
+
+			def availability_zone(*zone)
+				if zone.empty?
+					@availability_zone
+				else
+					@availability_zone = zone[0].to_s
+					self
+				end
+			end
+
+			def chef_server_url(*server_url)
+				if server_url.empty?
+					@chef_server_url
+				else
+					@chef_server_url = server_url[0]
+					self
+				end
+			end
+
+			def chef_validation_pem_url(*chef_validation_pem_url)
+				if chef_validation_pem_url.empty?
+					@chef_validation_pem_url
+				else
+					@chef_validation_pem_url = chef_validation_pem_url[0]
+					self
+				end
+			end
+
+			def domain_name(*domain_name)
+				if domain_name.empty?
+					@domain_name
+				else
+					@domain_name = domain_name[0]
+					self
+				end
+			end
+
+			def gems(*gems)
+				if gems.empty?
+					@gems
+				else
+					@gems = gems[0]
+					self
+				end
+			end
+
+			def inherit(*inherit_type)
+				if inherit_type.empty?
+					@inherit_type
+				else
+					@inherit_type = inherit_type[0]
+				end
+			end
+
+			def key_name(*key)
+				if key.empty?
+					@key_name
+				else
+					@key_name = key[0]
+					self
+				end
+			end
+
+			def packages(*packages)
+				if packages.empty?
+					@packages
+				else
+					@packages = packages[0]
+					self
+				end
+			end
+
+			def precommand(*command)
+				@precommands << command[0]
+			end
+
+			def postcommand(*command)
+				@postcommands << command[0]
+			end
+
+			def roles(*roles)
+				if roles.empty?
+					@roles
+				else
+					@roles = [] if @roles.nil?
+					if roles[0].kind_of? Array
+						@roles += roles[0]
+					else
+						@roles = []
+						@roles << roles[0]
+					end
+					self
+				end
+			end
+
+			def short_name(*short_name)
+				if short_name.empty?
+					@short_name
+				else
+					@short_name = short_name[0]
+					self
+				end
+			end
+
+			def subnet(*subnet)
+				if subnet.empty?
+					@subnet
+				else
+					@subnet = subnet[0]
+					self
+				end
+			end
+
+			# Takes values from the other environment and merges them into this one
+			def merge(other_env)
+				@name =other_env.name
+
+				@gems += other_env.gems unless other_env.gems.nil?
+				@packages += other_env.packages unless other_env.packages.nil?
+				@roles += other_env.roles unless other_env.roles.nil?
+				@precommands += other_env.precommands unless other_env.precommands.nil?
+				@postcommands += other_env.postcommands unless other_env.postcommands.nil?
+				unless other_env.security_groups.nil?
+					other_env.security_groups.keys.each do |key|
+						@security_groups[key] = [] if @security_groups[key].nil?
+						@security_groups[key] += other_env.security_groups[key]
+					end
+				end
+
+				@aliases = other_env.aliases.nil? ? nil : other_env.aliases
+
+				@ami_name = other_env.ami_name unless other_env.ami_name.nil?
+				@aws_keyfile = other_env.aws_keyfile unless other_env.aws_keyfile.nil?
+				@availability_zone = other_env.availability_zone unless other_env.availability_zone.nil?
+				@chef_server_url = other_env.chef_server_url unless other_env.chef_server_url.nil?
+				@chef_validation_pem_url = other_env.chef_validation_pem_url unless other_env.chef_validation_pem_url.nil?
+				@domain_name = other_env.domain_name unless other_env.domain_name.nil?
+				@email_notifications = other_env.email_notifications unless other_env.email_notifications.nil?
+				@key_name = other_env.key_name unless other_env.key_name.nil?
+				@subnet = other_env.subnet unless other_env.subnet.nil?
+				@short_name = other_env.short_name unless other_env.short_name.nil?
+		end
+
+			def load(dsl)
+				self.instance_eval(dsl)
+				self
+			end
+
+			def self.load(dsl)
+				env = EC2Launcher::DSL::Environment.new.instance_eval(dsl)
+				env
+			end
+		end
+	end
+end

data/lib/ec2launcher/hostname_generator.rb

@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'aws-sdk'
+
+module EC2Launcher
+  # Helper class to generate sequential, numbered host names
+  class HostnameGenerator
+    # 
+    # @param [AWS::EC2] ec2 EC2 object used to query for existing instances
+    # @param [EC2Launcher::Environment] environment Environment to use for generating host names
+    # @param [EC2Launcher::Application] application Application to use for generating hostn ames
+    def initialize(ec2, environment, application)
+      @ec2 = ec2
+      @server_name_cache = nil
+
+      @prefix = application.basename
+      @prefix ||= application.name
+
+      @env_suffix = environment.short_name
+      @env_suffix ||= environment.name
+      
+      @suffix = @env_suffix
+      unless application.name_suffix.nil?
+        @suffix = "#{application.name_suffix}.#{@env_suffix}"
+      end
+
+      @host_number_regex = Regexp.new("#{@prefix}(\\d+)[.]#{@suffix.gsub(/[.]/, "[.]")}.*")
+
+      # Load and cache instance names
+      load_instances(@prefix, @suffix)
+    end
+
+    # Generates a new host name and automatically caches it
+    # so that future requests don't use the same name.
+    def generate_hostname()
+      # Find next host number
+      host_number = get_next_host_number()
+
+      # Build short host name
+      short_name = "#{@prefix}#{host_number}.#{@suffix}"
+
+      # Cache the new hostname
+      @server_name_cache << short_name
+
+      short_name
+    end
+
+    def generate_long_name(short_hostname, domain_name = nil)
+      hostname = short_hostname
+      unless domain_name.nil?
+        hostname += ".#{domain_name}"
+      end
+
+      hostname
+    end
+
+    def generate_short_name(long_name, domain_name = nil)
+      short_hostname = long_name
+      unless domain_name.nil?
+        short_hostname = long_name.gsub(/.#{domain_name}/, '')
+      end
+      short_hostname
+    end
+
+    private
+
+    # Loads and caches instance host names
+    def load_instances(prefix, suffix)
+      @server_name_cache = []
+      AWS.memoize do
+        server_instances = @ec2.instances.filter("tag:Name", "#{prefix}*#{suffix}*")
+        server_instances.each do |i|
+          next if i.status == :terminated
+          @server_name_cache << i.tags[:Name]
+        end
+      end
+    end
+
+    # Determines the next available number for a host name
+    def get_next_host_number()
+      highest_server_number = 0
+      lowest_server_number = 32768
+      
+      server_numbers = []
+
+      @server_name_cache.each do |server_name|
+        unless @host_number_regex.match(server_name).nil?
+          server_num = $1.to_i
+          server_numbers << server_num
+        end
+      end
+      highest_server_number = server_numbers.max
+    
+      # If the highest number server is less than 10, just add
+      # 1 to it. Otherwise, find the first available
+      # server number starting at 1.
+      host_number = 0
+      if highest_server_number.nil?
+        host_number = 1
+      elsif highest_server_number < 10
+        host_number = highest_server_number + 1
+      else
+        # Try to start over with 1 and find the
+        # first available host number
+        server_number_set = Set.new(server_numbers)
+        host_number = 1
+        while server_number_set.include?(host_number) do
+            host_number += 1
+        end
+      end
+
+      host_number
+    end
+  end
+end

data/lib/ec2launcher/init_options.rb

@@ -51,26 +51,30 @@ module EC2Launcher
         opts.separator ""
         opts.separator "Additional launch options:"
 
-        opts.on("--command [CMD]", "Additional command to run during launch sequence.") do |command|
+        opts.on("--command [CMD]", String, "Additional command to run during launch sequence.") do |command|
           @options.commands << command
         end
 
-        opts.on("-c", "--clone HOST", "Clone the latest snapshots from a specific host.") do |clone_host|
+        opts.on("--clone HOST", String, "Clone the latest snapshots from a specific host.") do |clone_host|
           @options.clone_host = clone_host
         end
 
+        opts.on("-c", "--count COUNT", Integer, "Number of new instances to launch.") do |count|
+          @options.count = count
+        end
+
         opts.separator ""
         opts.separator "Overrides:"
 
-        opts.on("-d", "--directory DIRECTORY", "Location of configuration directory. Defaults to current directory.") do |directory|
+        opts.on("-d", "--directory DIRECTORY", String, "Location of configuration directory. Defaults to current directory.") do |directory|
           @options.directory = directory
         end
 
-        opts.on("-h", "--hostname NAME", "The name for the new server.") do |hostname|
+        opts.on("-h", "--hostname NAME", String, "The name for the new server.") do |hostname|
           @options.hostname = hostname
         end
 
-        opts.on("-u", "--chef-validation-url", "URL for the Chef validation pem file.") do |chef_validation_url|
+        opts.on("-u", "--chef-validation-url", String, "URL for the Chef validation pem file.") do |chef_validation_url|
           @options.chef_validation_url = chef_validation_url
         end
 
@@ -93,11 +97,11 @@ module EC2Launcher
         opts.separator ""
         opts.separator "AWS Security Options:"
 
-        opts.on("--access-key KEY", "Amazon access key. Overrides AWS_ACCESS_KEY environment variable.") do |access_key|
+        opts.on("--access-key KEY", String, "Amazon access key. Overrides AWS_ACCESS_KEY environment variable.") do |access_key|
           @options.access_key = access_key
         end
 
-        opts.on("--secret SECRET", "Amazon secret access key. Overrides AWS_SECRET_ACCESS_KEY environment variable.") do |secret|
+        opts.on("--secret SECRET", String, "Amazon secret access key. Overrides AWS_SECRET_ACCESS_KEY environment variable.") do |secret|
           @options.secret = secret
         end
 
@@ -130,6 +134,7 @@ module EC2Launcher
       @options.application = nil
       @options.commands = []
       @options.clone_host = nil
+      @options.count = 1
 
       @options.ami_id = nil
       @options.hostname = nil
@@ -156,6 +161,12 @@ module EC2Launcher
           help
           exit 1
         end
+
+        if ! @options.hostname.nil? && @options.count > 1
+          puts "Cannot specify both a hostname ['#{@options.hostname}'] and multiple instances [#{@options.count}]."
+          puts
+          exit 1
+        end
       end
 
       @options

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module Ec2launcher
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end