stem 0.7.0 → 0.8.0

data/lib/stem.rb

@@ -16,4 +16,5 @@ require 'stem/tag'
 
 module Stem
   autoload :Family, 'stem/family'
+  class Deprecated < StandardError; end
 end

data/lib/stem/family/member.rb

@@ -33,13 +33,17 @@ module Stem
       end
 
       def capture(instance_id)
-        Stem::Image.create(name, instance_id, tags)
+        Stem::Image.create(name, instance_id)
       end
 
       def name
         [family, timestamp.gsub(':', '_'), architecture].join('-')
       end
 
+      def tag(ami_id)
+        Stem::Tag.create(ami_id, tags)
+      end
+
       def tags
         {
           :created => timestamp,

data/lib/stem/image.rb

@@ -4,21 +4,10 @@ module Stem
     extend self
 
     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
-        i = 0
-        begin
-          Tag::create(image_id, tags)
-        rescue Swirl::InvalidRequest => e
-          if i < 5 && e.message =~ /does not exist/
-            i += 1
-            retry
-          end
-          raise e
-        end
+      unless tags == {}
+        raise Stem::Deprecated.new "Tags should be created separately due to AWS eventual consistency issues"
       end
-      image_id
+      swirl.call("CreateImage", "Name" => name, "InstanceId" => instance)["imageId"]
     end
 
     def deregister image

data/lib/stem/instance.rb

@@ -5,6 +5,10 @@ module Stem
 
     def launch config, userdata = nil
       throw "No config provided" unless config
+      if config['tags'] && config['tags'] != {}
+        raise Stem::Deprecated.new "Tags should be created separately due to AWS eventual consistency issues"
+      end
+
       config = aggregate_hash_options_for_ami!(config)
       ami = config["ami"]
 
@@ -37,22 +41,7 @@ module Stem
         opt.merge!({ "UserData" => Base64.encode64(userdata)})
       end
 
-      response = swirl.call "RunInstances", opt
-      instance_id = response["instancesSet"].first["instanceId"]
-
-      if config['tags'] && !config['tags'].empty?
-        i = 0
-        begin
-          Tag::create(instance_id, config['tags'])
-        rescue Swirl::InvalidRequest => e
-          if i < 5 && e.message =~ /does not exist/
-            i += 1
-            retry
-          end
-          raise e
-        end
-      end
-      instance_id
+      swirl.call("RunInstances", opt)["instancesSet"].first["instanceId"]
     end
 
     def restart instance_id

metadata

@@ -2,7 +2,7 @@
 name: stem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Peter van Hardenberg