ec2launcher 1.0.32 → 1.0.33

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.33
+
+* Refactored config, application and environment loading code to allow easier reuse from other projects.
+
 ## 1.0.32
 
 * Copied Alestic's runurl script to avoid problems with LaunchPad is down. Switched to using ec2launcher's copy of runurl.

data/lib/ec2launcher.rb

@@ -19,6 +19,8 @@ require 'ec2launcher/instance_paths_config'
 require 'ec2launcher/block_device_builder'
 require 'ec2launcher/hostname_generator'
 
+require 'ec2launcher/config_wrapper'
+
 include Log4r
 
 module EC2Launcher
@@ -57,54 +59,11 @@ module EC2Launcher
       end
       
       # Load configuration data
-      @config = load_config_file
-
-      environments_directories = process_directory_list(@config.environments, "environments", "Environments", false)
-      applications_directories = process_directory_list(@config.applications, "applications", "Applications", true)
-
-      # Load other environments
-      @environments = { }
-      environments_directories.each do |env_dir|
-        Dir.entries(env_dir).each do |env_name|
-          filename = File.join(env_dir, env_name)
-          next if File.directory?(filename)
+      config_wrapper = ConfigWrapper.new(@options.directory)
 
-          new_env = load_environment_file(filename)
-          validate_environment(filename, new_env)
-
-          @environments[new_env.name] = new_env
-          new_env.aliases.each {|env_alias| @environments[env_alias] = new_env }
-        end
-      end
-
-      # Load applications
-      @applications = {}
-      applications_directories.each do |app_dir|
-        Dir.entries(app_dir).each do |application_name|
-          filename = File.join(app_dir, application_name)
-          next if File.directory?(filename)
-
-          apps = EC2Launcher::DSL::ApplicationDSL.execute(File.read(filename)).applications
-          apps.each do |new_application|
-            @applications[new_application.name] = new_application
-            validate_application(filename, new_application)
-          end
-        end
-      end
-
-      # Process inheritance rules for environments
-      @environments.values.each do |env|
-        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?
-
-        new_app = process_application_inheritance(app)
-        @applications[new_app.name] = new_app
-      end
+      @config = config_wrapper.config
+      @environments = config_wrapper.environments
+      @applications = config_wrapper.applications
     
       if @options.list
         puts ""
@@ -452,23 +411,6 @@ module EC2Launcher
       end
     end
 
-    # Given a list of possible directories, build a list of directories that actually exist.
-    #
-    # @param [Array<String>] directories list of possible directories
-    # @return [Array<String>] directories that exist or an empty array if none of the directories exist.
-    #
-    def build_list_of_valid_directories(directories)
-      dirs = []
-      unless directories.nil?
-        if directories.kind_of? Array
-          directories.each {|d| dirs << d if File.directory?(d) }
-        else
-          dirs << directories if File.directory?(directories)
-        end
-      end
-      dirs
-    end
-
     # Searches for the most recent AMI matching the criteria.
     #
     # @param [String] arch system archicture, `i386` or `x86_64`
@@ -640,103 +582,6 @@ module EC2Launcher
       new_instance
     end
 
-    # Read in the configuration file stored in the workspace directory.
-    # By default this will be './config.rb'.
-    #
-    # @return [EC2Launcher::Config] the parsed configuration object
-    def load_config_file()
-      # Load configuration file
-      config_filename = File.join(@options.directory, "config.rb")
-      abort("Unable to find 'config.rb' in '#{@options.directory}'") unless File.exists?(config_filename)
-      EC2Launcher::DSL::ConfigDSL.execute(File.read(config_filename)).config
-    end
-
-    # Load and parse an environment file
-    #
-    # @param [String] name full pathname of the environment file to load
-    # @param [EC2Launcher::Environment, nil] default_environment the default environment, 
-    #        which will be used as the base for the new environment. Optional.
-    # @param [Boolean] fail_on_missing print an error and exit if the file does not exist.
-    #
-    # @return [EC2Launcher::Environment] the new environment loaded from the specified file.
-    #
-    def load_environment_file(name, fail_on_missing = false)
-      unless File.exists?(name)
-        abort("Unable to read environment: #{name}") if fail_on_missing
-        return nil
-      end
-
-      load_env = EC2Launcher::DSL::Environment.new
-      load_env.load(File.read(name))
-      load_env
-    end
-
-    # Attempts to build a list of valid directories.
-    #
-    # @param [Array<String>, nil] target_directories list of possible directories
-    # @param [String] default_directory directory to use if the target_directories list is empty or nil
-    # @param [String] name name of the type of directory. Used only for error messages.
-    # @param [Boolean] fail_on_error exit with an error if the list of valid directories is empty
-    #
-    # @return [Array<String] list of directories that exist
-    #
-    def process_directory_list(target_directories, default_directory, name, fail_on_error = false)
-      dirs = []
-      if target_directories.nil?
-        dirs << File.join(@options.directory, default_directory)
-      else
-        target_directories.each {|d| dirs << File.join(@options.directory, d) }
-      end
-      valid_directories = build_list_of_valid_directories(dirs)
-
-      if valid_directories.empty?
-        temp_dirs = dirs.each {|d| "'#{d}'"}.join(", ")
-        if fail_on_error
-          abort("ERROR - #{name} directories not found: #{temp_dirs}")
-        else
-          @log.warn "WARNING - #{name} directories not found: #{temp_dirs}"
-        end
-      end
-
-      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
-
     # Given a string containing a command to run, replaces any inline variables.
     # Supported variables include:
     #   * @APPLICATION@ - name of the application
@@ -764,32 +609,6 @@ module EC2Launcher
       cmd
     end
 
-    # Validates all settings in an application file
-    #
-    # @param [String] filename name of the application file
-    # @param [EC2Launcher::DSL::Application] application application object to validate
-    #
-    def validate_application(filename, application)
-      unless application.availability_zone.nil? || AVAILABILITY_ZONES.include?(application.availability_zone)
-        abort("Invalid availability zone '#{application.availability_zone}' in application '#{application.name}' (#{filename})")
-      end
-
-      unless application.instance_type.nil? || INSTANCE_TYPES.include?(application.instance_type)
-        abort("Invalid instance type '#{application.instance_type}' in application '#{application.name}' (#{filename})")
-      end
-    end
-
-    # Validates all settings in an environment file
-    #
-    # @param [String] filename name of the environment file
-    # @param [EC2Launcher::DSL::Environment] environment environment object to validate
-    #
-    def validate_environment(filename, environment)
-      unless environment.availability_zone.nil? || AVAILABILITY_ZONES.include?(environment.availability_zone)
-        abort("Invalid availability zone '#{environment.availability_zone}' in environment '#{environment.name}' (#{filename})")
-      end
-    end
-
     # Builds the launch scripts that should run on the new instance.
     #
     # @param [String] fqdn Fully qualified hostname

data/lib/ec2launcher/application_processor.rb

@@ -0,0 +1,81 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'log4r'
+
+require 'ec2launcher/directory_processing'
+require 'ec2launcher/dsl/application'
+require 'ec2launcher/dsl/environment'
+
+include Log4r
+
+module EC2Launcher
+  class ApplicationProcessor
+    attr_accessor :applications
+
+    include DirectoryProcessing
+
+    def initialize(base_directory, applications_directories)
+      app_dirs = process_directory_list(base_directory, applications_directories, "applications", "Applications", true)
+
+      # Load applications
+      @applications = {}
+      app_dirs.each do |app_dir|
+        Dir.entries(app_dir).each do |application_name|
+          filename = File.join(app_dir, application_name)
+          next if File.directory?(filename)
+
+          apps = EC2Launcher::DSL::ApplicationDSL.execute(File.read(filename)).applications
+          apps.each do |new_application|
+            @applications[new_application.name] = new_application
+            validate_application(filename, new_application)
+          end
+        end
+      end
+
+      # Process inheritance rules for applications
+      @applications.values.each do |app|
+        next if app.inherit.nil?
+
+        new_app = process_application_inheritance(app)
+        @applications[new_app.name] = new_app
+      end
+    end
+
+    private
+
+    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
+
+    # Validates all settings in an application file
+    #
+    # @param [String] filename name of the application file
+    # @param [EC2Launcher::DSL::Application] application application object to validate
+    #
+    def validate_application(filename, application)
+      unless application.availability_zone.nil? || AVAILABILITY_ZONES.include?(application.availability_zone)
+        abort("Invalid availability zone '#{application.availability_zone}' in application '#{application.name}' (#{filename})")
+      end
+
+      unless application.instance_type.nil? || INSTANCE_TYPES.include?(application.instance_type)
+        abort("Invalid instance type '#{application.instance_type}' in application '#{application.name}' (#{filename})")
+      end
+    end
+  end
+end

data/lib/ec2launcher/directory_processing.rb

@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'log4r'
+
+include Log4r
+
+module EC2Launcher
+	module DirectoryProcessing
+		# Attempts to build a list of valid directories.
+		#
+		# @param [Array<String>, nil] target_directories list of possible directories
+		# @param [String] default_directory directory to use if the target_directories list is empty or nil
+		# @param [String] name name of the type of directory. Used only for error messages.
+		# @param [Boolean] fail_on_error exit with an error if the list of valid directories is empty
+		#
+		# @return [Array<String] list of directories that exist
+		#
+		def process_directory_list(base_directory, target_directories, default_directory, name, fail_on_error = false)
+			log = Logger['ec2launcher']
+			dirs = []
+			if target_directories.nil?
+			  dirs << File.join(base_directory, default_directory)
+			else
+			  target_directories.each do |d| 
+			  	dirs << File.join(base_directory, d)
+			  end
+			end
+			valid_directories = build_list_of_valid_directories(dirs)
+
+			if valid_directories.empty?
+			  temp_dirs = dirs.each {|d| "'#{d}'"}.join(", ")
+			  if fail_on_error
+			    abort("ERROR - #{name} directories not found: #{temp_dirs}")
+			  else
+			    log.warn "WARNING - #{name} directories not found: #{temp_dirs}"
+			  end
+			end
+
+			valid_directories
+		end
+
+		private
+
+    # Given a list of possible directories, build a list of directories that actually exist.
+    #
+    # @param [Array<String>] directories list of possible directories
+    # @return [Array<String>] directories that exist or an empty array if none of the directories exist.
+    #
+    def build_list_of_valid_directories(directories)
+      dirs = []
+      unless directories.nil?
+        if directories.kind_of? Array
+          directories.each {|d| dirs << d if File.directory?(d) }
+        else
+          dirs << directories if File.directory?(directories)
+        end
+      end
+      dirs
+    end
+	end
+end

data/lib/ec2launcher/environment_processor.rb

@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+require 'rubygems'
+require 'log4r'
+
+require 'ec2launcher/directory_processing'
+
+include Log4r
+
+module EC2Launcher
+  class EnvironmentProcessor
+    attr_accessor :environments
+
+    include DirectoryProcessing
+
+    def initialize(base_directory, environments_directories)
+      env_dirs = process_directory_list(base_directory, environments_directories, "environments", "Environments", false)
+
+      # Load other environments
+      @environments = { }
+      env_dirs.each do |env_dir|
+        Dir.entries(env_dir).each do |env_name|
+          filename = File.join(env_dir, env_name)
+          next if File.directory?(filename)
+
+          new_env = load_environment_file(filename)
+          validate_environment(filename, new_env)
+
+          @environments[new_env.name] = new_env
+          new_env.aliases.each {|env_alias| @environments[env_alias] = new_env }
+        end
+      end
+
+      # Process inheritance rules for environments
+      @environments.values.each do |env|
+        new_env = process_environment_inheritance(env)
+        @environments[new_env.name] = new_env
+      end
+    end
+
+    private
+
+    # Load and parse an environment file
+    #
+    # @param [String] name full pathname of the environment file to load
+    # @param [EC2Launcher::Environment, nil] default_environment the default environment, 
+    #        which will be used as the base for the new environment. Optional.
+    # @param [Boolean] fail_on_missing print an error and exit if the file does not exist.
+    #
+    # @return [EC2Launcher::Environment] the new environment loaded from the specified file.
+    #
+    def load_environment_file(name, fail_on_missing = false)
+      unless File.exists?(name)
+        abort("Unable to read environment: #{name}") if fail_on_missing
+        return nil
+      end
+
+      load_env = EC2Launcher::DSL::Environment.new
+      load_env.load(File.read(name))
+      load_env
+    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 environment file
+    #
+    # @param [String] filename name of the environment file
+    # @param [EC2Launcher::DSL::Environment] environment environment object to validate
+    #
+    def validate_environment(filename, environment)
+      unless environment.availability_zone.nil? || AVAILABILITY_ZONES.include?(environment.availability_zone)
+        abort("Invalid availability zone '#{environment.availability_zone}' in environment '#{environment.name}' (#{filename})")
+      end
+    end
+  end
+end

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -377,7 +377,16 @@ def run_chef_client(chef_path)
 end
 
 result = run_chef_client(chef_path)
-run_chef_client(chef_path) unless result == 0
+unless result == 0
+  puts "***** ERROR running chef-client. Relaunching chef-client in 30 seconds."
+  sleep(30)
+  result = run_chef_client(chef_path)
+end
+unless result == 0
+  puts "***** ERROR running chef-client. Relaunching chef-client in 30 seconds."
+  sleep(30)
+  result = run_chef_client(chef_path)
+end
 
 ##############################
 # EMAIL NOTIFICATION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -60,15 +60,18 @@ files:
 - bin/ec2launcher
 - ec2launcher.gemspec
 - lib/ec2launcher.rb
+- lib/ec2launcher/application_processor.rb
 - lib/ec2launcher/backoff_runner.rb
 - lib/ec2launcher/block_device_builder.rb
 - lib/ec2launcher/defaults.rb
+- lib/ec2launcher/directory_processing.rb
 - lib/ec2launcher/dsl/application.rb
 - lib/ec2launcher/dsl/block_device.rb
 - lib/ec2launcher/dsl/config.rb
 - lib/ec2launcher/dsl/email_notification.rb
 - lib/ec2launcher/dsl/environment.rb
 - lib/ec2launcher/dsl/helper.rb
+- lib/ec2launcher/environment_processor.rb
 - lib/ec2launcher/hostname_generator.rb
 - lib/ec2launcher/init_options.rb
 - lib/ec2launcher/instance_paths_config.rb