rubber 2.1.1 → 2.1.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.1.2 (10/05/2012)
+------------------
+
+New Features:
+============
+
+[core] Allowing marking of a config variable as overriding the ones that come before it, so that non-scalar values (lists/maps) get overridden instead of combined <3d66fc8>
+[core] Allow erb in rubber*.yml <60e6394>
+
 2.1.1 (10/02/2012)
 ------------------
 
@@ -17,7 +26,6 @@ Improvements:
 [jenkins] Added support for backing up Jenkins. <a44162d>
 [jenkins] Fixed Jenkins config. <bbaa6f4>
 [jenkins] Make sure we have the header module enabled for the config to work. <93d03d8>
-[jenkins] The module is "headers", not "header". <4057334>
 [passenger] Bumped rubber from 3.0.12 to 3.0.15. <bc408f1>
 [passenger_nginx] Updated Nginx config to improve performance of asset pipeline. <7184327>
 [torquebox] Updated TorqueBox config from 2.0.3 to 2.1.0. <13a0268>

data/lib/rubber/environment.rb

@@ -36,7 +36,7 @@ module Rubber
         Rubber.logger.debug{"Reading rubber configuration from #{file}"}
         if File.exist?(file)
           begin
-            @items = Environment.combine(@items, YAML.load_file(file) || {})
+            @items = Environment.combine(@items, YAML::load(ERB.new(IO.read(file)).result) || {})
           rescue Exception => e
             Rubber.logger.error{"Unable to read rubber configuration from #{file}"}
             raise
@@ -56,7 +56,7 @@ module Rubber
         
         # all the roles known about in yml files
         Dir["#{@config_root}/rubber*.yml"].each do |yml|
-          rubber_yml = YAML.load(File.read(yml)) rescue {}
+          rubber_yml = YAML::load(ERB.new(IO.read(yml)).result) rescue {}
           roles.concat(rubber_yml['roles'].keys) rescue nil
           roles.concat(rubber_yml['role_dependencies'].keys) rescue nil
           roles.concat(rubber_yml['role_dependencies'].values) rescue nil
@@ -89,7 +89,12 @@ module Rubber
         if old.is_a?(Hash) && new.is_a?(Hash)
           value = old.clone
           new.each do |nk, nv|
-            value[nk] = combine(value[nk], nv)
+            if nk[0] == '^'
+              nk = nk[1..-1]
+              value[nk] = combine(nil, nv)
+            else
+              value[nk] = combine(value[nk], nv)
+            end
           end
         elsif old.is_a?(Array) && new.is_a?(Array)
           value = old | new

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/templates/base/config/rubber/rubber.yml

@@ -298,7 +298,7 @@ stop_on_error_cmd: "function error_exit { exit 99; }; trap error_exit ERR"
 
 # OPTIONAL: You can also define your own variables here for use when
 # transforming config files, and they will be available in your config
-# templates as  <%= rubber_env.var_name %>
+# templates as  <%%= rubber_env.var_name %>
 #
 # var_name: var_value
 

data/test/environment_test.rb

@@ -75,6 +75,13 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal({1 => {1 => "1", 2 => "2"}}, env.combine({1 => {1 => "1"}}, {1 => {2 => "2"}}), "Maps should be unioned recursively when combined")
   end
 
+  def test_combine_override
+    env = Rubber::Configuration::Environment
+    assert_equal({"x" => 4, "y" => 2, "z" => 3}, env.combine({"x" => 1, "y" => 2}, {"^x" => 4, "z" => 3}), "scalars should override")
+    assert_equal({"x" => [3, 4]}, env.combine({"x" => [1, 2]}, {"^x" => [3, 4]}), "lists should override")
+    assert_equal({"x" => {"y" => [3, 4]}}, env.combine({"x" => {"y" => [1, 2]}}, {"x" => {"^y" => [3, 4]}}), "Maps should override recursively")
+  end
+
   def test_expansion
     env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion", 'test')
     e = env.bind()
@@ -152,4 +159,10 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal "50.1.1.1", e['var1']
   end
 
+  def test_erb_yml
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
+    e = env.bind()
+    assert_equal [0, 1, 2], e["erb_var"], 'should be able to generate env using erb'    
+  end
+  
 end

data/test/fixtures/basic/rubber.yml

@@ -28,4 +28,8 @@ environments:
 
 role_dependencies:
   role3: [role4, role5]
-  
+
+erb_var:
+<% 3.times do |i| %>
+  - <%= i %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -664,7 +664,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3394204759182119607
+      hash: -1263821507028843624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -673,7 +673,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3394204759182119607
+      hash: -1263821507028843624
 requirements: []
 rubyforge_project: rubber
 rubygems_version: 1.8.24