gusteau 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.1 / 2013-07-14
+* Bugfix: environment attributes got altered by node ones
+
 ## 1.0.7.dev / 2013-07-10
 * Replace the fully-blown test-kitchen with a simpler serverspec setup
 * Randomise Vagrant IP address in the template

data/README.md

@@ -27,7 +27,7 @@ Some of the features include:
 Gusteau is a Ruby gem:
 
 ```
-gem install gusteau --pre
+gem install gusteau
 ```
 
 The following command generates an example Chef-repo:

data/gusteau.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'coderay'
   gem.add_dependency 'json'
   gem.add_dependency 'hashie'
-  gem.add_dependency 'hash-deep-merge'
+  gem.add_dependency 'deep_merge'
   gem.add_dependency 'net-ssh', '>= 2.2.2'
   gem.add_dependency 'archive-tar-minitar', '>= 0.5.2'
 

data/lib/gusteau/config.rb

@@ -1,5 +1,5 @@
 require 'gusteau/erb'
-require 'hash_deep_merge'
+require 'gusteau/helpers'
 
 module Gusteau
   class Config
@@ -56,12 +56,13 @@ module Gusteau
     #
     def build_node(node_name, env_hash, node_hash)
       node_config = {
-        'server'     => node_hash,
-        'attributes' => (env_hash['attributes'] || {}).deep_merge(node_hash['attributes'] || {}),
+        'server'     => node_hash.slice('host', 'port', 'user', 'password', 'platform', 'vagrant'),
+        'attributes' => (node_hash['attributes'] || {}).deep_merge(env_hash['attributes'] || {}),
         'run_list'   => node_hash['run_list']   || env_hash['run_list'],
         'before'     => env_hash['before']      || @config['before'],
         'after'      => env_hash['after']       || @config['after']
       }
+      node_config['server'].delete 'attributes'
       Gusteau::Node.new(node_name, node_config)
     end
   end

data/lib/gusteau/helpers.rb

@@ -0,0 +1,7 @@
+require 'deep_merge'
+
+class Hash
+  def slice *keys
+    select{|k| keys.member?(k)}
+  end
+end

data/lib/gusteau/version.rb

@@ -1,3 +1,3 @@
 module Gusteau
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/config/remi.yml

@@ -10,6 +10,7 @@ environments:
 
   production:
     attributes:
+      net: { hostname: prod }
       users:
         - alex
         - simon
@@ -23,12 +24,14 @@ environments:
         <<: *default_node
         host: db.myapp.com
         attributes:
+          net: { hostname: prod-db }
           mysql:
             server_root_password: prodsecret
       www:
         <<: *default_node
         host: www.myapp.com
         attributes:
+          net: { hostname: prod-www }
           nginx:
             workers: 4
         run_list: [ 'recipe[varnish]', 'recipe[nginx]' ]

data/spec/lib/gusteau/config_spec.rb

@@ -26,6 +26,7 @@ describe Gusteau::Config do
 
       it "should deeply merge the attributes" do
         nodes['production-db'].config['attributes'].must_equal({
+          'net'   => {'hostname' => 'prod-db'},
           'users' => ['alex', 'simon'],
           'mysql' => {'server_port' => 3307, 'server_root_password' => 'prodsecret' }
         })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gusteau
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optitron
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hash-deep-merge
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -249,6 +249,7 @@ files:
 - lib/gusteau/compressed_tar_stream.rb
 - lib/gusteau/config.rb
 - lib/gusteau/erb.rb
+- lib/gusteau/helpers.rb
 - lib/gusteau/log.rb
 - lib/gusteau/node.rb
 - lib/gusteau/server.rb
@@ -301,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4376898351999153113
+      hash: -340047835644286635
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -310,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4376898351999153113
+      hash: -340047835644286635
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23