hiera-puppet 0.1.0 → 0.2.0

data/lib/hiera/backend/puppet_backend.rb

@@ -12,7 +12,7 @@ class Hiera
                     data_class = "data"
                 end
 
-                calling_class = scope.real.resource.name.to_s.downcase
+                calling_class = scope.resource.name.to_s.downcase
                 calling_module = calling_class.split("::").first
 
                 hierarchy = Config[:hierarchy] || [calling_class, calling_module]
@@ -34,31 +34,55 @@ class Hiera
             end
 
             def lookup(key, scope, order_override, resolution_type)
-                answer = nil
+                answer = Backend.empty_answer(resolution_type)
 
                 Hiera.debug("Looking up #{key} in Puppet backend")
 
                 include_class = Puppet::Parser::Functions.function(:include)
-                loaded_classes = scope.real.catalog.classes
+                loaded_classes = scope.catalog.classes
 
                 hierarchy(scope, order_override).each do |klass|
-                    unless answer
-                        Hiera.debug("Looking for data in #{klass}")
+                    Hiera.debug("Looking for data in #{klass}")
 
-                        varname = [klass, key].join("::")
-                        unless loaded_classes.include?(klass)
-                            begin
+                    varname = [klass, key].join("::")
+                    temp_answer = nil
+
+                    unless loaded_classes.include?(klass)
+                        begin
+                            if scope.respond_to?(:function_include)
+                                scope.function_include(klass)
+                            else
                                 scope.real.function_include(klass)
-                                answer = scope[varname]
-                                Hiera.debug("Found data in class #{klass}")
-                            rescue
                             end
+
+                            temp_answer = scope[varname]
+                            Hiera.debug("Found data in class #{klass}")
+                        rescue
+                        end
+                    else
+                        temp_answer = scope[varname]
+                    end
+
+                    next if temp_answer == :undefined
+
+                    if temp_answer
+                        # for array resolution we just append to the array whatever
+                        # we find, we then goes onto the next file and keep adding to
+                        # the array
+                        #
+                        # for priority searches we break after the first found data item
+                        case resolution_type
+                        when :array
+                            answer << Backend.parse_answer(temp_answer, scope)
                         else
-                            answer = scope[varname]
+                            answer = Backend.parse_answer(temp_answer, scope)
+                            break
                         end
                     end
                 end
 
+                answer = nil if answer == :undefined
+
                 answer
             end
         end

data/lib/hiera/scope.rb

@@ -17,5 +17,17 @@ class Hiera
         def include?(key)
             @real.lookupvar(key) != ""
         end
+
+        def catalog
+            @real.catalog
+        end
+
+        def resource
+            @real.resource
+        end
+
+        def compiler
+            @real.compiler
+        end
     end
 end

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

@@ -29,7 +29,12 @@ module Puppet::Parser::Functions
         config[:logger] = "puppet"
 
         hiera = Hiera.new(:config => config)
-        hiera_scope = Hiera::Scope.new(self)
+
+        if self.respond_to?("[]")
+            hiera_scope = self
+        else
+            hiera_scope = Hiera::Scope.new(self)
+        end
 
         answer = hiera.lookup(key, default, hiera_scope, override, :priority)
 

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

@@ -0,0 +1,36 @@
+module Puppet::Parser::Functions
+    newfunction(:hiera_array, :type => :rvalue) do |*args|
+        if args[0].is_a?(Array)
+            args = args[0]
+        end
+
+        key = args[0] || nil
+        default = args[1] || nil
+        override = args[2] || nil
+
+        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, :array)
+
+        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

@@ -0,0 +1,37 @@
+module Puppet::Parser::Functions
+    newfunction(:hiera_include) do |*args|
+        if args[0].is_a?(Array)
+            args = args[0]
+        end
+
+        key = args[0] || nil
+        default = args[1] || nil
+        override = args[2] || nil
+
+        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, :array)
+
+        raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied") if answer.empty?
+
+        method = Puppet::Parser::Functions.function(:include)
+        send(method, answer)
+    end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +01:00
+date: 2011-06-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 description: Store and query Hiera data from Puppet
@@ -39,8 +41,9 @@ extra_rdoc_files: []
 
 files: 
 - bin/extlookup2hiera
+- lib/puppet/parser/functions/hiera_array.rb
 - lib/puppet/parser/functions/hiera.rb
-- lib/hiera/puppet_logger.rb
+- lib/puppet/parser/functions/hiera_include.rb
 - lib/hiera/scope.rb
 - lib/hiera/backend/puppet_backend.rb
 has_rdoc: true

data/lib/hiera/puppet_logger.rb

@@ -1,8 +0,0 @@
-class Hiera
-    module Puppet_logger
-        class << self
-            def warn(msg); Puppet.notice("hiera(): #{msg}"); end
-            def debug(msg); Puppet.debug("hiera(): #{msg}"); end
-        end
-    end
-end