hiera-puppet 0.2.0 → 0.3.0

data/lib/hiera/scope.rb

@@ -7,7 +7,13 @@ class Hiera
         end
 
         def [](key)
-            ans = @real.lookupvar(key)
+            if key == "calling_class"
+                ans = @real.resource.name.to_s.downcase
+            elsif key == "calling_module"
+                ans = @real.resource.name.to_s.downcase.split("::").first
+            else
+                ans = @real.lookupvar(key)
+            end
 
             # damn you puppet visual basic style variables.
             return nil if ans == ""
@@ -15,7 +21,9 @@ class Hiera
         end
 
         def include?(key)
-            @real.lookupvar(key) != ""
+            return true if ["calling_class", "calling_module"].include?(key)
+
+            return @real.lookupvar(key) != ""
         end
 
         def catalog
@@ -30,4 +38,4 @@ class Hiera
             @real.compiler
         end
     end
-end
+end

data/lib/puppet/parser/functions/hiera.rb

@@ -13,9 +13,9 @@ module Puppet::Parser::Functions
             args = args[0]
         end
 
-        key = args[0] || nil
-        default = args[1] || nil
-        override = args[2] || nil
+        key = args[0]
+        default = args[1]
+        override = args[2]
 
         configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
 
@@ -38,7 +38,7 @@ module Puppet::Parser::Functions
 
         answer = hiera.lookup(key, default, hiera_scope, override, :priority)
 
-        raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied") unless answer
+        raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied") if answer.nil?
 
         return answer
     end

data/lib/puppet/parser/functions/hiera_array.rb

@@ -4,9 +4,9 @@ module Puppet::Parser::Functions
             args = args[0]
         end
 
-        key = args[0] || nil
-        default = args[1] || nil
-        override = args[2] || nil
+        key = args[0]
+        default = args[1]
+        override = args[2]
 
         configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
 

data/lib/puppet/parser/functions/hiera_hash.rb

@@ -0,0 +1,36 @@
+module Puppet::Parser::Functions
+    newfunction(:hiera_hash, :type => :rvalue) do |*args|
+        if args[0].is_a?(Array)
+            args = args[0]
+        end
+
+        key = args[0]
+        default = args[1]
+        override = args[2]
+
+        configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
+
+        raise(Puppet::ParseError, "Hiera config file #{configfile} not readable") unless File.exist?(configfile)
+        raise(Puppet::ParseError, "You need rubygems to use Hiera") unless Puppet.features.rubygems?
+
+        require 'hiera'
+        require 'hiera/scope'
+
+        config = YAML.load_file(configfile)
+        config[:logger] = "puppet"
+
+        hiera = Hiera.new(:config => config)
+
+        if self.respond_to?("{}")
+            hiera_scope = self
+        else
+            hiera_scope = Hiera::Scope.new(self)
+        end
+
+        answer = hiera.lookup(key, default, hiera_scope, override, :hash)
+
+        raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied") if answer.empty?
+
+        answer
+    end
+end

data/lib/puppet/parser/functions/hiera_include.rb

@@ -4,9 +4,9 @@ module Puppet::Parser::Functions
             args = args[0]
         end
 
-        key = args[0] || nil
-        default = args[1] || nil
-        override = args[2] || nil
+        key = args[0]
+        default = args[1]
+        override = args[2]
 
         configfile = File.join([File.dirname(Puppet.settings[:config]), "hiera.yaml"])
 

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+$:.insert(0, File.join([File.dirname(__FILE__), "..", "..", "lib"]))
+
+require 'rubygems'
+require 'rspec'
+require 'hiera/backend/puppet_backend'
+require 'hiera/scope'
+require 'rspec/mocks'
+require 'mocha'
+
+RSpec.configure do |config|
+    config.mock_with :mocha
+end
+
+class Puppet
+    class Parser
+        class Functions
+        end
+    end
+end
+

data/spec/unit/puppet_backend_spec.rb

@@ -0,0 +1,118 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class Hiera
+    module Backend
+        describe Puppet_backend do
+            before do
+                Hiera.stubs(:warn)
+                Hiera.stubs(:debug)
+                Backend.stubs(:datasources).yields([])
+                Puppet::Parser::Functions.stubs(:function).with(:include)
+
+                @mockresource = mock
+                @mockresource.stubs(:name).returns("ntp::config")
+
+                @mockscope = mock
+                @mockscope.stubs(:resource).returns(@mockresource)
+
+                @scope = Scope.new(@mockscope)
+
+                @backend = Puppet_backend.new
+            end
+
+            describe "#hierarchy" do
+                it "should use the configured datasource" do
+                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
+                    Config.expects("[]").with(:hierarchy)
+
+                    ["ntp", "ntp::config"].each do |klass|
+                        Backend.expects(:parse_string).with(klass, @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns(klass)
+                    end
+
+                    @backend.hierarchy(@scope, nil).should == ["rspec::ntp::config", "rspec::ntp", "ntp::config::rspec", "ntp::rspec"]
+                end
+
+                it "should not include empty class names" do
+                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
+                    Config.expects("[]").with(:hierarchy).returns(["%{foo}", "common"])
+
+                    Backend.expects(:parse_string).with("common", @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns("common")
+                    Backend.expects(:parse_string).with("%{foo}", @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns("")
+
+                    @backend.hierarchy(@scope, nil).should == ["rspec::common", "ntp::config::rspec", "ntp::rspec"]
+                end
+
+                it "should allow for an override data source" do
+                    Config.expects("[]").with(:puppet).returns({:datasource => "rspec"})
+                    Config.expects("[]").with(:hierarchy)
+
+                    ["ntp", "ntp::config"].each do |klass|
+                        Backend.expects(:parse_string).with(klass, @scope, {"calling_module" => "ntp", "calling_class" => "ntp::config"}).returns(klass)
+                    end
+
+                    @backend.hierarchy(@scope, "override").should == ["rspec::override", "rspec::ntp::config", "rspec::ntp", "ntp::config::rspec", "ntp::rspec"]
+                end
+
+                describe "#lookup" do
+                    it "should attempt to load data from unincluded classes" do
+                        Backend.expects(:empty_answer).returns(nil)
+                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
+
+                        catalog = mock
+                        catalog.expects(:classes).returns([])
+
+                        @scope.expects(:catalog).returns(catalog)
+                        @scope.expects(:function_include).with("rspec")
+                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec")
+
+                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec"])
+                        @backend.lookup("key", @scope, nil, nil).should == "rspec"
+                    end
+
+                    it "should not load loaded classes" do
+                        Backend.expects(:empty_answer).returns(nil)
+                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
+                        catalog = mock
+                        catalog.expects(:classes).returns(["rspec"])
+                        @mockscope.expects(:catalog).returns(catalog)
+                        @mockscope.expects(:function_include).never
+                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec")
+
+                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec"])
+                        @backend.lookup("key", @scope, nil, nil).should == "rspec"
+                    end
+
+                    it "should return the first found data" do
+                        Backend.expects(:empty_answer).returns(nil)
+                        Backend.expects(:parse_answer).with("rspec", @scope).returns("rspec")
+                        catalog = mock
+                        catalog.expects(:classes).returns(["rspec", "override"])
+                        @mockscope.expects(:catalog).returns(catalog)
+                        @mockscope.expects(:function_include).never
+                        @mockscope.expects(:lookupvar).with("override::key").returns("rspec")
+                        @mockscope.expects(:lookupvar).with("rspec::key").never
+
+                        @backend.expects(:hierarchy).with(@scope, "override").returns(["override", "rspec"])
+                        @backend.lookup("key", @scope, "override", nil).should == "rspec"
+                    end
+
+                    it "should return an array of found data for array searches" do
+                        Backend.expects(:empty_answer).returns([])
+                        Backend.expects(:parse_answer).with("rspec::key", @scope).returns("rspec::key")
+                        Backend.expects(:parse_answer).with("test::key", @scope).returns("test::key")
+                        catalog = mock
+                        catalog.expects(:classes).returns(["rspec", "test"])
+                        @mockscope.expects(:catalog).returns(catalog)
+                        @mockscope.expects(:function_include).never
+                        @mockscope.expects(:lookupvar).with("rspec::key").returns("rspec::key")
+                        @mockscope.expects(:lookupvar).with("test::key").returns("test::key")
+
+                        @backend.expects(:hierarchy).with(@scope, nil).returns(["rspec", "test"])
+                        @backend.lookup("key", @scope, nil, :array).should == ["rspec::key", "test::key"]
+                    end
+                end
+            end
+        end
+    end
+end
+

data/spec/unit/scope_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class Hiera
+    describe Scope do
+        describe "#initialize" do
+            it "should store the supplied puppet scope" do
+                real = {}
+                scope = Scope.new(real)
+                scope.real.should == real
+            end
+        end
+
+        describe "#[]" do
+            it "should treat '' as nil" do
+                real = mock
+                real.expects(:lookupvar).with("foo").returns("")
+
+                scope = Scope.new(real)
+                scope["foo"].should == nil
+            end
+
+            it "sould return found data" do
+                real = mock
+                real.expects(:lookupvar).with("foo").returns("bar")
+
+                scope = Scope.new(real)
+                scope["foo"].should == "bar"
+            end
+
+            it "should get calling_class and calling_module from puppet scope" do
+                real = mock
+                resource = mock
+                resource.expects(:name).returns("Foo::Bar").twice
+
+                real.expects(:resource).returns(resource).twice
+
+                scope = Scope.new(real)
+                scope["calling_class"].should == "foo::bar"
+                scope["calling_module"].should == "foo"
+            end
+        end
+
+        describe "#include?" do
+            it "should correctly report missing data" do
+                real = mock
+                real.expects(:lookupvar).with("foo").returns("")
+
+                scope = Scope.new(real)
+                scope.include?("foo").should == false
+            end
+
+            it "should always return true for calling_class and calling_module" do
+                real = mock
+                real.expects(:lookupvar).with("calling_class").never
+                real.expects(:lookupvar).with("calling_module").never
+
+                scope = Scope.new(real)
+                scope.include?("calling_class").should == true
+                scope.include?("calling_module").should == true
+            end
+        end
+    end
+end
+

metadata

@@ -1,38 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-puppet
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
-- R.I.Pienaar
+- Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +01:00
-default_executable: 
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hiera
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 description: Store and query Hiera data from Puppet
-email: rip@devco.net
+email: info@puppetlabs.com
 executables: 
 - extlookup2hiera
 extensions: []
@@ -41,13 +43,16 @@ extra_rdoc_files: []
 
 files: 
 - bin/extlookup2hiera
-- lib/puppet/parser/functions/hiera_array.rb
+- lib/hiera/backend/puppet_backend.rb
+- lib/hiera/scope.rb
 - lib/puppet/parser/functions/hiera.rb
+- lib/puppet/parser/functions/hiera_array.rb
+- lib/puppet/parser/functions/hiera_hash.rb
 - lib/puppet/parser/functions/hiera_include.rb
-- lib/hiera/scope.rb
-- lib/hiera/backend/puppet_backend.rb
-has_rdoc: true
-homepage: https://github.com/ripienaar/hiera-puppet
+- spec/spec_helper.rb
+- spec/unit/puppet_backend_spec.rb
+- spec/unit/scope_spec.rb
+homepage: https://github.com/puppetlabs/hiera-puppet
 licenses: []
 
 post_install_message: 
@@ -56,25 +61,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Puppet query interface and backend for Hiera
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/unit/puppet_backend_spec.rb
+- spec/unit/scope_spec.rb