stemcell 0.5.0 → 0.6.0

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Martin Rhoads
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-12 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
@@ -153,34 +138,85 @@ files:
 - lib/stemcell/log_tailer.rb
 - lib/stemcell/metadata_launcher.rb
 - lib/stemcell/metadata_source.rb
+- lib/stemcell/metadata_source/chef_repository.rb
+- lib/stemcell/metadata_source/configuration.rb
 - lib/stemcell/option_parser.rb
 - lib/stemcell/templates/bootstrap.sh.erb
-- lib/stemcell/utility.rb
-- lib/stemcell/utility/deep_merge.rb
 - lib/stemcell/version.rb
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-default.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-none.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-override.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-both.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-default.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-override.json
+- spec/fixtures/chef_repo/roles/unit-inherit-base.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-both.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-default.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-none.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-override.rb
+- spec/fixtures/chef_repo/roles/unit-simple-both.rb
+- spec/fixtures/chef_repo/roles/unit-simple-default.rb
+- spec/fixtures/chef_repo/roles/unit-simple-none.rb
+- spec/fixtures/chef_repo/roles/unit-simple-override.rb
+- spec/fixtures/chef_repo/stemcell-azs-missing.json
+- spec/fixtures/chef_repo/stemcell-backing-store-empty.json
+- spec/fixtures/chef_repo/stemcell-backing-store-missing.json
+- spec/fixtures/chef_repo/stemcell-defaults-missing.json
+- spec/fixtures/chef_repo/stemcell.json
+- spec/lib/stemcell/metadata_source/chef_repository_spec.rb
+- spec/lib/stemcell/metadata_source/configuration_spec.rb
+- spec/lib/stemcell/metadata_source_spec.rb
+- spec/spec_helper.rb
+- spec/support/fixture_helper.rb
 - stemcell.gemspec
 homepage: https://github.com/airbnb/stemcell
 licenses: []
+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
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: no summary
-test_files: []
+test_files:
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-default.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-none.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-override.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-both.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-default.json
+- spec/fixtures/chef_repo/roles-expected-metadata/unit-simple-override.json
+- spec/fixtures/chef_repo/roles/unit-inherit-base.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-both.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-default.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-none.rb
+- spec/fixtures/chef_repo/roles/unit-inherit-override.rb
+- spec/fixtures/chef_repo/roles/unit-simple-both.rb
+- spec/fixtures/chef_repo/roles/unit-simple-default.rb
+- spec/fixtures/chef_repo/roles/unit-simple-none.rb
+- spec/fixtures/chef_repo/roles/unit-simple-override.rb
+- spec/fixtures/chef_repo/stemcell-azs-missing.json
+- spec/fixtures/chef_repo/stemcell-backing-store-empty.json
+- spec/fixtures/chef_repo/stemcell-backing-store-missing.json
+- spec/fixtures/chef_repo/stemcell-defaults-missing.json
+- spec/fixtures/chef_repo/stemcell.json
+- spec/lib/stemcell/metadata_source/chef_repository_spec.rb
+- spec/lib/stemcell/metadata_source/configuration_spec.rb
+- spec/lib/stemcell/metadata_source_spec.rb
+- spec/spec_helper.rb
+- spec/support/fixture_helper.rb

data/lib/stemcell/utility/deep_merge.rb

@@ -1,13 +0,0 @@
-class Hash
-  def deep_merge!(other_hash)
-    merge!(other_hash) do |key, oldval, newval|
-      # Coerce Chef-style attribute hashes to generic ones
-      oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
-      newval = newval.to_hash if newval.respond_to?(:to_hash)
-
-      oldval.class.to_s == 'Hash' &&
-        newval.class.to_s == 'Hash' ?
-          oldval.deep_merge!(newval) : newval
-    end
-  end
-end

data/lib/stemcell/utility.rb

@@ -1 +0,0 @@
-require 'stemcell/utility/deep_merge'