stemcell 0.6.4 → 0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stemcell (0.6.4)
+    stemcell (0.7.0)
       aws-creds (~> 0.2.2)
       aws-sdk (~> 1.9)
       chef (~> 11.4.0)

data/lib/stemcell/metadata_launcher.rb

@@ -64,6 +64,7 @@ module Stemcell
       puts "\nYou're about to launch instance(s) with the following options:\n\n"
 
       options.keys.sort.each do |key|
+        next if key == "aws_secret_key"
         value = options[key]
         next unless value
         spaces = " " * (23 - key.length)

data/lib/stemcell/metadata_source/chef_repository.rb

@@ -27,7 +27,8 @@ module Stemcell
       # This method will return nil if the role has no stemcell metdata.
       def metadata_for_role(chef_role, chef_environment)
         default_attrs, override_attrs = expand_role(chef_role, chef_environment)
-        merged_attrs = deep_merge!(override_attrs, default_attrs)
+        # hash_only_merge is how chef combines override_attrs and default_attrs so that overrides "win"
+        merged_attrs = hash_only_merge!(default_attrs, override_attrs)
         METADATA_ATTRIBUTES.inject(nil) { |r, key| r || merged_attrs[key] }
       end
 

data/lib/stemcell/option_parser.rb

@@ -32,7 +32,8 @@ module Stemcell
         :name  => 'aws_secret_key',
         :desc  => "aws secret key",
         :type  => String,
-        :env   => 'AWS_SECRET_KEY'
+        :env   => 'AWS_SECRET_KEY',
+        :hide  => true
       },
       {
         :name  => 'region',
@@ -221,7 +222,11 @@ module Stemcell
 
         _defns.each do |defn|
           # Prioritize the environment variable, then the given default
-          default = ENV[defn[:env]] || _this.defaults[defn[:name]]
+          if defn[:hide]
+            default = "<hidden>"
+          else
+            default = ENV[defn[:env]] || _this.defaults[defn[:name]]
+          end
 
           opt(
             defn[:name],
@@ -235,6 +240,13 @@ module Stemcell
         opt('help', 'help', :short => :l) if _this.override_help
       end
 
+      # Populate the hidden defaults. Some (like aws secret key) is :hidden so that Trollop wont print that into stdout
+      _defns.each do |defn|
+        if defn[:hide] && options[defn[:name]] == "<hidden>"
+          options[defn[:name]] = ENV[defn[:env]] || _this.defaults[defn[:name]]
+        end
+      end
+
       # convert tags from string to ruby hash
       if options['tags']
         tags = {}

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

@@ -41,7 +41,6 @@ data_bag_secret='<%= opts["chef_data_bag_secret"] %>'
 hostname='<%= opts['instance_hostname'] %>'
 domain_name='<%= opts['instance_domain_name'] %>'
 chef_version='<%= opts['chef_version'] %>'
-package_url="<%= opts['chef_package_source'] %>"
 
 
 ##
@@ -91,6 +90,7 @@ install_chef() {
     platform_version=`lsb_release -s -r`
     arch=`uname -m`
     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
     echo "Installing chef $chef_version"

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json

@@ -2,8 +2,6 @@
   "instance_type": "m3.xlarge",
   "security_groups": [
     "all",
-    "base",
-    "default",
     "override"
   ],
   "tags": {

data/spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-override.json

@@ -2,7 +2,6 @@
   "instance_type": "m3.xlarge",
   "security_groups": [
     "all",
-    "base",
     "override"
   ],
   "tags": {

data/spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-both.json

@@ -1,8 +1,6 @@
 {
   "instance_type": "m3.xlarge",
   "security_groups": [
-    "all",
-    "default",
     "override"
   ],
   "tags": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk