ec2launcher 1.0.9 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.10
+
+* Support multiple "gem" definitions in applications.
+* Fixed module reference to InitOptions.
+* Move run_with_backoff code into separate module for reusability.
+
 ## 1.0.9
 
 * Remove "default" environment.

data/bin/ec2launcher

@@ -7,7 +7,7 @@ require 'erb'
 require 'ec2launcher'
 require "ec2launcher/init_options"
 
-opt_parser = InitOptions.new
+opt_parser = EC2Launcher::InitOptions.new
 opt_parser.parse(ARGV)
 
 if opt_parser.command == "init"

data/lib/ec2launcher/application.rb

@@ -3,260 +3,293 @@
 #
 require 'ec2launcher/block_device'
 require 'ec2launcher/email_notification'
+require 'ec2launcher/security_group_handler'
 
-class ApplicationDSL
-	attr_accessor :applications
+module EC2Launcher
+	# Wrapper class to handle loading Application blocks.
+	class ApplicationDSL
+		attr_accessor :applications
 
-	def initialize
-		self.applications = []
-	end
+		def initialize
+			self.applications = []
+		end
 
-	def application(name, &block)
-		application = Application.new(name)
-		applications << application
-		application.instance_eval &block
-		application
-	end
+		def application(name, &block)
+			application = Application.new(name)
+			applications << application
+			application.instance_eval &block
+			application
+		end
 
-	def self.execute(dsl)
-		new.tap do |context|
-			context.instance_eval(dsl)
+		def self.execute(dsl)
+			new.tap do |context|
+				context.instance_eval(dsl)
+			end
 		end
 	end
-end
 
-class Application
-	include EmailNotifications
+	# Represents a single application stack.
+	class Application
+		include EC2Launcher::EmailNotifications
+		include EC2Launcher::SecurityGroupHandler
 
-	attr_reader :name
+		attr_reader :name
 
-	def initialize(name)
-		@name = name
-		@email_notifications = nil
-	end
+		def initialize(name)
+			@name = name
+			@email_notifications = nil
+		end
 
-	def application(name)
-		@name = name
-		yield self
-		self
-	end
+		def application(name)
+			@name = name
+			yield self
+			self
+		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]}/
+		# Name of the AMI to use for new instances. Optional.
+		# Can be either a string or a regular expression.
+		#
+		# @param [Array, nil] Either an array of parameters or nil to return the AMI name.
+		def ami_name(*ami_name)
+			if ami_name.empty?
+				@ami_name
 			else
-				@ami_name = ami_name[0]
+				if ami_name[0].kind_of? String
+					@ami_name = /#{ami_name[0]}/
+				else
+					@ami_name = ami_name[0]
+				end
+				self
 			end
-			self
 		end
-	end
 
-	def availability_zone(*zone)
-		if zone.empty?
-			@availability_zone
-		else
-			@availability_zone = zone[0].to_s
-			self
+		# Name of the availability zone to use for new instances. Optional.
+		# Must be one of EC2Launcher::AVAILABILITY_ZONES.
+		def availability_zone(*zone)
+			if zone.empty?
+				@availability_zone
+			else
+				@availability_zone = zone[0].to_s
+				self
+			end
 		end
-	end
 
-	def basename(*name)
-		if name.empty?
-			@basename
-		else
-			@basename = name[0]
-			self
+		# Defines a shorter name when building a host name for new instances. Optional.
+		# By default, new instances are named using the full application name. If you 
+		# specify basename, it will be used instead. Typically, this is used if you 
+		# want a shorter version of the full application name.
+		def basename(*name)
+			if name.empty?
+				@basename
+			else
+				@basename = name[0]
+				self
+			end
 		end
-	end
 
-	def block_devices(*block_device_data)
-		if block_device_data.empty?
-			@block_devices
-		else
-			self
+		def block_devices(*block_device_data)
+			if block_device_data.empty?
+				@block_devices
+			else
+				self
+			end
 		end
-	end
 
-	def block_device(&block)
-		@block_devices = [] if @block_devices.nil?
-		device = BlockDevice.new
-		device.instance_exec(&block)
-		@block_devices << device
-	end
+		def block_device(&block)
+			@block_devices = [] if @block_devices.nil?
+			device = EC2Launcher::BlockDevice.new
+			device.instance_exec(&block)
+			@block_devices << device
+		end
 
-	def elb(*elb)
-		if elb.empty?
-			@elb
-		else
-			@elb = Hash.new if @elb.nil?
-			if elb[0].kind_of? Hash
-				elb[0].keys.each {|key| @elb[key] = elb[0][key]}
+		# Indicates the Amazon Elastic Load Balancer to which new instances should be
+		# attached after launch. Optional.
+		#
+		# The value can be either a String, indicating the name of the ELB, or a Hash
+		# that maps environment names to ELB names.
+		def elb(*elb)
+			if elb.empty?
+				@elb
 			else
-				@elb["default"] = elb[0].to_s
+				@elb = Hash.new if @elb.nil?
+				if elb[0].kind_of? Hash
+					elb[0].keys.each {|key| @elb[key] = elb[0][key]}
+				else
+					@elb["default"] = elb[0].to_s
+				end
+				self
 			end
-			self
 		end
-	end
 
-	def elb_for_environment(environment)
-		elb_name = @elb[environment]
-		elb_name ||= @elb["default"]
-		elb_name
-	end
+		# Retrieves the ELB name for a given environment.
+		def elb_for_environment(environment)
+			elb_name = @elb[environment]
+			elb_name ||= @elb["default"]
+			elb_name
+		end
 
-	def environment_roles(*data)
-		if data.empty?
-			@environment_roles
-		else
-			@environment_roles = Hash.new if @environment_roles.nil?
-			env_name = data[0]
-			env_roles = data[1]
+		# Defines an Array of Chef roles that should be applied to new
+		# instances for a specific environment. Can be specified multiple times.
+		#
+		# Expects two parameters:
+		#   * Name of an environment
+		#   * Either the name of a single Chef role or an Array of Chef roles
+		def environment_roles(*data)
+			if data.empty?
+				@environment_roles
+			else
+				@environment_roles = Hash.new if @environment_roles.nil?
+				env_name = data[0]
+				env_roles = data[1]
 
-			environment_data = @environment_roles[env_name]
-			environment_data ||= []
+				environment_data = @environment_roles[env_name]
+				environment_data ||= []
 
-			if env_roles.kind_of? Array
-				environment_data += env_roles
-			else
-				environment_data << env_roles
-			end
-			@environment_roles[env_name] = environment_data
+				if env_roles.kind_of? Array
+					environment_data += env_roles
+				else
+					environment_data << env_roles
+				end
+				@environment_roles[env_name] = environment_data
 
-			self
+				self
+			end
 		end
-	end
 
-	def gems(*gems)
-		if gems.empty?
-			@gems
-		else
-			@gems = gems[0]
-			self
+		# Gems to install. Optional.
+		#
+		# Expects either a single String naming a gem to install or
+		# an Array of gems.
+		#
+		# Can be specified multiple times.
+		def gems(*gems)
+			if gems.empty?
+				@gems
+			else
+				@gems = [] if @gems.nil?
+				if gems[0].kind_of? Array
+					@gems += gems[0]
+				else
+					@gems << gems[0]
+				end
+				self
+			end
 		end
-	end
 
-	def inherit(*inherit_type)
-		if inherit_type.empty?
-			@inherit_type
-		else
-			@inherit_type = inherit_type[0]
+		# Indicates that this application should inherit all of its settings from another named application.
+		# Optional.
+		def inherit(*inherit_type)
+			if inherit_type.empty?
+				@inherit_type
+			else
+				@inherit_type = inherit_type[0]
+			end
 		end
-	end
 
-	def instance_type(*type_name)
-		if type_name.empty?
-			@instance_type
-		else
-			@instance_type = type_name[0]
-			self
+		# The Amazon EC2 instance type that should be used for new instances.
+		# Must be one of EC2Launcher::INSTANCE_TYPES.
+		def instance_type(*type_name)
+			if type_name.empty?
+				@instance_type
+			else
+				@instance_type = type_name[0]
+				self
+			end
 		end
-	end
 
-	# Takes values from the other server type and merges them into this one
-	def merge(other_server)
-		@name = other_server.name
-		@ami_name = other_server.ami_name unless other_server.ami_name.nil?
-		@availability_zone = other_server.availability_zone unless other_server.availability_zone.nil?
-		@basename = other_server.basename unless other_server.basename.nil?
-		other_server.block_devices.each {|bd| @block_devices << bd } unless other_server.block_devices.nil?
-		other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } unless other_server.elb.nil?
-		@instance_type = other_server.instance_type unless other_server.instance_type.nil?
-		@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
-		other_server.roles.each {|role| @roles << role } unless other_server.roles.nil?
-		unless other_server.security_groups.nil?
-			other_server.security_groups.keys.each do |env_name|
-				unless @security_groups.has_key? env_name
-					@security_groups[env_name] = []
+		# Takes values from the other server type and merges them into this one
+		def merge(other_server)
+			@name = other_server.name
+			@ami_name = other_server.ami_name unless other_server.ami_name.nil?
+			@availability_zone = other_server.availability_zone unless other_server.availability_zone.nil?
+			@basename = other_server.basename unless other_server.basename.nil?
+			other_server.block_devices.each {|bd| @block_devices << bd } unless other_server.block_devices.nil?
+			other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } unless other_server.elb.nil?
+			@instance_type = other_server.instance_type unless other_server.instance_type.nil?
+			@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
+			other_server.roles.each {|role| @roles << role } unless other_server.roles.nil?
+			unless other_server.security_groups.nil?
+				other_server.security_groups.keys.each do |env_name|
+					unless @security_groups.has_key? env_name
+						@security_groups[env_name] = []
+					end
+					other_server.security_groups[env_name].each {|sg| @security_groups[env_name] << sg }
 				end
-				other_server.security_groups[env_name].each {|sg| @security_groups[env_name] << sg }
 			end
 		end
-	end
 
-	def name_suffix(*suffix)
-		if suffix.empty?
-			@name_suffix
-		else
-			@name_suffix = suffix[0]
+		def name_suffix(*suffix)
+			if suffix.empty?
+				@name_suffix
+			else
+				@name_suffix = suffix[0]
+			end
 		end
-	end
 
-	def packages(*packages)
-		if packages.empty?
-			@packages
-		else
-			@packages = packages[0]
-			self
+		def packages(*packages)
+			if packages.empty?
+				@packages
+			else
+				@packages = packages[0]
+				self
+			end
 		end
-	end
 
-	def roles(*roles)
-		if roles.empty?
-			@roles
-		else
-			@roles = [] if @roles.nil?
-			if roles[0].kind_of? Array
-				@roles += roles[0]
+		def roles(*roles)
+			if roles.empty?
+				@roles
 			else
-				@roles = []
-				@roles << roles[0]
+				@roles = [] if @roles.nil?
+				if roles[0].kind_of? Array
+					@roles += roles[0]
+				else
+					@roles = []
+					@roles << roles[0]
+				end
+				self
 			end
-			self
 		end
-	end
 
-	def roles_for_environment(environment)
-		roles = []
-		roles += @roles unless @roles.nil?
+		def roles_for_environment(environment)
+			roles = []
+			roles += @roles unless @roles.nil?
 
-		unless @environment_roles.nil? || @environment_roles[environment].nil?
-			roles += @environment_roles[environment]
+			unless @environment_roles.nil? || @environment_roles[environment].nil?
+				roles += @environment_roles[environment]
+			end
+			roles
+		end
+
+		# Retrieves the list of Security Group names for the specified environment.
+		#
+		# @return [Array] Returns the list of security groups for the environment. Returns
+		#                 the security groups for the "defaukt" environment if the requested
+		#                 environment is undefined. Returns an empty Array if both the
+		#                 requested environment and "default" environment are undefined.
+		def security_groups_for_environment(environment)
+			groups = @security_groups[environment]
+			groups ||= @security_groups["default"]
+			groups ||= []
+			groups
 		end
-		roles
-	end
 
-	def security_groups(*groups)
-		if groups.empty?
-			@security_groups
-		else
-			@security_groups = Hash.new if @security_groups.nil?
-			if groups[0].kind_of? Array
-				@security_groups["default"] = groups[0]
-			elsif groups[0].kind_of? Hash
-				groups[0].keys.each {|key| @security_groups[key] = [ groups[0][key] ] }
+		def subnet(*subnet)
+			if subnet.empty?
+				@subnet
 			else
-				@security_groups["default"] = [ groups[0].to_s ]
+				@subnet = subnet[0]
+				self
 			end
-			self
 		end
-	end
-
-	def security_groups_for_environment(environment)
-		groups = @security_groups[environment]
-		groups ||= @security_groups["default"]
-		groups ||= []
-		groups
-	end
 
-	def subnet(*subnet)
-		if subnet.empty?
-			@subnet
-		else
-			@subnet = subnet[0]
+		def load(dsl)
+			self.instance_eval(dsl)
 			self
 		end
-	end
-
-	def load(dsl)
-		self.instance_eval(dsl)
-		self
-	end
 
-	def self.load(dsl)
-		env = Application.new.instance_eval(dsl)
-		env
+		def self.load(dsl)
+			env = Application.new.instance_eval(dsl)
+			env
+		end
 	end
 end

data/lib/ec2launcher/backoff_runner.rb

@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'aws-sdk'
+
+module EC2Launcher
+  # Helper module to run AWS requests.
+  module BackoffRunner
+  	# Runs an AWS request inside a Ruby block with an exponential backoff in case
+    # we exceed the allowed AWS RequestLimit.
+    #
+    # @param [Integer] max_time maximum amount of time to sleep before giving up.
+    # @param [Integer] sleep_time the initial amount of time to sleep before retrying.
+    # @param [message] message message to display if we get an exception.
+    # @param [Block] block Ruby code block to execute.
+    def run_with_backoff(max_time, sleep_time, message, &block)
+      if sleep_time > max_time
+        puts "AWS::EC2::Errors::RequestLimitExceeded ... failed #{message}"
+        return false
+      end
+      
+      begin
+        yield
+      rescue AWS::EC2::Errors::RequestLimitExceeded
+        puts "AWS::EC2::Errors::RequestLimitExceeded ... retrying #{message} in #{sleep_time} seconds"
+        sleep sleep_time
+        run_with_backoff(max_time, sleep_time * 2, message, &block)
+      end  
+      true
+    end
+
+  end
+end

data/lib/ec2launcher/block_device.rb

@@ -1,91 +1,94 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
-class BlockDevice
-	attr_reader :mount_point
-	attr_reader :name
 
-	def initialize()
-		@count = 1
-		@group = "root"
-		@user = "root"
-	end
+module EC2Launcher
+	class BlockDevice
+		attr_reader :mount_point
+		attr_reader :name
 
-	def is_raid?()
-		@raid_level.nil?
-	end
+		def initialize()
+			@count = 1
+			@group = "root"
+			@user = "root"
+		end
 
-	def count(*block_count)
-		if block_count.empty?
-			@count
-		else
-			@count = block_count[0]
-			self
+		def is_raid?()
+			@raid_level.nil?
 		end
-	end
 
-	def group(*group)
-		if group.empty?
-			@group
-		else
-			@group = group[0]
-			self
+		def count(*block_count)
+			if block_count.empty?
+				@count
+			else
+				@count = block_count[0]
+				self
+			end
 		end
-	end
 
-	def mount(*mount)
-		if mount.empty?
-			@mount
-		else
-			@mount_point = mount[0]
-			self
+		def group(*group)
+			if group.empty?
+				@group
+			else
+				@group = group[0]
+				self
+			end
 		end
-	end
 
-	def name(*name)
-		if name.empty?
-			@name
-		else
-			@name = name[0]
-			self
+		def mount(*mount)
+			if mount.empty?
+				@mount
+			else
+				@mount_point = mount[0]
+				self
+			end
 		end
-	end
 
-	def owner(*owner)
-		if owner.empty?
-			@owner
-		else
-			@owner = owner[0]
-			self
+		def name(*name)
+			if name.empty?
+				@name
+			else
+				@name = name[0]
+				self
+			end
 		end
-	end
 
-	def raid_level(*raid_level)
-		if raid_level.empty?
-			@raid_level
-		else
-			@raid_level = raid_level[0]
-			self
+		def owner(*owner)
+			if owner.empty?
+				@owner
+			else
+				@owner = owner[0]
+				self
+			end
 		end
-	end
 
-	def size(*volume_size)
-		if volume_size.empty?
-			@size
-		else
-			@size = volume_size[0].to_i
-			self
+		def raid_level(*raid_level)
+			if raid_level.empty?
+				@raid_level
+			else
+				@raid_level = raid_level[0]
+				self
+			end
 		end
-	end
 
-	def to_json(*a)
-		{
-			"name" => @name,
-			"count" => @count,
-			"raid_level" => @raid_level,
-			"mount_point" => @mount_point,
-			"owner" => @owner,
-			"group" => @group
-		}.to_json(*a)
+		def size(*volume_size)
+			if volume_size.empty?
+				@size
+			else
+				@size = volume_size[0].to_i
+				self
+			end
+		end
+
+		def to_json(*a)
+			{
+				"name" => @name,
+				"count" => @count,
+				"raid_level" => @raid_level,
+				"mount_point" => @mount_point,
+				"owner" => @owner,
+				"group" => @group
+			}.to_json(*a)
+		end
 	end
 end

data/lib/ec2launcher/email_notification.rb

@@ -1,62 +1,65 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
-module EmailNotifications
-  attr_reader :email_notifications
 
-  def email_notification(&block)
-    notifications = EmailNotification.new
-    notifications.instance_exec(&block)
-    @email_notifications = notifications
-  end
-end
+module EC2Launcher
+  module EmailNotifications
+    attr_reader :email_notifications
 
-class EmailNotification
-  def initialize()
+    def email_notification(&block)
+      notifications = EmailNotification.new
+      notifications.instance_exec(&block)
+      @email_notifications = notifications
+    end
   end
 
-  def from(*from)
-    if from.empty?
-      @from
-    else
-      @from = from[0]
-      self
+  class EmailNotification
+    def initialize()
     end
-  end
 
-  def to(*to)
-    if to.empty?
-      @to
-    else
-      @to = to[0]
-      self
+    def from(*from)
+      if from.empty?
+        @from
+      else
+        @from = from[0]
+        self
+      end
     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
+    def to(*to)
+      if to.empty?
+        @to
+      else
+        @to = to[0]
+        self
+      end
     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
+    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
-  end
 
-  def to_json(*a)
-    {
-      "from" => @from,
-      "to" => @to,
-      "ses_access_key" => @ses_access_key,
-      "ses_secret_key" => @ses_secret_key
-    }.to_json(*a)
+    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/environment.rb

@@ -2,10 +2,12 @@
 # Copyright (c) 2012 Sean Laurent
 #
 require 'ec2launcher/email_notification'
+require 'ec2launcher/security_group_handler'
 
 module EC2Launcher
 	class Environment
-		include EmailNotifications
+		include EC2Launcher::EmailNotifications
+		include EC2Launcher::SecurityGroupHandler
 
 		attr_reader :name
 		attr_reader :precommands
@@ -19,8 +21,7 @@ module EC2Launcher
 			@precommands = []
 			@postcommands = []
 			@roles = []
-			@security_groups = []
-
+			@security_groups = {}
 		end
 
 		def environment(name)
@@ -157,20 +158,6 @@ module EC2Launcher
 			end
 		end
 
-		def security_groups(*security_groups)
-			if security_groups.empty?
-				@security_groups
-			else
-				@security_groups = [] if @security_groups.nil?
-				if security_groups[0].kind_of? Array
-					@security_groups += security_groups[0]
-				else
-					@security_groups << security_groups[0]
-				end
-				self
-			end
-		end
-
 		def short_name(*short_name)
 			if short_name.empty?
 				@short_name
@@ -198,7 +185,12 @@ module EC2Launcher
 			@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?
-			@security_groups += other_env.security_groups unless other_env.security_groups.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
 

data/lib/ec2launcher/init_options.rb

@@ -7,160 +7,162 @@ require 'ostruct'
 
 require 'ec2launcher/defaults'
 
-class InitOptions
-  attr_reader :command
-  attr_reader :options
-  attr_reader :location
+module EC2Launcher
+  class InitOptions
+    attr_reader :command
+    attr_reader :options
+    attr_reader :location
 
-  SUB_COMMANDS = %w{init launch}
+    SUB_COMMANDS = %w{init launch}
 
-  def initialize
-    @opts = OptionParser.new do |opts|
-      opts.banner = "Usage: ec2launcher [COMMAND]
+    def initialize
+      @opts = OptionParser.new do |opts|
+        opts.banner = "Usage: ec2launcher [COMMAND]
 
-where [COMMAND] is one of:
+  where [COMMAND] is one of:
 
-  init [LOCATION]   Initialize a repository in the specified directory.
-  launch [OPTIONS]  Launch a new instance.
+    init [LOCATION]   Initialize a repository in the specified directory.
+    launch [OPTIONS]  Launch a new instance.
 
-and [OPTIONS] include:
+  and [OPTIONS] include:
 
-"
-      opts.separator "Query options:"
+  "
+        opts.separator "Query options:"
 
-      opts.on("-l", "--list", "Show environments and applications.") do
-        @options.list = true
-      end
+        opts.on("-l", "--list", "Show environments and applications.") do
+          @options.list = true
+        end
 
-      opts.on("-s", "--show-defaults", "Show settings, but do not launch any instances.") do
-        @options.show_defaults = true
-      end
+        opts.on("-s", "--show-defaults", "Show settings, but do not launch any instances.") do
+          @options.show_defaults = true
+        end
 
-      opts.separator ""
-      opts.separator "Required Launch options:"
+        opts.separator ""
+        opts.separator "Required Launch options:"
 
-      opts.on("-e", "--environment ENV", "The environment for the server.") do |env|
-        @options.environ = env
-      end
+        opts.on("-e", "--environment ENV", "The environment for the server.") do |env|
+          @options.environ = env
+        end
 
-      opts.on("-a", "--application NAME", "The name of the application class for the new server.") do |app_name|
-        @options.application = app_name
-      end
+        opts.on("-a", "--application NAME", "The name of the application class for the new server.") do |app_name|
+          @options.application = app_name
+        end
 
-      opts.separator ""
-      opts.separator "Additional launch options:"
+        opts.separator ""
+        opts.separator "Additional launch options:"
 
-      opts.on("--command [CMD]", "Additional command to run during launch sequence.") do |command|
-        @options.commands << command
-      end
+        opts.on("--command [CMD]", "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|
-        @options.clone_host = clone_host
-      end
+        opts.on("-c", "--clone HOST", "Clone the latest snapshots from a specific host.") do |clone_host|
+          @options.clone_host = clone_host
+        end
 
-      opts.separator ""
-      opts.separator "Overrides:"
+        opts.separator ""
+        opts.separator "Overrides:"
 
-      opts.on("-d", "--directory DIRECTORY", "Location of configuration directory. Defaults to current directory.") do |directory|
-        @options.directory = directory
-      end
+        opts.on("-d", "--directory DIRECTORY", "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|
-        @options.hostname = hostname
-      end
+        opts.on("-h", "--hostname NAME", "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|
-        @options.chef_validation_url = chef_validation_url
-      end
+        opts.on("-u", "--chef-validation-url", "URL for the Chef validation pem file.") do |chef_validation_url|
+          @options.chef_validation_url = chef_validation_url
+        end
 
-      opts.on("--ami AMI_ID", "AMI id") do |ami_id|
-        @options.ami_id = ami_id
-      end
+        opts.on("--ami AMI_ID", "AMI id") do |ami_id|
+          @options.ami_id = ami_id
+        end
 
-      opts.on("-z", "--availability-zone ZONE", EC2Launcher::AVAILABILITY_ZONES, "AWS availability zone (#{EC2Launcher::AVAILABILITY_ZONES.join(', ')}).") do |zone|
-        @options.zone = zone
-      end
+        opts.on("-z", "--availability-zone ZONE", EC2Launcher::AVAILABILITY_ZONES, "AWS availability zone (#{EC2Launcher::AVAILABILITY_ZONES.join(', ')}).") do |zone|
+          @options.zone = zone
+        end
 
-      opts.on("-i", "--instance-type TYPE", EC2Launcher::INSTANCE_TYPES, "EC2 instance type (#{EC2Launcher::INSTANCE_TYPES.join(', ')}).") do |instance_type|
-        @options.instance_type = instance_type
-      end
+        opts.on("-i", "--instance-type TYPE", EC2Launcher::INSTANCE_TYPES, "EC2 instance type (#{EC2Launcher::INSTANCE_TYPES.join(', ')}).") do |instance_type|
+          @options.instance_type = instance_type
+        end
 
-      opts.on("-v", "--volume-size SIZE", Integer, "EBS volume size in GB. Defaults to #{EC2Launcher::DEFAULT_VOLUME_SIZE} GB") do |volume_size|
-        @options.volume_size = volume_size
-      end
+        opts.on("-v", "--volume-size SIZE", Integer, "EBS volume size in GB. Defaults to #{EC2Launcher::DEFAULT_VOLUME_SIZE} GB") do |volume_size|
+          @options.volume_size = volume_size
+        end
 
-      opts.separator ""
-      opts.separator "AWS Security Options:"
+        opts.separator ""
+        opts.separator "AWS Security Options:"
 
-      opts.on("--access-key KEY", "Amazon access key. Overrides AWS_ACCESS_KEY environment variable.") do |access_key|
-        @options.access_key = access_key
-      end
+        opts.on("--access-key KEY", "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|
-        @options.secret = secret
-      end
+        opts.on("--secret SECRET", "Amazon secret access key. Overrides AWS_SECRET_ACCESS_KEY environment variable.") do |secret|
+          @options.secret = secret
+        end
 
-      opts.separator ""
-      opts.separator "Common options:"
+        opts.separator ""
+        opts.separator "Common options:"
 
-      # No argument, shows at tail.  This will print an options summary.
-      # Try it and see!
-      opts.on_tail("-?", "--help", "Show this message") do
-        puts opts
-        exit
-      end    
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail("-?", "--help", "Show this message") do
+          puts opts
+          exit
+        end    
+      end
     end
-  end
 
-  def parse(args)
-    @command = args.shift
-    unless SUB_COMMANDS.include?(@command)
-      puts "Missing command! " if @command.nil?
-      puts "Invalid command: #{@command}" unless @command.nil? || @command == "-?" || @command == "--help"
-      puts @opts
-      exit 1
-    end
+    def parse(args)
+      @command = args.shift
+      unless SUB_COMMANDS.include?(@command)
+        puts "Missing command! " if @command.nil?
+        puts "Invalid command: #{@command}" unless @command.nil? || @command == "-?" || @command == "--help"
+        puts @opts
+        exit 1
+      end
 
-    @options = OpenStruct.new
-    @options.list = false
-    @options.show_defaults = false
+      @options = OpenStruct.new
+      @options.list = false
+      @options.show_defaults = false
 
-    @options.environ = nil
-    @options.application = nil
-    @options.commands = []
-    @options.clone_host = nil
+      @options.environ = nil
+      @options.application = nil
+      @options.commands = []
+      @options.clone_host = nil
 
-    @options.ami_id = nil
-    @options.hostname = nil
-    @options.zone = nil
-    @options.instance_type = nil
-    @options.volume_size = nil
+      @options.ami_id = nil
+      @options.hostname = nil
+      @options.zone = nil
+      @options.instance_type = nil
+      @options.volume_size = nil
 
-    @options.directory = "./"
+      @options.directory = "./"
 
-    if @command == "init"
-      unless args.length >= 1
-        puts "Missing location!"
-        puts
-        help
-        exit 1
-      end
-      @location = args[0]
-    else
-      @opts.parse!(args)
-
-      if (@options.environ.nil? || @options.application.nil?) && ! @options.list
-        puts "Missing a required parameter: #{@options.environ.nil? ? '--environment' : '--application'}"
-        puts
-        help
-        exit 1
+      if @command == "init"
+        unless args.length >= 1
+          puts "Missing location!"
+          puts
+          help
+          exit 1
+        end
+        @location = args[0]
+      else
+        @opts.parse!(args)
+
+        if (@options.environ.nil? || @options.application.nil?) && ! @options.list
+          puts "Missing a required parameter: #{@options.environ.nil? ? '--environment' : '--application'}"
+          puts
+          help
+          exit 1
+        end
       end
-    end
 
-    @options
-  end
+      @options
+    end
 
-  def help
-    puts @opts
+    def help
+      puts @opts
+    end
   end
-end
+end

data/lib/ec2launcher/security_group_handler.rb

@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+module EC2Launcher
+	# Helper module for all objects that support EC2 Security Groups.
+	module SecurityGroupHandler
+
+		# Add or retrieve security groups. Defines the @security_groups instance variable,
+		# which contains a Hash of environment names to Arrays of security group names.
+		# May define a "default" environment.
+		# 
+		# Can be defined several different ways:
+		#   * String - Adds the named security group to the "default" environment.
+		#   * Array - Adds the entire array of security groups to the "default" environment.
+		#   * Hash - Keys are environment names (Strings) to security groups. Values of the
+		#            hash can be either a String or an Array. Both are appended to any
+		#            security groups already defined for the environment.
+		#
+		# @param [Array, nil] groups  Array of security_group definitions. See above. Returns
+		#                             the entire Hash of security groups if empty.
+		#
+		# @return [Hash, self] Either returns the Hash of security groups (if groups parameter is empty)
+		#                      or returns a reference to self.
+		def security_groups(*groups)
+			if groups.empty?
+				@security_groups
+			else
+				@security_groups = Hash.new if @security_groups.nil?
+				if groups[0].kind_of? Array
+					@security_groups[:default] = [] if @security_groups[:default].nil?
+					@security_groups[:default] += groups[0]
+				elsif groups[0].kind_of? Hash
+					groups[0].keys.each do |env_name|
+						@security_groups[env_name] = [] if @security_groups[env_name].nil?
+						if groups[0][env_name].kind_of? Array
+							@security_groups[env_name] += groups[0][env_name]
+						else
+							@security_groups[env_name] << groups[0][env_name]
+						end
+					end
+				else
+					@security_groups[:default] = [] if @security_groups[:default].nil?
+					@security_groups[:default] << groups[0].to_s
+				end
+				self
+			end
+		end
+
+		# Retrieves the list of security groups for a given environment. Returns the
+		# default set of security groups if the environment isn't defined. Returns
+		# an empty array if the default security group is empty.
+		def security_groups_for_environment(environment)
+			if @security_groups[environment].nil?
+				# Environment not found - check default
+				return @security_groups[:default].nil? ? [] : @security_groups[:default]
+			end
+			@security_groups[environment]
+		end
+	end
+end

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -9,12 +9,14 @@ require 'aws-sdk'
 require "ec2launcher/version"
 require "ec2launcher/config"
 require "ec2launcher/defaults"
+require "ec2launcher/backoff_runner"
 
 require 'ec2launcher/application'
 require 'ec2launcher/environment'
 require 'ec2launcher/block_device_builder'
 
 module EC2Launcher
+
   class AmiDetails
     attr_reader :ami_name, :ami_id
 
@@ -25,28 +27,7 @@ module EC2Launcher
   end
 
   class Launcher
-    # Runs an AWS request inside a Ruby block with an exponential backoff in case
-    # we exceed the allowed AWS RequestLimit.
-    #
-    # @param [Integer] max_time maximum amount of time to sleep before giving up.
-    # @param [Integer] sleep_time the initial amount of time to sleep before retrying.
-    # @param [message] message message to display if we get an exception.
-    # @param [Block] block Ruby code block to execute.
-    def run_with_backoff(max_time, sleep_time, message, &block)
-      if sleep_time > max_time
-        puts "AWS::EC2::Errors::RequestLimitExceeded ... failed #{message}"
-        return false
-      end
-      
-      begin
-        yield
-      rescue AWS::EC2::Errors::RequestLimitExceeded
-        puts "AWS::EC2::Errors::RequestLimitExceeded ... retrying #{message} in #{sleep_time} seconds"
-        sleep sleep_time
-        run_with_backoff(max_time, sleep_time * 2, message, &block)
-      end  
-      true
-    end
+    include BackoffRunner
 
     def launch(options)
       @options = options
@@ -79,7 +60,7 @@ module EC2Launcher
           filename = File.join(app_dir, application_name)
           next if File.directory?(filename)
 
-          apps = ApplicationDSL.execute(File.read(filename)).applications
+          apps = EC2Launcher::ApplicationDSL.execute(File.read(filename)).applications
           apps.each do |new_application|
             @applications[new_application.name] = new_application
             validate_application(filename, new_application)
@@ -169,7 +150,7 @@ module EC2Launcher
       # SECURITY GROUPS
       ##############################
       security_groups = []
-      security_groups += @environment.security_groups unless @environment.security_groups.nil?
+      security_groups += @environment.security_groups_for_environment(@environment.name) unless @environment.security_groups_for_environment(@environment.name).nil?
       security_groups += @application.security_groups_for_environment(@environment.name)
 
       # Build mapping of existing security group names to security group objects
@@ -673,7 +654,7 @@ rm -f /tmp/runurl"
       # Load configuration file
       config_filename = File.join(@options.directory, "config.rb")
       abort("Unable to find 'config.rb' in '#{@options.directory}'") unless File.exists?(config_filename)
-      ConfigDSL.execute(File.read(config_filename)).config
+      EC2Launcher::ConfigDSL.execute(File.read(config_filename)).config
     end
 
     # Load and parse an environment file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -45,6 +45,7 @@ files:
 - ec2launcher.gemspec
 - lib/ec2launcher.rb
 - lib/ec2launcher/application.rb
+- lib/ec2launcher/backoff_runner.rb
 - lib/ec2launcher/block_device.rb
 - lib/ec2launcher/block_device_builder.rb
 - lib/ec2launcher/config.rb
@@ -52,6 +53,7 @@ files:
 - lib/ec2launcher/email_notification.rb
 - lib/ec2launcher/environment.rb
 - lib/ec2launcher/init_options.rb
+- lib/ec2launcher/security_group_handler.rb
 - lib/ec2launcher/version.rb
 - startup-scripts/setup.rb
 - startup-scripts/setup_instance.rb