ec2launcher 1.0.34 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.0
+
+* Backward imcompatible change. Now defaults to running "ruby", "gem", "chef-client" and "knife" based on the environment.
+* Automatically attempts to the load RVM (https://rvm.io/) profile data from /etc/profile.d/rvm.sh.
+* Added new "use_rvm" environment and application setting to control loading RVM profile. Defaults to true.
+
+## 1.0.35
+
+* Fixed mistake when launching instances with a specified hostname.
+
 ## 1.0.34
 
 * Added missing config loader files.

data/lib/ec2launcher.rb

@@ -214,7 +214,7 @@ module EC2Launcher
           long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
         else
           long_hostname = @options.hostname
-          short_hostname = hostname_generator.generate_short_name(short_hostname, @environment.domain_name)
+          short_hostname = hostname_generator.generate_short_name(long_hostname, @environment.domain_name)
           if long_hostname == short_hostname
             long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
           end
@@ -646,16 +646,25 @@ module EC2Launcher
 
       ##############################
       # Build launch command
-      user_data = "#!/bin/sh"
-      user_data += "\nexport HOME=/root"
-      user_data += "\necho '#{setup_json.to_json}' > /tmp/setup.json"
+      user_data = <<EOF
+#!/bin/sh
+cat > /tmp/setup.json <<End-Of-Message-JSON
+#{setup_json.to_json}
+End-Of-Message-JSON
+EOF
+      if @environment.use_rvm or @application.use_rvm
+        user_data += <<-EOF
+export HOME=/root
+if [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+  source "/usr/local/rvm/scripts/rvm"
+fi
+EOF
+      end
 
       # pre-commands, if necessary
       user_data += build_commands(@environment.precommand)
       user_data += build_commands(@application.precommand)
 
-      user_data += "\n"
-
       unless @options.skip_setup
         if @run_url_script_cache.nil?
           puts "Downloading runurl script from #{RUN_URL_SCRIPT}"

data/lib/ec2launcher/dsl/application.rb

@@ -44,6 +44,7 @@ module EC2Launcher
 			dsl_accessor :instance_type
 			dsl_accessor :name_suffix
 			dsl_accessor :subnet
+			dsl_accessor :use_rvm
 
 			dsl_array_accessor :gems
 			dsl_array_accessor :packages
@@ -60,6 +61,8 @@ module EC2Launcher
 			def initialize(name)
 				@name = name
 				@email_notifications = nil
+
+				@use_rvm = true
 			end
 
 			def application(name)
@@ -171,6 +174,8 @@ module EC2Launcher
 						other_server.security_groups[env_name].each {|sg| @security_groups[env_name] << sg }
 					end
 				end
+
+				@use_rvm = other_server.use_rvm unless other_server.use_rvm.nil?
 			end
 
 			def roles_for_environment(environment)

data/lib/ec2launcher/dsl/environment.rb

@@ -28,6 +28,7 @@ module EC2Launcher
 			dsl_accessor :ruby_path
 			dsl_accessor :short_name
 			dsl_accessor :subnet
+			dsl_accessor :use_rvm
 
 			dsl_array_accessor :aliases
 			dsl_array_accessor :gems
@@ -51,6 +52,8 @@ module EC2Launcher
 				@postcommand = []
 				@roles = []
 				@security_groups = {}
+
+				@use_rvm = true
 			end
 
 			def environment(name)
@@ -91,6 +94,7 @@ module EC2Launcher
 				@ruby_path = other_env.ruby_path unless other_env.ruby_path.nil?
 				@subnet = other_env.subnet unless other_env.subnet.nil?
 				@short_name = other_env.short_name unless other_env.short_name.nil?
+				@use_rvm = other_env.use_rvm unless other_env.use_rvm.nil?
 		end
 
 			def load(dsl)

data/lib/ec2launcher/instance_paths_config.rb

@@ -7,10 +7,10 @@ module EC2Launcher
     attr_reader :gem_path, :ruby_path, :chef_path, :knife_path
 
     def initialize(environment)
-      @gem_path = build_path(environment.gem_path, "gem", "/usr/bin/gem")
-      @ruby_path = build_path(environment.ruby_path, "ruby", "/usr/bin/ruby")
-      @chef_path = build_path(environment.chef_path, "chef-client", "/usr/bin/chef-client")
-      @knife_path = build_path(environment.knife_path, "knife", "/usr/bin/knife")
+      @gem_path = build_path(environment.gem_path, "gem", "gem")
+      @ruby_path = build_path(environment.ruby_path, "ruby", "ruby")
+      @chef_path = build_path(environment.chef_path, "chef-client", "chef-client")
+      @knife_path = build_path(environment.knife_path, "knife", "knife")
     end
 
     private

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -371,7 +371,7 @@ def run_chef_client(chef_path)
     stdout.each do |line|
       puts line
     end
-    result = wait_thr.value
+    result = wait_thr.value if wait_thr
   end
   result
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.34
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk