ec2launcher 1.0.25 → 1.0.26

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.26
+
+* More exception handling during launch process.
+
 ## 1.0.25
 
 * Fixed duplicate commands.

data/lib/ec2launcher/backoff_runner.rb

@@ -25,7 +25,13 @@ module EC2Launcher
         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  
+      rescue AWS::EC2::Errors::InstanceLimitExceeded
+        puts "AWS::EC2::Errors::InstanceLimitExceeded ... aborting launch."
+        return false
+      rescue StdError => bang
+        print "Error for #{message}: #{bang}"
+        return false
+      end
       true
     end
 

data/lib/ec2launcher/dsl/application.rb

@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
+require 'ec2launcher/dsl/helper'
 require 'ec2launcher/dsl/block_device'
 require 'ec2launcher/dsl/email_notification'
 require 'ec2launcher/security_group_handler'
@@ -32,10 +33,22 @@ module EC2Launcher
 		# Represents a single application stack.
 		class Application
 			include EC2Launcher::DSL::EmailNotifications
+			include EC2Launcher::DSL::Helper
 			include EC2Launcher::SecurityGroupHandler
 
+
 			attr_reader :name
 
+			dsl_accessor :basename
+			dsl_accessor :inherit
+			dsl_accessor :instance_type
+			dsl_accessor :name_suffix
+			dsl_accessor :subnet
+
+			dsl_array_accessor :gems
+			dsl_array_accessor :packages
+			dsl_array_accessor :roles
+
 			def initialize(name)
 				@name = name
 				@email_notifications = nil
@@ -75,19 +88,6 @@ module EC2Launcher
 				end
 			end
 
-			# 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
-
 			def block_devices(*block_device_data)
 				if block_device_data.empty?
 					@block_devices
@@ -177,27 +177,6 @@ module EC2Launcher
 				end
 			end
 
-			# 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
-
-			# 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
-
 			# Takes values from the other server type and merges them into this one
 			def merge(other_server)
 				@name = other_server.name
@@ -234,38 +213,6 @@ module EC2Launcher
 				end
 			end
 
-			def name_suffix(*suffix)
-				if suffix.empty?
-					@name_suffix
-				else
-					@name_suffix = suffix[0]
-				end
-			end
-
-			def packages(*packages)
-				if packages.empty?
-					@packages
-				else
-					@packages = packages[0]
-					self
-				end
-			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 roles_for_environment(environment)
 				roles = []
 				roles += @roles unless @roles.nil?
@@ -289,15 +236,6 @@ module EC2Launcher
 				groups
 			end
 
-			def subnet(*subnet)
-				if subnet.empty?
-					@subnet
-				else
-					@subnet = subnet[0]
-					self
-				end
-			end
-
 			def load(dsl)
 				self.instance_eval(dsl)
 				self

data/lib/ec2launcher/dsl/block_device.rb

@@ -1,13 +1,24 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
+require 'ec2launcher/dsl/helper'
 
 module EC2Launcher
 	module DSL
 		class BlockDevice
+      include EC2Launcher::DSL::Helper
+
 			attr_reader :mount_point
 			attr_reader :name
 
+			dsl_accessor :count
+			dsl_accessor :group
+			dsl_accessor :mount
+			dsl_accessor :name
+			dsl_accessor :owner
+			dsl_accessor :raid_level
+			dsl_accessor :size
+
 			def initialize()
 				@count = 1
 				@group = "root"
@@ -18,69 +29,6 @@ module EC2Launcher
 				@raid_level.nil?
 			end
 
-			def count(*block_count)
-				if block_count.empty?
-					@count
-				else
-					@count = block_count[0]
-					self
-				end
-			end
-
-			def group(*group)
-				if group.empty?
-					@group
-				else
-					@group = group[0]
-					self
-				end
-			end
-
-			def mount(*mount)
-				if mount.empty?
-					@mount
-				else
-					@mount_point = mount[0]
-					self
-				end
-			end
-
-			def name(*name)
-				if name.empty?
-					@name
-				else
-					@name = name[0]
-					self
-				end
-			end
-
-			def owner(*owner)
-				if owner.empty?
-					@owner
-				else
-					@owner = owner[0]
-					self
-				end
-			end
-
-			def raid_level(*raid_level)
-				if raid_level.empty?
-					@raid_level
-				else
-					@raid_level = raid_level[0]
-					self
-				end
-			end
-
-			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,

data/lib/ec2launcher/dsl/email_notification.rb

@@ -1,10 +1,12 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
+require 'ec2launcher/dsl/helper'
 
 module EC2Launcher
   module DSL
     module EmailNotifications
+
       attr_reader :email_notifications
 
       def email_notification(&block)
@@ -15,44 +17,12 @@ module EC2Launcher
     end
 
     class EmailNotification
-      def initialize()
-      end
+      include EC2Launcher::DSL::Helper
 
-      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
+      dsl_accessor :from
+      dsl_accessor :to
+      dsl_accessor :ses_access_key
+      dsl_accessor :ses_secret_key
 
       def to_json(*a)
         {

data/lib/ec2launcher/dsl/environment.rb

@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
+require 'ec2launcher/dsl/helper'
 require 'ec2launcher/dsl/email_notification'
 require 'ec2launcher/security_group_handler'
 
@@ -8,12 +9,32 @@ module EC2Launcher
 	module DSL
 		class Environment
 			include EC2Launcher::DSL::EmailNotifications
+			include EC2Launcher::DSL::Helper
 			include EC2Launcher::SecurityGroupHandler
 
 			attr_reader :name
 			attr_reader :precommands
 			attr_reader :postcommands
 
+			dsl_accessor :aws_keyfile
+			dsl_accessor :chef_path
+			dsl_accessor :chef_server_url
+			dsl_accessor :chef_validation_pem_url
+			dsl_accessor :domain_name
+			dsl_accessor :gem_path
+			dsl_accessor :inherit
+			dsl_accessor :key_name
+			dsl_accessor :knife_path
+			dsl_accessor :ruby_path
+			dsl_accessor :short_name
+			dsl_accessor :subnet
+
+			dsl_array_accessor :gems
+			dsl_array_accessor :packages
+			dsl_array_accessor :precommand
+			dsl_array_accessor :postcommand
+			dsl_array_accessor :roles
+
 			def initialize()
 				@aliases = []
 				@email_notifications = nil
@@ -31,15 +52,6 @@ module EC2Launcher
 				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
@@ -74,141 +86,6 @@ module EC2Launcher
 				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 gem_path(*gem_path)
-        if gem_path.empty?
-          @gem_path
-        else
-          @gem_path = gem_path[0]
-        end
-      end
-
-      def ruby_path(*ruby_path)
-        if ruby_path.empty?
-          @ruby_path
-        else
-          @ruby_path = ruby_path[0]
-        end
-      end
-
-      def chef_path(*chef_path)
-        if chef_path.empty?
-          @chef_path
-        else
-          @chef_path = chef_path[0]
-        end
-      end
-
-      def knife_path(*knife_path)
-        if knife_path.empty?
-          @knife_path
-        else
-          @knife_path = knife_path[0]
-        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

data/lib/ec2launcher/dsl/helper.rb

@@ -0,0 +1,40 @@
+module EC2Launcher
+  module DSL
+    module Helper
+      def dsl_accessor(*symbols)
+        symbols.each { |sym|
+          class_eval %{
+            def #{sym}(*val)
+              if val.empty
+                @#{sym}
+              else
+                @#{sym} = val.size == 1 ? val[0] : val
+                self
+              end
+            end
+          }
+        }
+      end
+      
+      def dsl_array_accessor(*symbols)
+        symbols.each { |sym|
+          class_eval %{
+            def #{sym}(*val)
+              if val.empty
+                @#{sym}
+              else
+                @#{sym} = [] if @#{sym}.nil?
+                if val[0].kind_of? Array
+                  @#{sym} += val[0]
+                else
+                  @#{sym} << val[0]
+                end
+                self
+              end
+            end
+          }
+        }
+      end
+    end
+  end
+end

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.0.25"
+  VERSION = "1.0.26"
 end

data/startup-scripts/setup_instance.rb

@@ -379,11 +379,11 @@ if instance_data["email_notifications"]
   })
   ses = AWS::SimpleEmailService.new
   ses.send_email(
-    :from => instance_data["email_notification"]["from"],
-    :to => instance_data["email_notification"]["to"],
-    :subject => "Server setup complete: #{hostname}",
-    :body_text => "Server setup is complete for Host: #{hostname}, Environment: #{options.environ}, Application: #{options.application}",
-    :body_html => "<div>Server setup is complete for:</div><div><strong>Host:</strong> #{hostname}</div><div><strong>Environment:</strong> #{options.environ}</div><div><strong>Application:</strong> #{options.application}</div>"
+    :from => instance_data["email_notifications"]["from"],
+    :to => instance_data["email_notifications"]["to"],
+    :subject => "Server setup complete: #{options.hostname}",
+    :body_text => "Server setup is complete for Host: #{options.hostname}, Environment: #{options.environ}, Application: #{options.application}",
+    :body_html => "<div>Server setup is complete for:</div><div><strong>Host:</strong> #{options.hostname}</div><div><strong>Environment:</strong> #{options.environ}</div><div><strong>Application:</strong> #{options.application}</div>"
   )
 else
   puts "Skipping email notification."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -68,6 +68,7 @@ files:
 - lib/ec2launcher/dsl/config.rb
 - lib/ec2launcher/dsl/email_notification.rb
 - lib/ec2launcher/dsl/environment.rb
+- lib/ec2launcher/dsl/helper.rb
 - lib/ec2launcher/hostname_generator.rb
 - lib/ec2launcher/init_options.rb
 - lib/ec2launcher/instance_paths_config.rb