stemcell 0.0.4 → 0.0.5

data/bin/stem

@@ -90,6 +90,12 @@ END_OF_BANNER
       :default => ENV['MACHINE_TYPE'],
       )
 
+  opt('tags',
+      'tags to apply to image',
+      :type => String,
+      :default => ENV['TAGS'],
+      )
+
 end
 
 required_parameters = [

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/stemcell.rb

@@ -29,6 +29,22 @@ module Stemcell
       @timeout = 120
       @start_time = Time.new
 
+      @tags = {
+        'Name' => "#{@chef_role}-#{@git_branch}",
+        'Group' => "#{@chef_role}-#{@git_branch}",
+        'created_by' => ENV['USER'],
+        'stemcell' => VERSION,
+      }
+
+      if opts['tags']
+        tags = {}
+        opts['tags'].split(',').each do |tag_set|
+          key, value = tag_set.split('=')
+          tags[key] = value
+        end
+        @tags.merge!(tags)
+      end
+
       begin
         @git_key_contents = File.read(@git_key)
       rescue Object => e
@@ -57,6 +73,7 @@ module Stemcell
       File.open('/tmp/user-data', 'w') {|f| f.write(@user_data) }
       instances = do_launch(opts)
       wait(instances)
+      set_tags(instances)
       print_run_info(instances)
       return instances
     end
@@ -101,7 +118,6 @@ module Stemcell
       }
       options.merge!({:availability_zone => opts['avilibility_zone']}) if opts['availability_zone']
       options.merge!({:count => opts['count']}) if opts['count']
-      puts "creating instance with options:\n#{options}"
       instances = @ec2_region.instances.create(options)
       instances = [instances] unless instances.class == Array
       instances.each do |instance|
@@ -110,6 +126,12 @@ module Stemcell
       return instances
     end
 
+    def set_tags(instances=[])
+      instances.each do |instance|
+        instance.tags.set(@tags)
+      end
+    end
+
     def render_template
       this_file = File.expand_path __FILE__
       base_dir = File.dirname this_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: