cloud-maker 0.5.1 → 0.6.0

data/bin/cloud-maker

@@ -45,7 +45,14 @@ class CloudMakerCLI < Thor
     say "You can remove this authorization from the GitHub interface if needed."
     say "Your password will not be saved to disk.".green
     user = ask("What is your GitHub #{"username".cyan}?")
+    state = Termios.getattr(STDIN)
+    new_settings = state.dup
+    new_settings.c_lflag &= ~(Termios::ECHO | Termios::ICANON)
+    new_settings.c_cc[Termios::VMIN] = 1
+    Termios.setattr(STDIN, Termios::TCSANOW, new_settings)
     password = ask("What is your GitHub #{"password".cyan}?")
+    Termios.setattr(STDIN, Termios::TCSANOW, state)
+    puts
     begin
       response = JSON.parse(RestClient::Request.new(
         :method => "POST",

data/lib/cloud-maker.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'json'
 require 'yaml'
 require 'thor'
@@ -5,6 +6,7 @@ require 'colorize'
 require 'deep_merge'
 require 'aws-sdk'
 require 'rest-client'
+require 'termios'
 
 require 'cloud_maker/config'
 require 'cloud_maker/ec2'

data/lib/cloud_maker/config.rb

@@ -108,6 +108,20 @@ module CloudMaker
       self['tags']['cloud_maker_config'] = self.config_name
     end
 
+    def method_missing(method=nil, *args)
+      if method.to_s[-1] == "?"
+        key_name = method.to_s[0, method.to_s.length-1]
+        value = self[key_name]
+        if value.respond_to? :empty?
+          !value.empty?
+        else
+          !value.nil?
+        end
+      else
+        super
+      end
+    end
+
     def config_name
       files = self.imports.dup
       files.push self.extra_options['config_path'] if self.extra_options['config_path']
@@ -188,8 +202,9 @@ module CloudMaker
           env_run_cmds.push(set_environment_variable_cmd(key, properties["value"]))
         end
       end
+      env_run_cmds.push("touch /var/lib/cloud/cloud_init_complete")
 
-      return "#cloud-boothook\n#!/bin/sh\n#{env_run_cmds.join("\n")}\n"
+      return "#cloud-boothook\n#!/bin/sh\nif [ ! -f /var/lib/cloud/cloud_init_complete ]; then\n#{env_run_cmds.join("\n")}\nfi\n"
     end
 
 

data/lib/cloud_maker/ec2.rb

@@ -27,6 +27,7 @@ module CloudMaker
           'description' => "The name of an Amazon key pair, so you can actually login to the instance."
         },
         'elastic_ip' => {
+          'default' => '',
           'description' => "An elastic IP address you control that you would like to associate to the instance."
         },
         'security_group' => {
@@ -37,6 +38,10 @@ module CloudMaker
         'iam_role' => {
           'default' => '',
           'description' => 'The IAM instance profile name or ARN you would like to use.'
+        },
+        'cname' => {
+          'default' => '',
+          'description' => "A dns entry you would like to CNAME to this instance."
         }
       }
     }
@@ -114,11 +119,33 @@ module CloudMaker
 
       instance.tags.set(cloud_maker_config['tags']) if cloud_maker_config['tags']
 
-      if cloud_maker_config["elastic_ip"]
+      if cloud_maker_config.elastic_ip? || cloud_maker_config.cname?
         while instance.status == :pending
           #wait
         end
-        instance.associate_elastic_ip(cloud_maker_config["elastic_ip"])
+        instance.associate_elastic_ip(cloud_maker_config["elastic_ip"]) if cloud_maker_config.elastic_ip?
+
+        if cloud_maker_config.cname?
+          r53 = AWS::Route53::Client.new(:access_key_id => self.aws_access_key_id, :secret_access_key => self.aws_secret_access_key)
+
+          zone = r53.list_hosted_zones[:hosted_zones].select {|zone|
+            cloud_maker_config['cname'] + '.' =~ /#{Regexp.escape(zone[:name])}$/
+          }.first
+
+          r53.change_resource_record_sets(
+            :hosted_zone_id => zone[:id],
+            :change_batch => {
+              :comment => "CloudMaker initialization of #{instance.instance_id}.", :changes => [{
+                :action => "CREATE", :resource_record_set => {
+                  :name => cloud_maker_config['cname'],
+                  :type => 'CNAME',
+                  :ttl => 60,
+                  :resource_records => [{:value => instance.dns_name}]
+                }
+              }]
+            }
+          )
+        end
       end
 
       archiver = S3Archiver.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-maker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -92,6 +92,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby-termios
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement