ec2launcher 1.6.3 → 1.6.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.4
+
+* Fixed bug with properly inheriting environment roles in applications.
+
 ## 1.6.3
 
 * Fixed typo in block read-ahead settings.

data/lib/ec2launcher/dsl/application.rb

@@ -215,6 +215,17 @@ module EC2Launcher
 					end
 				end
 
+				unless other_server.environment_roles.nil?
+					@environment_roles = Hash.new if @environment_roles.nil?
+					other_server.environment_roles.keys.each do |env_name|
+						if @environment_roles.has_key?(env_name)
+							@environment_roles[env_name] = other_server.environment_roles[env_name] + @environment_roles[env_name]
+						else
+							@environment_roles[env_name] = other_server.environment_roles[env_name]
+						end
+					end
+				end
+
 				@use_rvm = other_server.use_rvm if other_server.use_rvm
 			end
 

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk