stemcell 0.7.1 → 0.8.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yjk5MmIxNTA2OTg1ZTI1YzVlOTc5NTM3ODFiMjlmNzNmNjdkMjJhMQ==
+  data.tar.gz: !binary |-
+    ZDVkYmQ1YzViMzJlNjhmZDBlNGM2YTVmYTZmNjFmM2U3N2VhYjdhZQ==
+SHA512:
+  metadata.gz: !binary |-
+    YTU1M2YxOGEzNGFmZjE5YmE4NjZkNzk3Mjg4OTIxMGFjZWIwOGI1MTBmYmY0
+    YjdkYWIzNTBkMzY3N2E1ZjE1ZTVlY2U3MjJjODJmNjg1ZGQxMGMyOTYwOGRk
+    ZGQ1OWI2ZDI1ZGY4OTM1MjkwZTlkMDhkOWIyZTE3OTU4NGU4ZTc=
+  data.tar.gz: !binary |-
+    MDYwMzllODg3OTYxN2I5NGE1MWE3ZWE4ODliN2NiMmJkMGM4YjBlZGQ2ZDVm
+    MTU0ZjQwZGQ0NjNjNTNhMWRjN2Y1ZDM2M2IyNDdkNWU4NDdmYjJhOGZjNWI5
+    YTk1MDYyZjUyZjVkOWJhMDBjMGQ5ODA4MTBlYmQxYTgwMTJhNGI=

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+
+# next release
+- ...
+
+# 0.8.0
+- Support for VPC [Brenden](https://github.com/brndnmtthws)
+- Support relative paths and home alias in `Launcher#try_file` [Patrick Viet](https://github.com/patrickviet)
+- Add Ohai hint for EC2 [sandstrom](https://github.com/sandstrom)
+- Less verbose download progress for chef [sandstrom](https://github.com/sandstrom)
+
+# 0.7.1
+- relax version constraint on Chef gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stemcell (0.7.1)
+    stemcell (0.8.0)
       aws-creds (~> 0.2.2)
       aws-sdk (~> 1.9)
       chef (>= 11.4.0)
@@ -15,15 +15,15 @@ GEM
   specs:
     aws-creds (0.2.3)
       trollop (~> 2.0)
-    aws-sdk (1.48.1)
+    aws-sdk (1.51.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    chef (11.12.8)
-      chef-zero (>= 2.0.2, < 2.1)
+    chef (11.14.6)
+      chef-zero (~> 2.1, >= 2.1.4)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
+      ffi-yajl (~> 1.0)
       highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.8.1)
       mime-types (~> 1.16)
       mixlib-authentication (~> 1.3)
       mixlib-cli (~> 1.4)
@@ -32,11 +32,11 @@ GEM
       mixlib-shellout (~> 1.4)
       net-ssh (~> 2.6)
       net-ssh-multi (~> 1.1)
-      ohai (~> 7.0.4)
+      ohai (~> 7.2)
+      plist (~> 3.1.0)
       pry (~> 0.9)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-zero (2.0.2)
+      rest-client (>= 1.0.4, <= 1.6.7)
+    chef-zero (2.2)
       hashie (~> 2.0)
       json
       mixlib-log (~> 1.3)
@@ -46,10 +46,15 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
+    ffi (1.9.3)
+    ffi-yajl (1.0.2)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.0)
     hashie (2.1.2)
     highline (1.6.21)
     ipaddress (0.8.0)
     json (1.7.7)
+    libyajl2 (1.0.1)
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.0)
@@ -66,28 +71,28 @@ GEM
     net-ssh-multi (1.2.0)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    ohai (7.0.4)
+    ohai (7.2.4)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.0)
       ipaddress
       mime-types (~> 1.16)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 1.2)
-      systemu (~> 2.5.2)
-      yajl-ruby
-    pry (0.10.0)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    plist (3.1.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rest-client (1.6.8)
-      mime-types (~> 1.16)
-      rdoc (>= 2.4.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -104,9 +109,9 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    systemu (2.5.2)
+    systemu (2.6.4)
     trollop (2.0)
-    yajl-ruby (1.2.1)
+    wmi-lite (1.0.0)
 
 PLATFORMS
   ruby

data/lib/stemcell/launcher.rb

@@ -24,7 +24,6 @@ module Stemcell
       'key_name',
       'instance_type',
       'image_id',
-      'security_groups',
       'availability_zone',
       'count'
     ]
@@ -44,8 +43,14 @@ module Stemcell
       'instance_domain_name',
       'image_id',
       'availability_zone',
+      'vpc_id',
+      'subnet',
+      'private_ip_address',
+      'dedicated_tenancy',
+      'associate_public_ip_address',
       'count',
       'security_groups',
+      'security_group_ids',
       'tags',
       'iam_role',
       'ebs_optimized',
@@ -76,7 +81,12 @@ module Stemcell
         :access_key_id     => @aws_access_key,
         :secret_access_key => @aws_secret_key})
 
-      @ec2 = AWS::EC2.new(:ec2_endpoint => @ec2_url)
+      if opts['vpc_id']
+        puts 'using vpc tho'
+        @ec2 = AWS::VPC.new(opts['vpc_id'], :ec2_endpoint => @ec2_url)
+      else
+        @ec2 = AWS::EC2.new(:ec2_endpoint => @ec2_url)
+      end
     end
 
 
@@ -101,17 +111,40 @@ module Stemcell
       # generate launch options
       launch_options = {
         :image_id => opts['image_id'],
-        :security_groups => opts['security_groups'],
         :instance_type => opts['instance_type'],
         :key_name => opts['key_name'],
         :count => opts['count'],
       }
 
+      if opts['security_groups'] && !opts['security_groups'].empty?
+        launch_options[:security_groups] = opts['security_groups']
+      end
+
+      if opts['security_group_ids'] && !opts['security_group_ids'].empty?
+        launch_options[:security_group_ids] = opts['security_group_ids']
+      end
+
       # specify availability zone (optional)
       if opts['availability_zone']
         launch_options[:availability_zone] = opts['availability_zone']
       end
 
+      if opts['subnet']
+        launch_options[:subnet] = opts['subnet']
+      end
+
+      if opts['private_ip_address']
+        launch_options[:private_ip_address] = opts['private_ip_address']
+      end
+
+      if opts['dedicated_tenancy']
+        launch_options[:dedicated_tenancy] = opts['dedicated_tenancy']
+      end
+
+      if opts['associate_public_ip_address']
+        launch_options[:associate_public_ip_address] = opts['associate_public_ip_address']
+      end
+
       # specify IAM role (optional)
       if opts['iam_role']
         launch_options[:iam_instance_profile] = opts['iam_role']
@@ -255,11 +288,7 @@ module Stemcell
 
     # attempt to accept keys as file paths
     def try_file(opt="")
-      begin
-        return File.read(opt)
-      rescue Object => e
-        return opt
-      end
+        File.read(File.expand_path(opt)) rescue opt
     end
 
   end

data/lib/stemcell/metadata_launcher.rb

@@ -67,7 +67,7 @@ module Stemcell
         next if key == "aws_secret_key"
         value = options[key]
         next unless value
-        spaces = " " * (23 - key.length)
+        spaces = " " * (30 - key.length)
         puts "  #{key}#{spaces}#{value.to_s.green}"
       end
 

data/lib/stemcell/option_parser.rb

@@ -65,12 +65,48 @@ module Stemcell
         :type  => String,
         :env   => 'SECURITY_GROUPS'
       },
+      {
+        :name  => 'security_group_ids',
+        :desc  => "comma-separated list of security group IDs to launch instance with",
+        :type  => String,
+        :env   => 'SECURITY_GROUP_IDS'
+      },
       {
         :name  => 'availability_zone',
         :desc  => "zone in which to launch instances",
         :type  => String,
         :env   => 'AVAILABILITY_ZONE'
       },
+      {
+        :name  => 'vpc_id',
+        :desc  => "VPC ID for which to launch this instance",
+        :type  => String,
+        :env   => 'VPC_ID'
+      },
+      {
+        :name  => 'subnet',
+        :desc  => "VPC subnet for which to launch this instance",
+        :type  => String,
+        :env   => 'SUBNET'
+      },
+      {
+        :name  => 'private_ip_address',
+        :desc  => "VPC private IP to use",
+        :type  => String,
+        :env   => 'PRIVATE_IP_ADDRESS'
+      },
+      {
+        :name  => 'dedicated_tenancy',
+        :desc  => "Enable dedicated tenancy",
+        :env   => 'DEDICATED_TENANCY',
+        :default => false,
+      },
+      {
+        :name  => 'associate_public_ip_address',
+        :desc  => "Associate public IP address (for VPC)",
+        :env   => 'ASSOCIATE_PUBLIC_IP_ADDRESS',
+        :default => false,
+      },
       {
         :name  => 'tags',
         :desc  => "comma-separated list of key=value pairs to apply",
@@ -318,6 +354,7 @@ module Stemcell
 
       # convert security_groups from comma seperated string to ruby array
       options['security_groups'] &&= options['security_groups'].split(',')
+      options['security_group_ids'] &&= options['security_group_ids'].split(',')
       # convert ephemeral_devices from comma separated string to ruby array
       options['ephemeral_devices'] &&= options['ephemeral_devices'].split(',')
 

data/lib/stemcell/templates/bootstrap.sh.erb

@@ -92,7 +92,7 @@ install_chef() {
     package_local="/tmp/chef_${chef_version}.deb"
     package_url="<%= opts['chef_package_source'] %>"
     echo "Downloading chef from $package_url"
-    wget $package_url -O $package_local
+    wget $package_url -O $package_local --progress=dot:mega
     echo "Installing chef $chef_version"
     dpkg -i $package_local
     rm $package_local
@@ -101,6 +101,12 @@ install_chef() {
   fi
 }
 
+create_ohai_hint() {
+  ohai_hints_dir="${chef_dir}/ohai/hints"
+  mkdir -p $ohai_hints_dir
+  touch "${ohai_hints_dir}/ec2.json"
+}
+
 update_repo() {
   echo -e "$git_key" > $keyfile
   chmod 0400 $keyfile
@@ -230,6 +236,7 @@ install curl
 install git
 set_hostname
 install_chef
+create_ohai_hint
 update_repo
 configure_chef
 configure_converger

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/stemcell.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.description   = %q{A tool for launching and bootstrapping EC2 instances}
   s.summary       = %q{no summary}
   s.homepage      = "https://github.com/airbnb/stemcell"
+  s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Martin Rhoads
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -81,7 +72,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-creds
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,7 +86,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,7 +93,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,7 +100,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,7 +107,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,6 +123,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -187,28 +173,28 @@ files:
 - spec/support/fixture_helper.rb
 - stemcell.gemspec
 homepage: https://github.com/airbnb/stemcell
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: no summary
 test_files:
 - spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json