chef_cap 0.3.14 → 0.3.15

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

data/recipes/chef_cap.rb

@@ -13,6 +13,7 @@ before "chef:setup", "bootstrap:ruby"
 
 set :application, ChefDnaParser.parsed["application"]["name"] rescue nil
 set :repository, ChefDnaParser.parsed["application"]["repository"] rescue nil
+set :default_ruby_version, "1.9.3-p0"
 
 ChefCapConfiguration.set_repository_settings
 
@@ -45,6 +46,9 @@ if ChefDnaParser.parsed["environments"]
       default_environment["RAILS_ENV"] = rails_env
 
       ChefCapHelper.parse_hash(environment_hash)
+      merged_environment = ChefDnaParser.parsed["environments"]["defaults"] || {} rescue {}
+      environment_hash.each { |k, v| ChefCapHelper.recursive_merge(merged_environment || {}, k, v) }
+      set :environment, merged_environment
 
       (environment_hash["servers"] || []).each do |server|
         if server["roles"] && server["hostname"]

data/recipes/lib/chef_cap_helper.rb

@@ -28,7 +28,18 @@ class ChefCapHelper
       when "Array_Array"
         hash[key] = hash[key] | value
       when "Hash_Hash"
-        hash[key] = hash[key].merge(value)
+        hash[key].merge!(value) do |k, oldvalue, newvalue|
+          case "#{oldvalue.class}_#{newvalue.class}"
+            when "Hash_Hash"
+              if oldvalue.has_key?(oldvalue) && newvalue.has_key?(newvalue)
+                recursive_merge(oldvalue, k, newvalue)
+              else
+                oldvalue.merge(newvalue)
+              end
+            else
+              newvalue
+            end
+        end
       else
         hash[key] = value
       end

data/recipes/rbenv.rb

@@ -1,7 +1,7 @@
 namespace :bootstrap do
   desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
   task :rbenv do
-    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "1.9.3-p0" || "1.9.3-p0")
+    set :ruby_version, default_ruby_version
     ruby_version.gsub!(/^ruby\-/,'')
     standup_script = <<-SH
       #!/bin/bash

data/recipes/rvm.rb

@@ -1,7 +1,7 @@
 namespace :bootstrap do
   desc "Create a standalone rvm installation with a default ruby to use with chef-solo"
   task :rvm do
-    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
+    set :ruby_version, default_ruby_version
     if ruby_version =~ /^[0-9]/
       ruby_version = "ruby-#{ruby_version}"
     end

data/spec/chef_cap_helper_spec.rb

@@ -116,6 +116,13 @@ describe ChefCapHelper do
       resulting_hash["key"].should == { "one" => nil }
     end
 
+    it "merges hashes recursively" do
+      original_hash = {"key" => { "one" => { "two"  => "three", "five" => "six" }}}
+
+      resulting_hash = ChefCapHelper.recursive_merge(original_hash, "key", {"one" => { "two" => "four" }})
+      resulting_hash["key"].should == { "one" => { "two" => "four", "five" => "six" } }
+    end
+
     it "merge will overwrite hashes with arrays" do
       original_hash = {"key" => {"array" => ["one"] }}
 

data/spec/chef_cap_spec.rb

@@ -128,6 +128,31 @@ describe "chef_cap" do
     end
   end
 
+  describe "merging defaults and a specific environment" do
+    it "sets the RAILS_ENV to rails_env" do
+      @test_dna = <<-ERB
+      {
+        "chef": {
+          "root": "path_to_cookbooks"
+        },
+        "environments": {
+          "defaults": {
+              "rails_env": "default",
+              "foo": "bar"
+          },
+          "some_env": {
+              "rails_env": "my_env"
+          }
+        }
+      }
+      ERB
+
+      chef_cap.cap_task[:some_env].call
+      chef_cap.cap_variable[:environment].should_not be_nil
+      chef_cap.cap_variable[:environment]["rails_env"].should == "my_env"
+      chef_cap.cap_variable[:environment]["foo"].should == "bar"
+    end
+  end
 
   describe ":repositories" do
     context "svn" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2243595100 !ruby/object:Gem::Requirement
+  requirement: &70301691251260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2243595100
+  version_requirements: *70301691251260
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2243594600 !ruby/object:Gem::Requirement
+  requirement: &70301691250760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2243594600
+  version_requirements: *70301691250760
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3296026032842137277
+      hash: 855178474274855074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3296026032842137277
+      hash: 855178474274855074
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"