cloud-maker 0.2.0.pre2 → 0.2.0

data/bin/cloud-maker

@@ -4,6 +4,8 @@ require 'cloud-maker'
 class CloudMakerCLI < Thor
   include Thor::Actions
 
+  map "--version" => :version, "-v" => :version
+
   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',
@@ -21,9 +23,35 @@ class CloudMakerCLI < Thor
     puts config.to_user_data
   end
 
+  desc "version", "Report the current version of CloudMaker"
+  def version
+    say "cloud-maker #{Gem::Specification.find_by_name('cloud-maker').version.version}"
+  end
+
   desc "terminate [AWS_INSTANCE_ID]", "Terminate the specified AWS instance"
+  method_option :aws_access_key_id,
+    :desc => "Your AWS access key id",
+    :default => ENV['AWS_ACCESS_KEY_ID'],
+    :required => true
+  method_option :aws_secret_access_key,
+    :desc => "Your AWS secret access key",
+    :default => ENV['AWS_SECRET_ACCESS_KEY'],
+    :required => true
   def terminate(aws_instance_id)
-    say "Not implemented.".red
+    info(aws_instance_id)
+
+    puts
+
+    if yes?("Are you sure you wish to terminate this instance?".red + " (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
+      )
+      cloud_maker.terminate(aws_instance_id)
+      say "The instance was terminated."
+    else
+      say "Termination aborted."
+    end
   end
 
   desc "info [AWS_INSTANCE_ID]", "Display config info about the specified AWS instance"
@@ -96,10 +124,18 @@ class CloudMakerCLI < Thor
   private
   def print_colored_hash(hash, color=:cyan)
     print_table hash.map {|key, val|
-      [key.to_s.dup.send(color), val.to_s]
+      [key.to_s.dup.send(color), colorize_inspection_string(val.to_s)]
     }
   end
 
+  def colorize_inspection_string(string)
+    string = string.dup
+    string.gsub!(/([\{\}\[\]])/, '\1'.magenta)
+    string.gsub!(/([\,])/, '\1'.yellow)
+    string.gsub!(/([\:\"\']?[0-9a-zA-Z_]*[\"\']?)=>/, '\1'.cyan + '=>')
+    string
+  end
+
   def print_config_hash(hash)
     puts
     say "CloudInit configuration:".green
@@ -107,14 +143,13 @@ class CloudMakerCLI < Thor
     puts
 
     if (!hash['include'].empty?)
-      puts
       say 'Include URLs:'.green
       hash['include'].each do |url|
         puts url
       end
+      puts
     end
 
-    puts
     say "CloudMaker configuration:".green
     print_colored_hash hash['cloud-maker']
     puts
@@ -133,7 +168,7 @@ class CloudMakerCLI < Thor
     config['tags'] ||= {}
     config['tags'].merge!(options.tags)
 
-    if !config.valid?
+    if !config.missing_values.empty?
       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
@@ -146,7 +181,16 @@ class CloudMakerCLI < Thor
         if (config.options[key]["description"])
           say config.options[key]["description"]
         end
-        config[key] = ask "Please choose a value for #{key.cyan}: "
+
+        if config.options[key]["default"]
+          config[key] = ask "Please choose a value for #{key.cyan} [#{config.options[key]["default"]}]:"
+        else
+          config[key] = ask "Please choose a value for #{key.cyan}:"
+        end
+
+        if (config[key].empty? && config.options[key]["default"])
+          config[key] = config.options[key]["default"]
+        end
       end
     end
 

data/lib/cloud-maker.rb

@@ -1,5 +1,6 @@
 Bundler.require(ENV['CLOUDMAKER_ENV'].to_sym) if ENV['CLOUDMAKER_ENV']
 
+require 'yaml'
 require 'thor'
 require 'colorize'
 require 'deep_merge'

data/lib/cloud_maker/config.rb

@@ -40,7 +40,9 @@ module CloudMaker
     DEFAULT_KEY_PROPERTIES = {
       "environment" => true,
       "required" => false,
-      "value" => nil
+      "value" => nil,
+      "default" => nil,
+      "description" => nil
     }
 
     # Public: Initializes a new CloudMaker object.
@@ -96,7 +98,7 @@ module CloudMaker
     #
     # Returns an Array of required keys that are missing values.
     def missing_values
-      self.options.select {|key, option| option["required"] && option["value"].nil?}.map(&:first).map(&:dup)
+      self.options.select {|key, option| (option["required"] || option["default"]) && option["value"].nil?}.map(&:first).map(&:dup)
     end
 
     # Returns a Hash of all of the CloudMaker specific properties in the configuration.

data/lib/cloud_maker/ec2.rb

@@ -32,9 +32,11 @@ module CloudMaker
       self.aws_secret_access_key = options[:aws_secret_access_key]
 
       self.ec2 = RightAws::Ec2.new(self.aws_access_key_id, self.aws_secret_access_key)
-
     end
 
+    # Public: Fetch archived information about an instance
+    #
+    # Returns a hash of information about the instance as it was launched
     def info(instance_id)
       bucket = self.ec2.describe_tags(:filters => {'resource-id' => instance_id, 'key' => BUCKET_TAG}).first[:value]
       archiver = S3Archiver.new(
@@ -46,6 +48,13 @@ module CloudMaker
       archiver.load_archive
     end
 
+    # Public: Terminates the specified EC2 instance.
+    #
+    # Returns a RightAws supplied Hash describing the terminated instance.
+    def terminate(instance_id)
+      self.ec2.terminate_instances([instance_id])
+    end
+
     # Public: Launches a new EC2 instance, associates any specified elastic IPS
     # with it, adds any specified tags, and archives the launch details to S3.
     #

data/lib/cloud_maker/s3_archiver.rb

@@ -1,3 +1,4 @@
+require 'pry'
 require 'right_aws'
 
 module CloudMaker

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre2
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Nathan Baxter
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: nathan.baxter@airbnb.cloud-maker
+email: nathan.baxter@airbnb.com
 executables:
 - cloud-maker
 extensions: []
@@ -120,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24