ami 1.1.0 → 1.2.0

data/README.md

@@ -1,6 +1,6 @@
-# Kiln
+# AMI
 
-A gem for automating the creation of EC2 AMIs
+A gem for automating the creation of EC2 Instance Store AMIs
 
 ## Installation
 
@@ -13,7 +13,7 @@ or add to your Gemfile
 ```ruby
 source "https://rubygems.org"
 
-gem "ami", "~> 1.0.0"
+gem "ami", "~> 1.2.0"
 ```
 
 ## Usage
@@ -34,6 +34,15 @@ information necessary to create your AMI, this can be located in either
 
 For an example of the values see: [example config.json](ami/config.json)
 
+## Planned Features
+
+### v1.3.0
+
+ * Provide more concise output options so that progress is easier to monitor
+ without terminal spam
+ * Provide some basic tools to aid in composing various installers such that
+ the same installer isn't run unnecessarily if its dependencies are already met
+
 ## LICENSE
 
 MIT, see LICENSE file

data/bin/ami-create

@@ -4,4 +4,4 @@ $:.unshift(File.expand_path("../../lib", __FILE__))
 
 require 'ami'
 
-AMI::Commands::CreateAmi.new.run(ARGV)
+exit AMI::Commands::CreateAmi.new.run(ARGV)

data/lib/ami.rb

@@ -4,6 +4,7 @@ require 'ami/definition'
 require 'ami/server'
 require 'ami/config'
 require 'ami/ssh'
+require 'ami/include_helper'
 require 'ami/instance_provisioner'
 require 'ami/config_loader'
 require 'ami/commands/list'

data/lib/ami/ami_builder/ubuntu_precise.rb

@@ -3,15 +3,20 @@ module AMI
   module AmiBuilder
     class UbuntuPrecise
       def self.create(image_name, ssh, config, include_files = [])
-        include_files << '/etc/apt/trusted.gpg'
-        include_files << '/etc/apt/trustdb.gpg'
-        ssh.upload(config.cert_path, '/tmp/cert.pem')
-        ssh.upload(config.pk_path, '/tmp/pk.pem')
         ssh.run 'sudo sed -i -e "s/# deb\(.*\)multiverse/deb\1multiverse/g" /etc/apt/sources.list'
         ssh.run 'sudo apt-get update'
         ssh.run 'sudo apt-get -y install ec2-api-tools ec2-ami-tools'
+
+        # If we don't explicitly override include_files then by default include
+        # all gpg and pem files so we actually get a working instance
+        if include_files.empty? && !include_files.nil?
+          include_files = AMI::IncludeHelper.find(ssh, ["pem", "gpg", "crt"])
+        end
+
+        ssh.upload(config.cert_path, '/tmp/cert.pem')
+        ssh.upload(config.pk_path, '/tmp/pk.pem')
         ssh.run 'mkdir /tmp/ami'
-        ssh.run "sudo ec2-bundle-vol -r x86_64 -d /tmp/ami -k /tmp/pk.pem -c /tmp/cert.pem -u #{config.account_id} -i #{include_files.join(',')}"
+        ssh.run "cd /; sudo ec2-bundle-vol --debug -r x86_64 -d /tmp/ami -k /tmp/pk.pem -c /tmp/cert.pem -u #{config.account_id} -i #{include_files.join(',')}"
         ssh.run "ec2-upload-bundle -b '#{config.s3_bucket}' -m '/tmp/ami/image.manifest.xml' -a #{config.access_key} -s #{config.secret_key}"
         ssh.run "ec2-register -K /tmp/pk.pem -C /tmp/cert.pem '#{config.s3_bucket}/image.manifest.xml' -n #{image_name}"
       end

data/lib/ami/commands/create_ami.rb

@@ -3,12 +3,21 @@ module AMI
   module Commands
     class CreateAmi
       def run(argv)
-        name = argv[0]
+        if argv.include?('--help') || argv.include?('-h')
+          puts "#{$0} <options> ClassName"
+          puts "Options:"
+          puts "  --debug - Enable debug mode which stops auto-termination of servers"
+          puts ""
+          return 0
+        end
+
+        name = argv.pop
+        debug = argv.include?('--debug')
         AMI::Core.load_amis
 
         unless AMI::Core.valid_ami?(name)
           warn "Invalid AMI name #{name}. Use ami-list to see available AMIs"
-          exit 1
+          return 1
         end
 
         ami = AMI::Core.ami(name).new
@@ -26,16 +35,26 @@ module AMI
           config
         )
 
+        at_exit do
+          if server.status == :running
+            server.terminate
+          end
+        end
+
         begin
           ssh = AMI::SSH.create_connection(server, server_template.user_name)
           ami.configure(ssh, config)
           ami.create_ami(ssh, config)
           puts 'done'
-        rescue
-          warn "failure occurred, terminating server"
-          raise
-        ensure
-          server.terminate
+          return 0
+        rescue Exception => e
+          warn "Error Occurred: #{e.message}"
+          warn "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+          if debug
+            warn "Access server via 'ssh #{server_template.user_name}@#{server.dns_name}'"
+            sleep
+          end
+          return 1
         end
       end
     end

data/lib/ami/include_helper.rb

@@ -0,0 +1,19 @@
+
+module AMI
+  # Assists in gathering a list of files to include when bundling an AMI.
+  # Particularly useful for dealing with the EC2 AMI tools default of excluding
+  # all possibly sensitive files, even ones which are perfectly safe to
+  # distribute and are necessary to use some libraries/tools
+  class IncludeHelper
+    def self.find(ssh, file_types = [])
+      includes = []
+      file_types.each do |type|
+        response = ssh.run("sudo find / -type f -name \\*#{type}", :quiet => true)
+        includes += response.output.split("\n")
+        response = ssh.run("sudo find / -type l -name \\*#{type}", :quiet => true)
+        includes += response.output.split("\n")
+      end
+      includes
+    end
+  end
+end

data/lib/ami/ssh.rb

@@ -7,7 +7,7 @@ module AMI
       begin
         ssh = Gofer::Host.new(server.dns_name, user, :timeout => 30)
         ssh.ls '/' # force gofer to connect to the host
-        return ssh
+        return AMI::SSH.new(ssh)
       rescue Errno::ECONNREFUSED, Timeout::Error, Errno::EHOSTUNREACH
         retries -= 1
         if retries > 0
@@ -19,5 +19,22 @@ module AMI
         end
       end
     end
+
+    def initialize(ssh)
+      @ssh = ssh
+    end
+
+    def run(command, opts = {})
+      puts command
+      @ssh.run(command, opts)
+    end
+
+    def method_missing(method, *args)
+      @ssh.send(method, *args)
+    end
+
+    def respond_to?(method)
+      @ssh.respond_to?(method)
+    end
   end
 end

data/lib/ami/version.rb

@@ -1,3 +1,3 @@
 module AMI
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ami
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gofer
@@ -70,6 +70,7 @@ files:
 - lib/ami/config_loader.rb
 - lib/ami/core.rb
 - lib/ami/definition.rb
+- lib/ami/include_helper.rb
 - lib/ami/installer/ruby_under_rbenv.rb
 - lib/ami/instance_provisioner.rb
 - lib/ami/server.rb