ec2launcher 1.0.2 → 1.0.3

data/lib/ec2launcher/environment.rb

@@ -105,6 +105,14 @@ module EC2Launcher
 			end
 		end
 
+		def inherit(*inherit_type)
+			if inherit_type.empty?
+				@inherit_type
+			else
+				@inherit_type = inherit_type[0]
+			end
+		end
+
 		def key_name(*key)
 			if key.empty?
 				@key_name
@@ -178,6 +186,28 @@ module EC2Launcher
 			end
 		end
 
+		# Takes values from the other environment and merges them into this one
+		def merge(other_env)
+			@name =other_env.name
+
+			@aliases = other_env.aliases.nil? ? nil : other_env.aliases
+
+			@aws_keyfile = other_env.aws_keyfile unless other_env.aws_keyfile.nil?
+			@availability_zone = other_env.availability_zone unless other_env.availability_zone.nil?
+			@chef_server_url = other_env.chef_server_url unless other_env.chef_server_url.nil?
+			@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
+
 		def load(dsl)
 			self.instance_eval(dsl)
 			self

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -100,17 +100,19 @@ module EC2Launcher
         end
       end
 
+      # Process inheritance rules for environments
+      @environments.values.each do |env|
+        next if env.inherit.nil?
+
+        new_env = process_environment_inheritance(env)
+        @environments[new_env.name] = new_env
+      end
+
       # Process inheritance rules for applications
       @applications.values.each do |app|
         next if app.inherit.nil?
 
-        # Find base application
-        base_app = @applications[app.inherit]
-        abort("Invalid inheritance '#{app.inherit}' in #{app.name}") if base_app.nil?
-
-        # Clone base application
-        new_app = Marshal::load(Marshal.dump(base_app))
-        new_app.merge(app)
+        new_app = process_application_inheritance(app)
         @applications[new_app.name] = new_app
       end
     
@@ -306,7 +308,7 @@ export HOME=/root
 echo '#{setup_json.to_json}' > /tmp/setup.json"
 
       # pre-commands, if necessary
-      unless @environment.precommands.nil? 
+      unless @environment.precommands.nil? || @environment.precommands.empty?
         precommands = @environment.precommands.join("\n")
         user_data += "\n" + precommands
       end
@@ -322,7 +324,7 @@ rm -f /tmp/runurl"
       options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
 
       # Post commands
-      unless @environment.postcommands.nil?
+      unless @environment.postcommands.nil? || @environment.postcommands.empty?
         postcommands = @environment.postcommands.join("\n")
         user_data += "\n" + postcommands
       end
@@ -682,7 +684,7 @@ rm -f /tmp/runurl"
         return nil
       end
 
-      new_env = default_environment.clone unless default_environment.nil?
+      new_env = Marshal::load(Marshal.dump(default_environment)) unless default_environment.nil?
       new_env ||= EC2Launcher::Environment.new
 
       new_env.load(File.read(name))
@@ -719,6 +721,42 @@ rm -f /tmp/runurl"
       valid_directories
     end
 
+    def process_application_inheritance(app)
+        return app if app.inherit.nil?
+
+        # Find base application
+        base_app = @applications[app.inherit]
+        abort("Invalid inheritance '#{app.inherit}' in #{app.name}") if base_app.nil?
+
+        new_app = nil
+        if base_app.inherit.nil?
+          # Clone base application
+          new_app = Marshal::load(Marshal.dump(base_app))
+        else
+          new_app = process_application_inheritance(base_app)
+        end
+        new_app.merge(app)
+        new_app
+    end
+
+    def process_environment_inheritance(env)
+        return env if env.inherit.nil?
+
+        # Find base environment
+        base_env = @environments[env.inherit]
+        abort("Invalid inheritance '#{env.inherit}' in #{env.name}") if base_env.nil?
+
+        new_env = nil
+        if base_env.inherit.nil?
+          # Clone base environment
+          new_env = Marshal::load(Marshal.dump(base_env))
+        else
+          new_env = process_environment_inheritance(base_env)
+        end
+        new_env.merge(env)
+        new_env
+    end
+
     # Validates all settings in an application file
     #
     # @param [String] filename name of the application file

metadata

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