stemcell 0.0.5 → 0.0.6

data/.gitignore

@@ -17,4 +17,5 @@ test/version_tmp
 tmp
 .stemcellrc
 \#*\#
-.\#*
+.\#*
+.*sw?

data/bin/stem

@@ -24,76 +24,82 @@ END_OF_BANNER
       :default => ENV['AWS_SECRET_KEY']
       )
 
-  opt('chef_data_bag_secret',
-      'path to chef data bag encryption secret',
+  opt('region',
+      'ec2 region to launch in',
       :type => String,
-      :default => ENV['CHEF_DATA_BAG_SECRET'],
+      :default => ENV['REGION'] ? ENV['REGION'] : 'us-east-1',
       )
 
-  opt('chef_role',
-      'chef role of instance to be launched',
+  opt('machine_type',
+      'instance type to launch',
       :type => String,
-      :default => ENV['CHEF_ROLE'],
+      :default => ENV['MACHINE_TYPE'] ? ENV['MACHINE_TYPE'] : 'm1.small',
       )
 
-  opt('git_branch',
-      'git branch to run off',
+  opt('image',
+      'ami to use for launch',
       :type => String,
-      :default => ENV['GIT_BRANCH'],
+      :default => ENV['AMI'] ? ENV['AMI'] : 'ami-d726abbe',
       )
 
-  opt('git_key',
-      'git key to use',
+  opt('security_group',
+      'security group to launch instance with',
       :type => String,
-      :default => ENV['GIT_KEY'],
+      :default => ENV['SECURITY_GROUP'] ? ENV['SECURITY_GROUP'] : 'default',
       )
 
-  opt('git_origin',
-      'git origin to use',
+  opt('availability-zone',
+      'zone in which to launch instances',
       :type => String,
-      :default => ENV['GIT_ORIGIN'],
+      :default => ENV['AVAILABILITY-ZONE'],
+      )
+
+  opt('tags',
+      'tags to apply to image',
+      :type => String,
+      :default => ENV['TAGS'],
       )
 
   opt('key_name',
-      'ssh key to launch instance with',
+      'aws ssh key name for the ubuntu user',
       :type => String,
       :default => ENV['KEY_NAME'],
       )
 
-  opt('count',
-      'number of instances to launch',
+  opt('chef_data_bag_secret',
+      'path to secret file (or the string containing the secret)',
       :type => String,
-      :default => ENV['COUNT'],
+      :default => ENV['CHEF_DATA_BAG_SECRET'],
       )
 
-  opt('region',
-      'ec2 region to launch in',
+  opt('chef_role',
+      'chef role of instance to be launched',
       :type => String,
-      :default => ENV['REGION'],
+      :default => ENV['CHEF_ROLE'],
       )
 
-  opt('image',
-      'ami to use for launch',
+  opt('git_origin',
+      'git origin to use',
       :type => String,
-      :default => ENV['AMI'],
+      :default => ENV['GIT_ORIGIN'],
       )
 
-  opt('security_group',
-      'security group to launch instance with',
+  opt('git_branch',
+      'git branch to run off',
       :type => String,
-      :default => ENV['SECURITY_GROUP'],
+      :default => ENV['GIT_BRANCH'],
       )
 
-  opt('machine_type',
-      'instance type to launch',
+  opt('git_key',
+      'path to the git repo deploy key (or the string containing the key)',
       :type => String,
-      :default => ENV['MACHINE_TYPE'],
+      :default => ENV['GIT_KEY'],
       )
 
-  opt('tags',
-      'tags to apply to image',
+  opt('count',
+      'number of instances to launch',
       :type => String,
-      :default => ENV['TAGS'],
+      :default => ENV['COUNT'],
       )
 
 end
@@ -114,6 +120,16 @@ by the #{arg.upcase.gsub('-','_')} environment variable" if
     options[arg].nil? or ! options[arg]
 end
 
+# convert tags from string to ruby hash
+tags = {}
+if options['tags']
+  options['tags'].split(',').each do |tag_set|
+    key, value = tag_set.split('=')
+    tags[key] = value
+  end
+end
+options['tags'] = tags
+
 stemcell = Stemcell::Stemcell.new(options)
 stemcell.launch({'count' => options['count']})
 

data/lib/stemcell/version.rb

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

data/lib/stemcell.rb

@@ -11,6 +11,11 @@ module Stemcell
       @log.debug "opts are #{opts.inspect}"
       ['aws_access_key',
        'aws_secret_key',
+       'region',
+       'machine_type',
+       'image',
+       'security_group',
+
        'chef_role',
        'git_branch',
        'git_key',
@@ -21,10 +26,7 @@ module Stemcell
         instance_variable_set("@#{req}",opts[req])
       end
 
-      @security_group = opts['security_group'] ? opts['security_group'] : 'default'
-      @image = opts['image'] ? opts['image'] : 'ami-d726abbe'
-      @machine_type = opts['machine_type'] ? opts['machine_type'] : 'm1.small'
-      @region = opts['region'] ? opts['region'] : 'us-east-1'
+      @zone = opts.include?('availability_zone') ? opts['availability_zone'] : nil
       @ec2_url = "ec2.#{@region}.amazonaws.com"
       @timeout = 120
       @start_time = Time.new
@@ -35,29 +37,19 @@ module Stemcell
         '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
+      @tags.merge!(opts['tags']) if opts['tags']
 
       begin
         @git_key_contents = File.read(@git_key)
       rescue Object => e
-        # TODO(mkr): we may want to do something better here
-        @git_key_contents = @chef_validation_key
-        # raise "\ncould not open specified key #{@git_key}:\n#{e.inspect}#{e.backtrace}"
+        @git_key_contents = @git_key  # assume content is passed in
       end
 
-      if opts['chef_data_bag_secret']
+      if opts.include?('chef_data_bag_secret')
         begin
           @chef_data_bag_secret = File.read(opts['chef_data_bag_secret'])
         rescue Object => e
-          raise "\ncould not open specified secret key file #{opts['chef_data_bag_secret']}:\n#{e.inspect}#{e.backtrace}"
+          @chef_data_bag_secret = opts['chef_data_bag_secret'] # assume secret is passed in
         end
       else
         @chef_data_bag_secret = ''
@@ -91,21 +83,21 @@ module Stemcell
     end
 
     def wait(instances)
-      sleep 3
+      @log.info "Waiting for #{instances.count} instances (#{instances.inspect}):"
+
       while true
+        sleep 5
         if Time.now - @start_time > @timeout
           bail(instances)
           raise TimeoutError, "exceded timeout of #{@timeout}"
         end
-        puts "instances is #{instances.inspect}"
+
         if instances.select{|i| i.status != :running }.empty?
-          @log.info "all instances in running state"
-          return
+          break
         end
-        @log.info "instances not ready yet. sleeping..."
-        sleep 5
-        return wait(instances)
       end
+
+      @log.info "all instances in running state"
     end
 
     def do_launch(opts={})
@@ -116,8 +108,9 @@ module Stemcell
         :instance_type => @machine_type,
         :key_name => @key_name,
       }
-      options.merge!({:availability_zone => opts['avilibility_zone']}) if opts['availability_zone']
-      options.merge!({:count => opts['count']}) if opts['count']
+      options[:availability_zone] = @zone if @zone
+      options[:count] = opts['count'] if opts.include?('count')
+
       instances = @ec2_region.instances.create(options)
       instances = [instances] unless instances.class == Array
       instances.each do |instance|
@@ -145,9 +138,9 @@ module Stemcell
     def bail(instances)
       return if instances.nil?
       instances.each do |instance|
+        log.warn "Terminating instance #{instance.instance_id}"
         instance.delete
       end
     end
-
   end
 end

metadata

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