ec2launcher 1.0.16 → 1.0.17

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.17
+
+* Added support to substitute the application name and environment name in pre/post commands.
+
 ## 1.0.16
 
 * Added support for custom paths to ruby, gem, chef-client and knife executables.

data/lib/ec2launcher.rb

@@ -698,6 +698,16 @@ module EC2Launcher
         new_env
     end
 
+    # Given a string containing a command to run, replaces any inline variables.
+    # Supported variables include:
+    #   * @APPLICATION@ - name of the application
+    #   * @ENVIRONMENT@ - name of the environment
+    #
+    # @return [String] command with variables replaced
+    def substitute_command_variables(cmd)
+      cmd.gsub(/@APPLICATION@/, @application.name).gsub(/@ENVIRONMENT@/, @environment.name)
+    end
+
     # Validates all settings in an application file
     #
     # @param [String] filename name of the application file
@@ -767,8 +777,8 @@ module EC2Launcher
 
       # pre-commands, if necessary
       unless @environment.precommands.nil? || @environment.precommands.empty?
-        precommands = @environment.precommands.join("\n")
-        user_data += "\n" + precommands
+        commands = @environment.precommands.collect {|cmd| substitute_command_variables(cmd) }
+        user_data += "\n" + commands.join("\n")
       end
 
       user_data += "\n"
@@ -806,12 +816,16 @@ module EC2Launcher
       user_data += " 2>&1 > /var/log/cloud-startup.log"
 
       # Add extra requested commands to the launch sequence
+      unless @options.commands.nil?
+        commands = @environment.commands.collect {|cmd| substitute_command_variables(cmd) }
+        user_data += "\n" + commands.join("\n")
+      end
       @options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
 
       # Post commands
       unless @environment.postcommands.nil? || @environment.postcommands.empty?
-        postcommands = @environment.postcommands.join("\n")
-        user_data += "\n" + postcommands
+        commands = @environment.postcommands.collect {|cmd| substitute_command_variables(cmd) }
+        user_data += "\n" + commands.join("\n")
       end
       user_data
     end

data/lib/ec2launcher/version.rb

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

metadata

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