stem 0.4.8 → 0.4.9

data/lib/stem/image.rb

@@ -12,7 +12,7 @@ module Stem
         begin
           Tag::create(image_id, tags)
         rescue Swirl::InvalidRequest => e
-          if i < 1 && e.message =~ /does not exist/
+          if i < 5 && e.message =~ /does not exist/
             i += 1
             retry
           end
@@ -27,8 +27,9 @@ 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
+      opts = get_filter_opts("name" => name).merge("Owner" => "self")
+      i = swirl.call("DescribeImages", opts)["imagesSet"].first
+      i ? i["imageId"] : nil
     end
 
     def tagged tags

data/lib/stem/instance.rb

@@ -50,7 +50,18 @@ module Stem
       response = swirl.call "RunInstances", opt
       instance_id = response["instancesSet"].first["instanceId"]
 
-      Tag::create(instance_id, config['tags']) if config['tags'] && !config['tags'].empty?
+      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
     end
 

data/lib/stem/userdata.rb

@@ -17,6 +17,8 @@ module Stem
           process_erb(opts[:erb_binding])
           process_mustache(opts[:mustache_vars])
           raise "must contain a userdata.sh" unless File.exists?("userdata.sh")
+          # Set constant timestamps for all files to guarantee hashing consistency
+          set_all_timestamps(tmp_path, "200210272016")
           make_zip_shell
         end
       end
@@ -62,6 +64,18 @@ exec bash userdata.sh
       header + %x{tar --exclude \\*.stem -cv . | bzip2 --best -}
     end
 
+    def set_all_timestamps(file_or_dir, time)
+      Dir.foreach(file_or_dir) do |item|
+        path = file_or_dir + '/' + item
+        if File.directory?(path) && item != '.'
+          next if item == '..'
+          set_all_timestamps(path, time)
+        else
+          `touch -t #{time} #{path}`
+        end
+      end
+    end
+
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stem
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Peter van Hardenberg