stem 0.4.0 → 0.4.1

data/README.md

@@ -40,5 +40,5 @@ You can, of course, delete the produced userdata.sh once the instance is launche
 
 ##Inspiration and Thanks
 
-Stem is almost entirely based on Orion Henry's Judo gem, and Blake Mizerany's work on variously patton, carealot, napkin, and several other experiments. Thanks also for feedback, testing and patches from Adam Wiggins, Mark McGranahan, Noah Zoschke, and Jason Dusek.
+Stem is almost entirely based on Orion Henry's Judo gem, and Blake Mizerany's work on variously patton, carealot, napkin, and several other experiments. Thanks also for feedback, testing and patches from Adam Wiggins, Mark McGranahan, Noah Zoschke, Jason Dusek, and Blake Gentry.
 

data/lib/stem/image.rb

@@ -3,7 +3,7 @@ module Stem
     include Util
     extend self
 
-    def create name, instance, *tags
+    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?
@@ -19,10 +19,9 @@ module Stem
       ami = i["imagesSet"].select {|m| m["name"] == name }.map { |m| m["imageId"] }.first
     end
 
-    def tagged *tags
+    def tagged tags
       return if tags.empty?
-      opts = { "tag-key" => tags.map {|t| t.to_s } }
-      opts = get_filter_opts(opts).merge("Owner" => "self")
+      opts = tags_to_filter(tags).merge("Owner" => "self")
       swirl.call("DescribeImages", opts)['imagesSet'].map {|image| image['imageId'] }
     end
 

data/lib/stem/instance.rb

@@ -14,7 +14,7 @@ module Stem
         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
+        throw "AMI tagged with #{config['ami-tags'].inspect} was not found. (Does it need creating?)" unless ami
       end
       throw "No AMI specified." unless ami
 

data/lib/stem/tag.rb

@@ -14,9 +14,12 @@ module Stem
     end
 
     def tag_opts(tags)
-      if tags.is_a? Array
+      if tags.is_a? Hash
+        { "Tag.#.Key" => tags.keys.map(&:to_s),
+          "Tag.#.Value" => tags.values }
+      elsif tags.is_a? Array
         {
-          "Tag.#.Key" => tags,
+          "Tag.#.Key" => tags.map(&:to_s),
           "Tag.#.Value" => (1..tags.size).map { '' }
         }
       else
@@ -25,4 +28,4 @@ module Stem
     end
 
   end
-end
+end

data/lib/stem/util.rb

@@ -7,7 +7,8 @@ module Stem
       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"]
+          :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"],
+          :version => "2010-08-31"
         }
       else
         account = account.to_sym
@@ -22,13 +23,23 @@ module Stem
       @swirl = Swirl::EC2.new config
     end
 
+    def tags_to_filter(tags)
+      if tags.is_a? Hash
+        get_filter_opts( tags.inject({}) {|h, (k, v)| h["tag:#{k}"] = v; h })
+      elsif tags.is_a? Array
+        get_filter_opts( { "tag-key" => tags.map(&:to_s) })
+      else
+        get_filter_opts( { "tag-key" => [tags.to_s] })
+      end
+    end
+
     def get_filter_opts(filters)
       opts = {}
-      filters.each do |k, v|
-        opts["Filter.1.Name"] = k
+      filters.each_with_index do |(k, v), n|
+        opts["Filter.#{n}.Name"] = k.to_s
         v = [ v ] unless v.is_a? Array
         v.each_with_index do |v, i|
-          opts["Filter.1.Value.#{i}"] = v.to_s
+          opts["Filter.#{n}.Value.#{i}"] = v.to_s
         end
       end
       opts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stem
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Peter van Hardenberg