From c90c4db50796e3708499c93c871d1ab8968f092a Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 21 Jul 2014 16:17:09 +0300
Subject: Fix bug in 'vars.rb'

We need to return value of 'r' instead of value of previous evaluation.
---
 CHANGELOG.md                | 2 ++
 lib/oxidized/config/vars.rb | 1 +
 oxidized.gemspec            | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..912812a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,2 @@
+# 0.1.1
+- BUGFIX: vars needs to return value of r, not value of evaluation
diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb
index 40e4808..1fd81ef 100644
--- a/lib/oxidized/config/vars.rb
+++ b/lib/oxidized/config/vars.rb
@@ -5,5 +5,6 @@ module Oxidized::Config::Vars
     r =   @node.vars[name] unless @node.vars.nil?
     r ||= Oxidized::CFG.groups[@node.group].vars[name.to_s] if Oxidized::CFG.groups.has_key?(@node.group)
     r ||= Oxidized::CFG.vars[name.to_s] if Oxidized::CFG.vars.has_key?(name)
+    r
   end
 end
diff --git a/oxidized.gemspec b/oxidized.gemspec
index 9d8e38f..5c396a2 100644
--- a/oxidized.gemspec
+++ b/oxidized.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.1.0'
+  s.version           = '0.1.1'
   s.licenses          = ['Apache-2.0']
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
-- 
cgit v1.2.1