cloud-maker 0.0.0 → 0.1.0.pre

data/bin/cloud-maker

@@ -2,11 +2,28 @@
 require 'thor'
 require 'colorize'
 require 'cloud-maker'
-# require 'pry'
+require 'pry'
 
 class CloudMakerCLI < Thor
   include Thor::Actions
 
+  desc "user_data [INSTANCE_CONFIG_YAML]", "Generate the Cloud Init user data for an instance described by INSTANCE_CONFIG_YAML"
+  method_option :set,
+    :alias => '-s',
+    :type => :hash,
+    :default => {},
+    :desc => "Set parameters in the CloudMaker config"
+  method_option :tags,
+    :alias => '-t',
+    :type => :hash,
+    :default => {},
+    :desc => "Set tags for EC2, merges with and overrides the tag property in the CloudMaker config"
+  def user_data(instance_config_yaml)
+    config = build_config(instance_config_yaml, options)
+    say "User Data:".green
+    puts config.to_user_data
+  end
+
   desc "launch [INSTANCE_CONFIG_YAML]", "Launch a new EC2 instance as described by INSTANCE_CONFIG_YAML"
   method_option :aws_access_key_id,
     :desc => "Your AWS access key id",
@@ -21,30 +38,17 @@ class CloudMakerCLI < Thor
     :type => :hash,
     :default => {},
     :desc => "Set parameters in the CloudMaker config"
+  method_option :tags,
+    :alias => '-t',
+    :type => :hash,
+    :default => {},
+    :desc => "Set tags for EC2, merges with and overrides the tag property in the CloudMaker config"
   def launch(instance_config_yaml)
-    puts "---------------------------"
+    puts "--------------------------------------------------------------------------------".green
     puts "Launching new EC2 instance"
-    puts "---------------------------\n"
+    puts "--------------------------------------------------------------------------------\n".green
 
-    config = CloudMaker::Config.from_yaml(instance_config_yaml)
-    options.set.each_pair {|key, val| config[key] = val}
-
-    if !config.valid?
-      say "Before an instance can be launched we need a few more values to be specified.".yellow
-      say "Currently missing: #{config.missing_values.map{|key| key.cyan}.join(', ')}"
-      puts
-
-      config.missing_values.each do |key|
-        config[key] = ENV[key] if ENV[key]
-      end
-
-      config.missing_values.each do |key|
-        if (config.options[key]["description"])
-          say config.options[key]["description"]
-        end
-        config[key] = ask "Please choose a value for #{key.cyan}: "
-      end
-    end
+    config = build_config(instance_config_yaml, options)
 
     cloud_maker = CloudMaker::Ec2.new(config,
       :aws_access_key_id => options.aws_access_key_id,
@@ -80,11 +84,35 @@ class CloudMakerCLI < Thor
     end
   end
 
-  desc "scratch", "Play with Thor"
-  def scratch(arg1)
-    say 'hello'
-    say 'hello in red'.red
+  private
+  def build_config(instance_config_yaml, options)
+    config = CloudMaker::Config.from_yaml(instance_config_yaml)
+    options.set.each_pair {|key, val| config[key] = val}
+
+    config['tags'] ||= {}
+    config['tags'].merge!(options.tags)
+
+    if !config.valid?
+      say "Before an instance can be launched we need a few more values to be specified.".yellow
+      say "Currently missing: #{config.missing_values.map{|key| key.cyan}.join(', ')}"
+      puts
+
+      config.missing_values.each do |key|
+        config[key] = ENV[key] if ENV[key]
+      end
+
+      config.missing_values.each do |key|
+        if (config.options[key]["description"])
+          say config.options[key]["description"]
+        end
+        config[key] = ask "Please choose a value for #{key.cyan}: "
+      end
+    end
+
+    config
   end
 end
 
+
+
 CloudMakerCLI.start

data/lib/cloud_maker/ec2.rb

@@ -48,15 +48,11 @@ module CloudMaker
 
       instance_id = instance[:aws_instance_id]
 
-      puts "Launched instance: #{instance_id.to_s.on_light_blue}"
-
       ec2.create_tags(instance_id, self.config["tags"]) if self.config["tags"]
 
       if (self.config["elastic_ip"])
         #we can't associate IPs while the state is pending
         while instance[:aws_state] == 'pending'
-          print '.'
-          STDOUT.flush
           #this is going to hammer EC2 a bit, it might be necessary to add some delay in here
           instance = ec2.describe_instances([instance_id]).first
         end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.0.0
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Nathan Baxter
@@ -88,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24