stem 0.3.4 → 0.4.0

data/README.md

@@ -23,7 +23,7 @@ You can monitor the instance's fabrication process via
 
 The instance you created will boot, install some packages on top of a stock Ubuntu 10.4 AMI, then (if everything goes according to plan) shut itself down and go into a "stopped" state that indicates success. If any part of the stem fabrication fails, the instance will remain running. Once the instance reaches stopped, type
 
-    $ stem create postgres-server <instance-id>
+    $ stem create postgres-server <instance-id> appserver,current,tag_3
 
 The AMI may take as long as half an hour to build, depending on how the gremlins in EC2 are behaving on any given day. You can check on their progress with
 

data/lib/stem/cli.rb

@@ -19,7 +19,7 @@ module Stem
         opts.separator "  $ stem launch prototype.config prototype-userdata.sh"
         opts.separator "  $ stem launch examples/lxc-server/lxc-server.json examples/lxc-server/"
         opts.separator "  $ stem list"
-        opts.separator "  $ stem create ami-name instance-id"
+        opts.separator "  $ stem create ami-name instance-id ami_tag1,ami_tag2"
 
         opts.separator " "
         opts.separator "Options:"
@@ -76,9 +76,10 @@ module Stem
       puts "New instance ID: #{instance}"
     end
 
-    def create name = nil, instance = nil
-      abort "Usage: create ami-name instance-to-capture" unless name && instance
-      image_id = Stem::Image::create(name, instance)
+    def create name = nil, instance = nil, tag_list = nil
+      abort "Usage: create ami-name instance-to-capture ami_tag1,ami_tag2" unless name && instance
+      tags = tag_list ? tag_list.split(',') : []
+      image_id = Stem::Image::create(name, instance, tags)
       puts "New image ID: #{image_id}"
     end
 

data/lib/stem/image.rb

@@ -3,9 +3,11 @@ module Stem
     include Util
     extend self
 
-    def create name, instance
-      description = {}
-      swirl.call("CreateImage", "InstanceId" => instance, "Name" => name, "Description" => "%%" + description.to_json)["imageId"]
+    def create name, instance, *tags
+      raise "You already have an image named '#{name}'" if named(name)
+      image_id = swirl.call("CreateImage", "Name" => name, "InstanceId" => instance)["imageId"]
+      Tag::create(image_id, tags) unless tags.empty?
+      image_id
     end
 
     def deregister image
@@ -13,8 +15,15 @@ module Stem
     end
 
     def named name
-        i = swirl.call "DescribeImages", "Owner" => "self"
-        ami = i["imagesSet"].select {|m| m["name"] == name }.map { |m| m["imageId"] }.first
+      i = swirl.call "DescribeImages", "Owner" => "self"
+      ami = i["imagesSet"].select {|m| m["name"] == name }.map { |m| m["imageId"] }.first
+    end
+
+    def tagged *tags
+      return if tags.empty?
+      opts = { "tag-key" => tags.map {|t| t.to_s } }
+      opts = get_filter_opts(opts).merge("Owner" => "self")
+      swirl.call("DescribeImages", opts)['imagesSet'].map {|image| image['imageId'] }
     end
 
     def describe image

data/lib/stem/instance.rb

@@ -12,6 +12,9 @@ module Stem
       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'])
+        throw "AMI tagged with #{config['ami-tags'].join(', ')} was not found. (Does it need creating?)" unless ami
       end
       throw "No AMI specified." unless ami
 
@@ -45,10 +48,10 @@ module Stem
       end
 
       response = swirl.call "RunInstances", opt
+      instance_id = response["instancesSet"].first["instanceId"]
 
-      response["instancesSet"].each do |i|
-        return i["instanceId"]
-      end
+      Tag::create(instance_id, config['tags']) if config['tags'] && !config['tags'].empty?
+      instance_id
     end
 
     def restart instance_id
@@ -119,5 +122,19 @@ module Stem
         end
       end
     end
+
+    def tagged *tags
+      return if tags.empty?
+      opts = { "tag-key" => tags.map {|t| t.to_s } }
+      instances = swirl.call "DescribeInstances", get_filter_opts(opts)
+
+      ids = []
+      instances["reservationSet"].each do |r|
+        r["instancesSet"].each do |i|
+          ids << i["instanceId"]
+        end
+      end
+      ids
+    end
   end
 end

data/lib/stem/tag.rb

@@ -0,0 +1,28 @@
+module Stem
+  module Tag
+    include Util
+    extend self
+
+    def create resource_ids, tags
+      resource_ids = [ resource_ids ] unless resource_ids.is_a? Array
+      swirl.call("CreateTags", tag_opts(tags).merge("ResourceId" => resource_ids) )
+    end
+
+    def destroy resource_ids, tags
+      resource_ids = [ resource_ids ] unless resource_ids.is_a? Array
+      swirl.call("DeleteTags", tag_opts(tags).merge("ResourceId" => resource_ids) )
+    end
+
+    def tag_opts(tags)
+      if tags.is_a? Array
+        {
+          "Tag.#.Key" => tags,
+          "Tag.#.Value" => (1..tags.size).map { '' }
+        }
+      else
+        { "Tag.1.Key" => tags.to_s, "Tag.1.Value" => '' }
+      end
+    end
+
+  end
+end

data/lib/stem/util.rb

@@ -1,10 +1,37 @@
 module Stem
   module Util
     def swirl
-      @swirl ||= Swirl::EC2.new(
-        :aws_access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-        :aws_secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
-      )
+      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"]
+        }
+      else
+        account = account.to_sym
+        data = YAML.load_file(etc)
+        if data.key?(account)
+          data[account]
+        else
+          abort("I don't see the account you're looking for")
+        end
+      end
+
+      @swirl = Swirl::EC2.new config
+    end
+
+    def get_filter_opts(filters)
+      opts = {}
+      filters.each do |k, v|
+        opts["Filter.1.Name"] = k
+        v = [ v ] unless v.is_a? Array
+        v.each_with_index do |v, i|
+          opts["Filter.1.Value.#{i}"] = v.to_s
+        end
+      end
+      opts
     end
   end
 end

data/lib/stem.rb

@@ -10,4 +10,5 @@ require 'stem/userdata'
 require 'stem/instance'
 require 'stem/image'
 require 'stem/ip'
+require 'stem/tag'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stem
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Peter van Hardenberg
@@ -53,6 +53,7 @@ files:
 - lib/stem/image.rb
 - lib/stem/instance.rb
 - lib/stem/ip.rb
+- lib/stem/tag.rb
 - lib/stem/userdata.rb
 - lib/stem/util.rb
 - lib/stem.rb