stem 0.4.9 → 0.5.0

data/lib/stem/family.rb

@@ -0,0 +1,116 @@
+module Stem
+  module Family
+    include Util
+    extend self
+
+    def ami_for(family, release, architecture = "x86_64")
+      amis = Stem::Image::tagged(:family => family,
+                                 :release => release, 
+                                 :architecture => architecture)
+      throw "More than one AMI matched release." if amis.length > 1
+      amis[0]
+    end
+
+    def unrelease family, release_name
+      prev = Stem::Image::tagged(:family => family, :release => release_name)
+      prev.each { |ami| Stem::Tag::destroy(ami, :release => release_name) }
+    end
+
+    def member? family, ami
+      desc = Stem::Image::describe(ami)
+      throw "AMI #{ami} does not exist" if desc.nil?
+      tagset_to_hash(desc["tagSet"])["family"] == family
+    end
+
+    def members family
+      Stem::Image.tagged("family" => family)
+    end
+
+    def describe_members family
+      Stem::Image.describe_tagged("family" => family)
+    end
+
+    def release family, release_name, *amis
+      amis.each do |ami|
+        throw "#{ami} not part of #{family}" unless member?(family, ami)
+      end
+      unrelease family, release_name
+      amis.each { |ami| Stem::Tag::create(ami, :release => release_name) }
+    end
+
+    def build_image(family, config, userdata)
+      log = lambda { |msg|
+        puts "[#{family}|#{Time.now.to_s}] #{msg}"
+      }
+
+      aggregate_hash_options_for_ami!(config)
+      sha1 = image_hash(config, userdata)
+
+      log.call "Beginning to build image for #{family}"
+      log.call "Config:\n------\n#{ config.inspect }\n-------"
+      instance_id = Stem::Instance.launch(config, userdata)
+
+      log.call "Booting #{instance_id} to produce your prototype instance"
+      wait_for_stopped instance_id, log
+
+      timestamp = Time.now.utc.iso8601
+      image_id = Stem::Image.create("#{family}-#{timestamp}",
+                                    instance_id,
+                                    {
+                                      :created => timestamp,
+                                      :family => family,
+                                      :sha1 => sha1,
+                                      :source_ami => config["ami"]
+                                    })
+      log.call "Image ID is #{image_id}"
+
+      wait_for_available(image_id, log)
+
+      log "Terminating #{instance_id} now that the image is captured"
+      Stem::Instance::destroy(instance_id)
+    end
+
+    def image_already_built?(family, config, userdata)
+      aggregate_hash_options_for_ami!(config)
+      sha1 = image_hash(config, userdata)
+      !Stem::Image.tagged(:family => family, :sha1 => sha1).empty?
+    end
+
+    def image_hash(config, userdata)
+      Digest::SHA1::hexdigest([config.to_s, userdata].join(' '))
+    end
+
+    protected
+
+    def wait_for_stopped(instance_id, log)
+      log.call "waiting for instance to reach state stopped -- "
+      while sleep 10
+        state = Stem::Instance.describe(instance_id)["instanceState"]["name"]
+        log.call "instance #{instance_id} #{state}"
+        break if state == "stopped"
+      end
+    end
+
+    def wait_for_available(image_id, log)
+      log.call "Waiting for image to finish capturing..."
+      while sleep 10
+        begin
+          state = Stem::Image.describe(image_id)["imageState"]
+          log.call "Image #{image_id} #{state}"
+          case state
+          when "available"
+            log.call("Image capturing succeeded")
+            break
+          when "pending" #continue
+          when "terminated"
+            log "Image capture failed (#{image_id})"
+            return false
+          else throw "Image unexpectedly entered #{state}";
+          end
+        rescue Swirl::InvalidRequest => e
+          raise unless e.message =~ /does not exist/
+        end
+      end
+    end
+  end
+end

data/lib/stem/group.rb

@@ -22,17 +22,16 @@ module Stem
         nil
     end
 
-    def create(name, rules = nil)
-        create!(name, rules)
+    def create(name, rules = nil, description = "")
+        create!(name, rules, description)
         true
       rescue Swirl::InvalidRequest => e
         raise e unless e.message =~ /The security group '\S+' already exists/
         false
     end
 
-    def create!(name, rules = nil)
-      description = {}
-      swirl.call "CreateSecurityGroup",  "GroupName" => name, "GroupDescription" => "%%" + description.to_json
+    def create!(name, rules = nil, description = "")
+      swirl.call "CreateSecurityGroup",  "GroupName" => name, "GroupDescription" => description
       auth(name, rules) if rules
     end
 
@@ -63,7 +62,7 @@ module Stem
     def gen_authorize_target(index, target)
       if target =~ /^\d+\.\d+\.\d+.\d+\/\d+$/
         { "IpPermissions.#{index}.IpRanges.1.CidrIp"  => target }
-      elsif target =~ /^(\w+)@(\w+)$/
+      elsif target =~ /^(.+)@(\w+)$/
         { "IpPermissions.#{index}.Groups.1.GroupName" => $1,
           "IpPermissions.#{index}.Groups.1.UserId"    => $2 }
       elsif target =~ /^@(\w+)$/

data/lib/stem/image.rb

@@ -3,8 +3,7 @@ module Stem
     include Util
     extend self
 
-    def create name, instance, tags
-      raise "You already have an image named '#{name}'" if named(name)
+    def create name, instance, tags = {}
       image_id = swirl.call("CreateImage", "Name" => name, "InstanceId" => instance)["imageId"]
       unless tags.empty?
         # We'll retry this once if necessary due to consistency issues on the AWS side
@@ -38,8 +37,18 @@ module Stem
       swirl.call("DescribeImages", opts)['imagesSet'].map {|image| image['imageId'] }
     end
 
+    def describe_tagged tags
+      opts = tags_to_filter(tags).merge("Owner" => "self")
+      images = swirl.call("DescribeImages", opts)["imagesSet"]
+      images.each {|image| image["tags"] = tagset_to_hash(image["tagSet"]) }
+      images
+    end
+
     def describe image
       swirl.call("DescribeImages", "ImageId" => image)["imagesSet"][0]
+    rescue Swirl::InvalidRequest => e
+      raise e unless e.message =~ /does not exist/
+      nil
     end
   end
 end

data/lib/stem/instance.rb

@@ -5,18 +5,8 @@ module Stem
 
     def launch config, userdata = nil
       throw "No config provided" unless config
-
-      ami = nil
-      if config["ami"]
-        ami = config["ami"]
-      elsif config["ami-name"]
-        ami = Image::named(config["ami-name"])
-        throw "AMI named #{config["ami-name"]} was not found. (Does it need creating?)" unless ami
-      elsif config["ami-tags"]
-        ami = Image::tagged(config['ami-tags'])[0]
-        throw "AMI tagged with #{config['ami-tags'].inspect} was not found. (Does it need creating?)" unless ami
-      end
-      throw "No AMI specified." unless ami
+      config = aggregate_hash_options_for_ami!(config)
+      ami = config["ami"]
 
       opt = {
         "SecurityGroup.#" => config["groups"] || [],

data/lib/stem/util.rb

@@ -1,32 +1,19 @@
 module Stem
   module Util
     def swirl
-      account = "default"
-      etc = "#{ENV["HOME"]}/.swirl"
-      config = \
-      if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
-        {
-          :aws_access_key_id => ENV["AWS_ACCESS_KEY_ID"],
-          :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"],
-          :version => "2010-08-31"
-        }
+      @swirl ||= Swirl::EC2.new load_config
+    end
+
+    def tagset_to_hash(tagset)
+      if tagset["item"].is_a?(Hash)
+        {tagset["item"]["key"] => tagset["item"]["value"]}
       else
-        account = account.to_sym
-        
-        if File.exists?(etc)
-          data = YAML.load_file(etc)
-        else
-          abort("I was expecting to find a .swirl file in your home directory.")
-        end
-        
-        if data.key?(account)
-          data[account]
-        else
-          abort("I don't see the account you're looking for")
+        tagset["item"].inject({}) do |h,item|
+          k, v = item["key"], item["value"]
+          h[k] = v
+          h
         end
       end
-
-      @swirl = Swirl::EC2.new config
     end
 
     def tags_to_filter(tags)
@@ -47,7 +34,8 @@ module Stem
 
     def get_filter_opts(filters)
       opts = {}
-      filters.each_with_index do |(k, v), n|
+      filters.keys.sort.each_with_index do |k, n|
+        v = filters[k]
         opts["Filter.#{n}.Name"] = k.to_s
         v = [ v ] unless v.is_a? Array
         v.each_with_index do |v, i|
@@ -56,6 +44,52 @@ module Stem
       end
       opts
     end
+
+    private
+
+    def load_config
+      account = "default"
+      etc = "#{ENV["HOME"]}/.swirl"
+      if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
+        {
+          :aws_access_key_id => ENV["AWS_ACCESS_KEY_ID"],
+          :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"],
+          :version => "2010-08-31"
+        }
+      else
+        account = account.to_sym
+
+        if File.exists?(etc)
+          data = YAML.load_file(etc)
+        else
+          abort("I was expecting to find a .swirl file in your home directory.")
+        end
+
+        if data.key?(account)
+          data[account]
+        else
+          abort("I don't see the account you're looking for")
+        end
+      end
+    end
+
+    def aggregate_hash_options_for_ami!(config)
+      if config["ami"]
+        return config
+      elsif config["ami-name"]
+        name = config.delete("ami-name")
+        config["ami"] = Image::named(name)
+        throw "AMI named #{name} was not found. (Does it need creating?)" unless config["ami"]
+      elsif config["ami-tags"]
+        tags = config.delete('ami-tags')
+        config["ami"] = Image::tagged(tags)[0]
+        throw "AMI tagged with #{tags.inspect} was not found. (Does it need creating?)" unless config["ami"]
+      else
+        throw "No AMI specified."
+      end
+      config
+    end
+
   end
 end
 

data/lib/stem.rb

@@ -14,3 +14,6 @@ require 'stem/ip'
 require 'stem/key_pair'
 require 'stem/tag'
 
+module Stem
+  autoload :Family, 'stem/family'
+end

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: stem
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 9
-  version: 0.4.9
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Peter van Hardenberg
 - Orion Henry
+- Blake Gentry
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +40,7 @@ description: minimalist EC2 instance management
 email: 
 - pvh@heroku.com
 - orion@heroku.com
+- b@heroku.com
 executables: 
 - stem
 extensions: []
@@ -49,6 +51,7 @@ files:
 - LICENSE
 - README.md
 - lib/stem/cli.rb
+- lib/stem/family.rb
 - lib/stem/group.rb
 - lib/stem/image.rb
 - lib/stem/instance.rb