cloud-maker 0.2.0 → 0.2.1

data/bin/cloud-maker

@@ -96,6 +96,11 @@ class CloudMakerCLI < Thor
     :type => :hash,
     :default => {},
     :desc => "Set tags for EC2, merges with and overrides the tag property in the CloudMaker config"
+  method_option :yes,
+    :alias => '-y',
+    :type => :boolean,
+    :default => false,
+    :desc => "Answer yes to any confirmation prompts automatically."
   def launch(instance_config_yaml)
     puts "--------------------------------------------------------------------------------".green
     puts "Launching new EC2 instance"
@@ -105,7 +110,7 @@ class CloudMakerCLI < Thor
 
     print_config_hash(config.to_hash)
 
-    if yes?("Launch a new EC2 instance with the options above? (y/n)")
+    if options.yes || yes?("Launch a new EC2 instance with the options above? (y/n)")
       cloud_maker = CloudMaker::Ec2.new(
         :aws_access_key_id => options.aws_access_key_id,
         :aws_secret_access_key => options.aws_secret_access_key
@@ -162,7 +167,7 @@ class CloudMakerCLI < Thor
   end
 
   def build_config(instance_config_yaml, options)
-    config = CloudMaker::Config.from_yaml(instance_config_yaml)
+    config = CloudMaker::Config.from_yaml(instance_config_yaml, 'import_ec2' => true)
     options.set.each_pair {|key, val| config[key] = val}
 
     config['tags'] ||= {}

data/lib/cloud-maker.rb

@@ -1,5 +1,3 @@
-Bundler.require(ENV['CLOUDMAKER_ENV'].to_sym) if ENV['CLOUDMAKER_ENV']
-
 require 'yaml'
 require 'thor'
 require 'colorize'
@@ -10,4 +8,3 @@ require 'cloud_maker/config'
 require 'cloud_maker/ec2'
 require 'cloud_maker/s3_archiver'
 require 'cloud_maker/shell_executor'
-

data/lib/cloud_maker/config.rb

@@ -61,25 +61,29 @@ module CloudMaker
     #                   be used. If the detailed version is used all properties
     #                   are optional and DEFAULT_KEY_PROPERTIES will be used to
     #                   fill in the blanks.
-    #
     #   'include'     - An array of URLs or a String containing 1 URL per line
     #                   with optional # prefixed lines as comments.
     #   ...           - All valid properties of a Cloud Init config
     #                   are also valid here. See:
     #                   https://help.ubuntu.com/community/CloudInit
-    # extra_options - Extra information about the instantiation. These will not
-    #                 be used to launch the instance but will be stored in the
-    #                 archive describing the instance.
+    #
+    # extra_options   - Options that describe the config as opposed to being part
+    #                   of the config.
+    #   'config_path' - The path the config was loaded from. Used for archival purposes.
+    #   'import_ec2'  - CloudMaker::Ec2 defines properties it relies on, if this value
+    #                   is true then we pull those property definitions in.
     #
     # Returns a CloudMaker object
-    def initialize(cloud_config, extra_options)
+    def initialize(cloud_config, extra_options={})
       self.extra_options = extra_options
       cloud_config = cloud_config.dup
+
       self.options = extract_cloudmaker_config!(cloud_config)
       self.includes = extract_includes!(cloud_config)
       self.imports = extract_imports!(cloud_config)
       self.cloud_config = cloud_config
 
+      self.import(self.class.new(Ec2::CLOUD_MAKER_CONFIG)) if (extra_options['import_ec2'])
       self.imports.reverse.each do |import_path|
         self.import(self.class.from_yaml(import_path))
       end
@@ -201,11 +205,12 @@ module CloudMaker
       # from it.
       #
       # instance_config_yaml - The path of the YAML file
+      # options - Any options to pass through as options to CloudMaker::Config::initialize
       #
       # Returns a new Config
       # Raises: Exception if the file doesn't exist.
       # Raises: SyntaxError if the YAML file is invalid.
-      def from_yaml(instance_config_yaml)
+      def from_yaml(instance_config_yaml, options={})
         begin
           full_path = File.expand_path(instance_config_yaml)
           cloud_yaml = File.open(full_path, "r") #Right_AWS will base64 encode this for us
@@ -213,7 +218,11 @@ module CloudMaker
           raise "ERROR: The path to the CloudMaker config is incorrect"
         end
 
-        CloudMaker::Config.new(YAML::load(cloud_yaml), 'config_path' => full_path)
+        # loading a blank config file returns false, it's an odd degenerate case but handling
+        # it like this makes sanity checking other missing values easy.
+        config = YAML::load(cloud_yaml) || {}
+
+        CloudMaker::Config.new(config, options.merge('config_path' => full_path))
       end
     end
 

data/lib/cloud_maker/ec2.rb

@@ -9,6 +9,36 @@ module CloudMaker
     # Internal: Gets/Sets the RightAws::Ec2 instance.
     attr_accessor :ec2
 
+    # Public: A CloudMaker::Config hash that describes the config properties Ec2 relies on.
+    CLOUD_MAKER_CONFIG = {
+      'cloud-maker' => {
+        'ami' => {
+          'required' => true,
+          'description' => "The Amazon AMI ID for the instance."
+        },
+        'instance_type' => {
+          'required' => true,
+          'description' => "The Amazon instance type, eg. m1.small."
+        },
+        'availability_zone' => {
+          'required' => true,
+          'description' => "The Amazon availability zone, eg. us-east-1a"
+        },
+        'key_pair' => {
+          'default' => "",
+          'description' => "The name of an Amazon key pair, so you can actually login to the instance."
+        },
+        'elastic_ip' => {
+          'description' => "An elastic IP address you control that you would like to associate to the instance."
+        },
+        'security_group' => {
+          'default' => 'default',
+          'required' => true,
+          'description' => 'The Amazon EC2 security group to launch the instance with.'
+        }
+      }
+    }
+
     # Public: The name of the tag that will be used to find the name of an s3 bucket for archiving/information retrieval
     BUCKET_TAG = 's3_archive_bucket'
 
@@ -66,6 +96,7 @@ module CloudMaker
         :group_names => cloud_maker_config['security_group'],
         :instance_type => cloud_maker_config['instance_type'],
         :key_name => cloud_maker_config['key_pair'],
+        :availability_zone => cloud_maker_config['availability_zone'],
         :user_data => user_data
       ).first
 
@@ -81,8 +112,18 @@ module CloudMaker
         end
 
         ec2.associate_address(instance_id, :public_ip => cloud_maker_config["elastic_ip"])
+      end
 
-        instance = ec2.describe_instances([instance_id]).first # So we get the correct IP address
+      begin
+        instance = ec2.describe_instances([instance_id]).first # So we get updated tag/ip info
+      rescue RightAws::AwsError => e
+        tries ||= 0
+        tries += 1
+        if tries <= 5
+          sleep 2**tries
+        else
+          raise e
+        end
       end
 
       archiver = S3Archiver.new(

data/lib/cloud_maker/s3_archiver.rb

@@ -1,6 +1,3 @@
-require 'pry'
-require 'right_aws'
-
 module CloudMaker
   class S3Archiver
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize