ec2launcher 1.0.1 → 1.0.2

data/lib/ec2launcher/block_device_builder.rb

@@ -47,6 +47,7 @@ module EC2Launcher
     # @param [Array<EC2Launcher::BlockDevice>] block_devices list of block devices to create.
     #
     def build_ebs_volumes(hostname, short_hostname, environment_name, block_devices)
+      return if block_devices.nil?
       base_device_name = "sdf"
       block_devices.each do |block_device|
         build_block_devices(block_device.count, base_device_name) do |device_name, index|

data/lib/ec2launcher/environment.rb

@@ -8,12 +8,16 @@ module EC2Launcher
 		include EmailNotifications
 
 		attr_reader :name
+		attr_reader :precommands
+		attr_reader :postcommands
 
 		def initialize()
 			@aliases = []
 			@email_notifications = nil
 			@gems = []
 			@packages = []
+			@precommands = []
+			@postcommands = []
 		end
 
 		def environment(name)
@@ -119,6 +123,14 @@ module EC2Launcher
 			end
 		end
 
+		def precommand(*command)
+			@precommands << command[0]
+		end
+
+		def postcommand(*command)
+			@postcommands << command[0]
+		end
+
 		def roles(*roles)
 			if roles.empty?
 				@roles

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -292,7 +292,7 @@ module EC2Launcher
         'gems' => gems,
         'packages' => packages
       }
-      unless @application.block_devices.empty?
+      unless @application.block_devices.nil? || @application.block_devices.empty?
         setup_json['block_devices'] = @application.block_devices
       end
       unless email_notifications.nil?
@@ -303,8 +303,16 @@ module EC2Launcher
       # Build launch command
       user_data = "#!/bin/sh
 export HOME=/root
-echo '#{setup_json.to_json}' > /tmp/setup.json
-curl http://bazaar.launchpad.net/~alestic/runurl/trunk/download/head:/runurl-20090817053347-o2e56z7xwq8m9tt6-1/runurl -o /tmp/runurl
+echo '#{setup_json.to_json}' > /tmp/setup.json"
+
+      # pre-commands, if necessary
+      unless @environment.precommands.nil? 
+        precommands = @environment.precommands.join("\n")
+        user_data += "\n" + precommands
+      end
+
+      # Primary setup script
+      user_data += "\ncurl http://bazaar.launchpad.net/~alestic/runurl/trunk/download/head:/runurl-20090817053347-o2e56z7xwq8m9tt6-1/runurl -o /tmp/runurl
 chmod +x /tmp/runurl
 /tmp/runurl https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/setup.rb -e #{options.environ} -a #{options.application} -h #{hostname} /tmp/setup.json > /var/log/cloud-startup.log
 rm -f /tmp/runurl"
@@ -313,6 +321,12 @@ rm -f /tmp/runurl"
       # Add extra requested commands to the launch sequence
       options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
 
+      # Post commands
+      unless @environment.postcommands.nil?
+        postcommands = @environment.postcommands.join("\n")
+        user_data += "\n" + postcommands
+      end
+
       ##############################
       puts
       puts "Availability zone: #{availability_zone}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: