ec2launcher 1.0.6 → 1.0.7

data/CHANGELOG.md

@@ -1,7 +1,11 @@
+## 1.0.7 (18-July-2012)
+
+* Fixed problem with inheriting from default environment.
+
 ## 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.
+* Fixed bug with resolving environment names when using an environment alias.

data/lib/ec2launcher/environment.rb

@@ -18,6 +18,8 @@ module EC2Launcher
 			@packages = []
 			@precommands = []
 			@postcommands = []
+			@roles = []
+			@security_groups = []
 		end
 
 		def environment(name)

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -173,6 +173,8 @@ module EC2Launcher
       # SECURITY GROUPS
       ##############################
       security_groups = []
+      puts "ENV: #{@environment.security_groups}"
+      puts "APP: #{@application.security_groups_for_environment(@environment.name)}"
       security_groups += @environment.security_groups unless @environment.security_groups.nil?
       security_groups += @application.security_groups_for_environment(@environment.name)
 
@@ -687,7 +689,11 @@ rm -f /tmp/runurl"
       new_env = Marshal::load(Marshal.dump(default_environment)) unless default_environment.nil?
       new_env ||= EC2Launcher::Environment.new
 
-      new_env.load(File.read(name))
+      load_env = EC2Launcher::Environment.new
+      load_env.load(File.read(name))
+
+      new_env.merge(load_env)
+
       new_env
     end
 

metadata

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