ec2launcher 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 1.0.6 (18-July-2012)
+
+* Update environment inheritence to merge (instead of replace) gems, packages, roles, commands and security groups.
+
+## 1.0.5 (18-July-2012)
+
+* Fixed bug with resolving environment names when using an environment alias.

data/lib/ec2launcher/environment.rb

@@ -190,6 +190,13 @@ module EC2Launcher
 		def merge(other_env)
 			@name =other_env.name
 
+			@gems += other_env.gems unless other_env.gems.nil?
+			@packages += other_env.packages unless other_env.packages.nil?
+			@roles += other_env.roles unless other_env.roles.nil?
+			@precommands += other_env.precommands unless other_env.precommands.nil?
+			@postcommands += other_env.postcommands unless other_env.postcommands.nil?
+			@security_groups += other_env.security_groups unless other_env.security_groups.nil?
+
 			@aliases = other_env.aliases.nil? ? nil : other_env.aliases
 
 			@aws_keyfile = other_env.aws_keyfile unless other_env.aws_keyfile.nil?
@@ -198,13 +205,7 @@ module EC2Launcher
 			@chef_validation_pem_url = other_env.chef_validation_pem_url unless other_env.chef_validation_pem_url.nil?
 			@domain_name = other_env.domain_name unless other_env.domain_name
 			@email_notifications = other_env.email_notifications unless other_env.email_notifications.nil?
-			@gems = other_env.gems unless other_env.gems.nil?
 			@key_name = other_env.key_name unless other_env.key_name.nil?
-			@packages = other_env.packages unless other_env.packages.nil?
-			@precommands = other_env.precommands unless other_env.precommands.nil?
-			@postcommands = other_env.postcommands unless other_env.postcommands.nil?
-			@roles = other_env.roles unless other_env.roles.nil?
-			@security_groups = other_env.security_groups unless other_env.security_groups.nil?
 			@subnet = other_env.subnet unless other_env.subnet.nil?
 	end
 

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -36,6 +36,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md