ec2launcher 1.0.27 → 1.0.28

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.28
+
+* Fixed problem with pre/post command inheritance.
+
 ## 1.0.27
 
 * Fixed DSL accessor method access.

data/lib/ec2launcher/dsl/application.rb

@@ -38,6 +38,7 @@ module EC2Launcher
 
 			attr_reader :name
 
+			dsl_accessor :availability_zone
 			dsl_accessor :basename
 			dsl_accessor :inherit
 			dsl_accessor :instance_type
@@ -48,6 +49,12 @@ module EC2Launcher
 			dsl_array_accessor :packages
 			dsl_array_accessor :roles
 
+			# Name of the AMI to use for new instances. Optional.
+			# Can be either a string or a regular expression.
+			#
+			# @param [Array, nil] Either an array of parameters or nil to return the AMI name.
+			dsl_regex_accessor :ami_name
+
 			def initialize(name)
 				@name = name
 				@email_notifications = nil
@@ -59,34 +66,6 @@ module EC2Launcher
 				self
 			end
 
-			# Name of the AMI to use for new instances. Optional.
-			# Can be either a string or a regular expression.
-			#
-			# @param [Array, nil] Either an array of parameters or nil to return the AMI name.
-			def ami_name(*ami_name)
-				if ami_name.empty?
-					@ami_name
-				else
-					if ami_name[0].kind_of? String
-						@ami_name = /#{ami_name[0]}/
-					else
-						@ami_name = ami_name[0]
-					end
-					self
-				end
-			end
-
-			# Name of the availability zone to use for new instances. Optional.
-			# Must be one of EC2Launcher::AVAILABILITY_ZONES.
-			def availability_zone(*zone)
-				if zone.empty?
-					@availability_zone
-				else
-					@availability_zone = zone[0].to_s
-					self
-				end
-			end
-
 			def block_devices(*block_device_data)
 				if block_device_data.empty?
 					@block_devices
@@ -156,26 +135,6 @@ module EC2Launcher
 				end
 			end
 
-			# Gems to install. Optional.
-			#
-			# Expects either a single String naming a gem to install or
-			# an Array of gems.
-			#
-			# Can be specified multiple times.
-			def gems(*gems)
-				if gems.empty?
-					@gems
-				else
-					@gems = [] if @gems.nil?
-					if gems[0].kind_of? Array
-						@gems += gems[0]
-					else
-						@gems << gems[0]
-					end
-					self
-				end
-			end
-
 			# Takes values from the other server type and merges them into this one
 			def merge(other_server)
 				@name = other_server.name

data/lib/ec2launcher/dsl/config.rb

@@ -1,6 +1,8 @@
 #
 # Copyright (c) 2012 Sean Laurent
 #
+require 'ec2launcher/dsl/helper'
+
 module EC2Launcher
   module DSL
     class ConfigDSL
@@ -31,53 +33,17 @@ config do
   config_manager "chef"
 end
 }.gsub(/^ /, '')
+
+      dsl_accessor :package_manager
+      dsl_accessor :config_manager
+
+      dsl_array_accessor :applications
+      dsl_array_accessor :environments
       
       def initialize()
         @environments = []
         @applications = []
       end
-
-      def environments(*environments)
-        if environments.empty?
-          @environments
-        else
-          if environments[0].kind_of? Array
-            @environments = @environments[0]
-          else
-            @environments = [ environments[0] ]
-          end
-          self
-        end
-      end
-
-      def applications(*applications)
-        if applications.empty?
-          @applications
-        else
-          if applications[0].kind_of? Array
-            @applications = @applications[0]
-          else
-            @applications = [ applications[0] ]
-          end
-          self
-        end
-      end
-
-      def package_manager(*package_manager)
-        if package_manager.empty?
-          @package_manager
-        else
-          @package_manager = package_manager[0]
-        end
-      end
-
-      def config_manager(*config_manager)
-        if config_manager.empty?
-          @config_manager
-        else
-          @config_manager = config_manager[0]
-        end
-      end
     end
   end
 end

data/lib/ec2launcher/dsl/environment.rb

@@ -15,6 +15,7 @@ module EC2Launcher
 			attr_reader :precommands
 			attr_reader :postcommands
 
+			dsl_accessor :availability_zone
 			dsl_accessor :aws_keyfile
 			dsl_accessor :chef_path
 			dsl_accessor :chef_server_url
@@ -28,19 +29,26 @@ module EC2Launcher
 			dsl_accessor :short_name
 			dsl_accessor :subnet
 
+			dsl_array_accessor :aliases
 			dsl_array_accessor :gems
 			dsl_array_accessor :packages
 			dsl_array_accessor :precommand
 			dsl_array_accessor :postcommand
 			dsl_array_accessor :roles
 
+			# Name of the AMI to use for new instances. Optional.
+			# Can be either a string or a regular expression.
+			#
+			# @param [Array, nil] Either an array of parameters or nil to return the AMI name.
+			dsl_regex_accessor :ami_name
+
 			def initialize()
 				@aliases = []
 				@email_notifications = nil
 				@gems = []
 				@packages = []
-				@precommands = []
-				@postcommands = []
+				@precommand = []
+				@postcommand = []
 				@roles = []
 				@security_groups = {}
 			end
@@ -51,40 +59,6 @@ module EC2Launcher
 				self
 			end
 
-			def aliases(*aliases)
-				if aliases.empty?
-					@aliases
-				else
-					if aliases[0].kind_of? String
-						@aliases = [ aliases[0] ]
-					else
-						@aliases = aliases[0]
-					end
-				end
-			end
-
-			def ami_name(*ami_name)
-				if ami_name.empty?
-					@ami_name
-				else
-					if ami_name[0].kind_of? String
-						@ami_name = /#{ami_name[0]}/
-					else
-						@ami_name = ami_name[0]
-					end
-					self
-				end
-			end
-
-			def availability_zone(*zone)
-				if zone.empty?
-					@availability_zone
-				else
-					@availability_zone = zone[0].to_s
-					self
-				end
-			end
-
 			# Takes values from the other environment and merges them into this one
 			def merge(other_env)
 				@name =other_env.name
@@ -92,8 +66,8 @@ module EC2Launcher
 				@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?
+				@precommand += other_env.precommand unless other_env.precommand.nil?
+				@postcommand += other_env.postcommand unless other_env.postcommand.nil?
 				unless other_env.security_groups.nil?
 					other_env.security_groups.keys.each do |key|
 						@security_groups[key] = [] if @security_groups[key].nil?

data/lib/ec2launcher/dsl/helper.rb

@@ -36,4 +36,23 @@ class Module
       }
     }
   end
+
+  def dsl_regex_accessor(*symbols)
+    symbols.each { |sym|
+      class_eval %{
+        def #{sym}(*val)
+          if val.empty?
+            @#{sym}
+          else
+            if val[0].kind_of? String
+              @#{sym} = Regexp.new(val[0])
+            else
+              @#{sym} = val[0]
+            end
+            self
+          end
+        end
+      }
+    }
+  end
 end

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -381,15 +381,15 @@ module EC2Launcher
         instance = launch_instance(fqdn_names[i], ami.ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
         instances << instance
 
-        public_dns_name = instance.public_dns_name.nil? ? "no public dns" : instance.public_dns_name
-        private_dns_name = instance.private_dns_name.nil? ? "no private dns" : instance.private_dns_name
+        public_dns_name = get_instance_dns(instance, true)
+        private_dns_name = get_instance_dns(instance, false)
         @log.info "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
       end
 
       @log.info "********************"    
       fqdn_names.each_index do |i|
-        public_dns_name = instances[i].public_dns_name.nil? ? "n/a" : instances[i].public_dns_name
-        private_dns_name = instances[i].private_dns_name.nil? ? "n/a" : instances[i].private_dns_name
+        public_dns_name = get_instance_dns(instances[i], true)
+        private_dns_name = get_instance_dns(instances[i], false)
         @log.warn "** New instance: #{fqdn_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
       end
 
@@ -464,19 +464,6 @@ module EC2Launcher
       dirs
     end
 
-    # Builds the path to an executable.
-    def build_path(instance_path, executable, default_path)
-      app_path = default_path
-      unless instance_path.nil?
-        if instance_path =~ /#{executable}$/
-          app_path = instance_path
-        else
-          app_path = File.join(instance_path, executable)
-        end
-      end
-      app_path
-    end
-
     # Searches for the most recent AMI matching the criteria.
     #
     # @param [String] arch system archicture, `i386` or `x86_64`
@@ -530,6 +517,19 @@ module EC2Launcher
       AmiDetails.new(ami_name, ami_id)
     end
 
+    # Retrieves either the public or private DNS entry for an EC2 Instance. Returns "n/a" if the
+    # request DNS entry is undefined.
+    #
+    # @param [AWS::EC2::Instance] ec2 instance
+    # @param [Boolean] True for public DNS or False for private DNS
+    #
+    # @return [String] DNS for the instance or "n/a" if undefined.
+    #
+    def get_instance_dns(ec2_instance, public = true)
+      dns_name = public ? instance.public_dns_name : instance.private_dns_name
+      dns_name.nil? ? "n/a" : dns_name
+    end
+
     # Initializes connections to the AWS SDK
     #
     def initialize_aws()
@@ -827,8 +827,9 @@ module EC2Launcher
       user_data += "\necho '#{setup_json.to_json}' > /tmp/setup.json"
 
       # pre-commands, if necessary
-      unless @environment.precommands.nil? || @environment.precommands.empty?
-        commands = @environment.precommands.collect {|cmd| substitute_command_variables(cmd) }
+      puts "Precommands: #{@environment.precommands}"
+      unless @environment.precommand.nil? || @environment.precommand.empty?
+        commands = @environment.precommand.collect {|cmd| substitute_command_variables(cmd) }
         user_data += "\n" + commands.join("\n")
       end
 
@@ -875,8 +876,8 @@ module EC2Launcher
       end
 
       # Post commands
-      unless @environment.postcommands.nil? || @environment.postcommands.empty?
-        commands = @environment.postcommands.collect {|cmd| substitute_command_variables(cmd) }
+      unless @environment.postcommand.nil? || @environment.postcommand.empty?
+        commands = @environment.postcommand.collect {|cmd| substitute_command_variables(cmd) }
         user_data += "\n" + commands.join("\n")
       end
       user_data

metadata

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