Modify params_lookup() to be able to search module::varname

.travis.yml

@@ -1,5 +1,7 @@
----
 language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
 script:
   - "bundle exec rake lint spec SPEC_OPTS='--format documentation'"
 matrix:
@@ -14,6 +16,7 @@ matrix:
   - rvm: 2.1.4
   #  env: STRICT_VARIABLES="yes"
 
+gemfile: .gemfile
 notifications:
   email:
     - [email protected]

lib/puppet/parser/functions/params_lookup.rb

@@ -3,8 +3,10 @@
 #
 # This function lookups for a variable value in various locations
 # following this order (first match is returned)
+# - Hiera backend (if present) for modulename::varname
 # - Hiera backend (if present) for modulename_varname
 # - Hiera backend (if present) for varname (if second argument is 'global')
+# - Top Scope Variable ::modulename::varname
 # - Top Scope Variable ::modulename_varname
 # - Top Scope Variable ::varname (if second argument is 'global')
 # - Module default: ::modulename::params::varname
@@ -21,8 +23,10 @@
 module Puppet::Parser::Functions
   newfunction(:params_lookup, :type => :rvalue, :doc => <<-EOS
 This fuction looks for the given variable name in a set of different sources:
+- Hiera, if available ('modulename::varname')
 - Hiera, if available ('modulename_varname')
 - Hiera, if available (if second argument is 'global')
+- ::modulename::varname
 - ::modulename_varname
 - ::varname (if second argument is 'global')
 - ::modulename::params::varname
@@ -39,13 +43,20 @@ module Puppet::Parser::Functions
 
     # Hiera Lookup
     if Puppet::Parser::Functions.function('hiera')
+      value = function_hiera(["#{module_name}::#{var_name}", ''])
+      return value if (not value.nil?) && (value != :undefined) && (value != '')
+
       value = function_hiera(["#{module_name}_#{var_name}", ''])
       return value if (not value.nil?) && (value != :undefined) && (value != '')
 
       value = function_hiera(["#{var_name}", '']) if arguments[1] == 'global'
       return value if (not value.nil?) && (value != :undefined) && (value != '')
     end
 
+    # Top Scope Variable Lookup (::modulename::varname)
+    value = lookupvar("::#{module_name}::#{var_name}")
+    return value if (not value.nil?) && (value != :undefined) && (value != '')
+
     # Top Scope Variable Lookup (::modulename_varname)
     catch (:undefined_variable) do
       begin