ec2launcher 1.0.21 → 1.0.22

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.22
+
+* Fixed additional bug with merging applications.
+
 ## 1.0.21
 
 * Fixed bugs with merging applications together under certain circumstances.

data/lib/ec2launcher/dsl/application.rb

@@ -206,12 +206,12 @@ module EC2Launcher
 				@basename = other_server.basename unless other_server.basename.nil?
 				
 				unless other_server.block_devices.nil?
-					@block_devices = []
+					@block_devices = [] if @block_devices.nil?
 					other_server.block_devices.each {|bd| @block_devices << bd }
 				end
 				
 				unless other_server.elb.nil?
-					@elb = {}
+					@elb = {} if @elb.nil?
 					other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } 
 				end
 				
@@ -219,11 +219,12 @@ module EC2Launcher
 				@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
 				
 				unless other_server.roles.nil?
-					@roles = []
+					@roles = [] if @roles.nil?
 					other_server.roles.each {|role| @roles << role } 
 				end
 
 				unless other_server.security_groups.nil?
+					@security_groups = {} if @security_groups.nil?
 					other_server.security_groups.keys.each do |env_name|
 						unless @security_groups.has_key? env_name
 							@security_groups[env_name] = []

data/lib/ec2launcher/version.rb

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

metadata

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