stem 0.6.0 → 0.7.0

data/lib/stem/family/member.rb

@@ -4,13 +4,18 @@ module Stem
       include Util
       attr_reader :family, :sha1, :source_ami, :time
 
-      def initialize(family, config, userdata)
+      def initialize(family, config, options = {})
         aggregate_hash_options_for_ami!(config)
         @time = Time.now.utc
         @family = family
-        @sha1 = Family.image_hash(config, userdata)
+        @sha1 = if options[:userdata]
+          Family.image_hash(config, options.delete(:userdata))
+        elsif options[:sha1]
+          options.delete(:sha1)
+        else
+          raise ArgumentError.new("Must specify either userdata or sha1")
+        end
         @source_ami = config['ami']
-        @userdata = userdata
       end
 
       def ==(member)
@@ -23,12 +28,16 @@ module Stem
         !Stem::Image.tagged(:family => family, :sha1 => sha1).empty?
       end
 
+      def architecture
+        Stem::Image.describe(source_ami)['architecture']
+      end
+
       def capture(instance_id)
         Stem::Image.create(name, instance_id, tags)
       end
 
       def name
-        "#{family}-#{timestamp.gsub(':', '_')}"
+        [family, timestamp.gsub(':', '_'), architecture].join('-')
       end
 
       def tags

data/lib/stem/userdata.rb

@@ -18,7 +18,6 @@ module Stem
           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
@@ -61,21 +60,8 @@ cd $UD
 exec bash userdata.sh
 #### THE END
       SHELL
-      header + %x{tar --exclude \\*.stem -cv . | bzip2 --best -}
+      header + %x{find . -print0 | sort -z | tar -cv --no-recursion --null --owner=0 --group=0 --mtime='2002-10-28 04:27:00Z' --exclude \\*.stem -T - | 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

@@ -2,7 +2,7 @@
 name: stem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Peter van Hardenberg
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
+date: 2011-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency