From 50a626daa1bef956ea63c405fddeaeab8a9a0756 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Thu, 10 Jun 2010 19:21:05 -0700 Subject: Fixing #1545 - Adding 'caller_module_name' variable This will produce the name of the module that a given resource is defined in, rather than the module that the resource type itself is defined in. For instance: # in one/manifests/onedef.pp define one::onedef { notice "Called $name from $caller_module_name" } # in two/manifests/init.pp class two { one::onedef { yay: } } produces: Called yay from two This could obviously be extended to actually build a caller stack, as frightening as that seems. Signed-off-by: Luke Kanies --- lib/puppet/parser/scope.rb | 6 ++++++ lib/puppet/resource/type.rb | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'lib/puppet') diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index 140c8c1b5..c974aee78 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -306,6 +306,12 @@ class Puppet::Parser::Scope self.nodescope end + def parent_module_name + return nil unless @parent + return nil unless @parent.source + @parent.source.module_name + end + # Return the list of scopes up to the top scope, ordered with our own first. # This is used for looking up variables and defaults. def scope_path diff --git a/lib/puppet/resource/type.rb b/lib/puppet/resource/type.rb index 227c544e6..e13b1834e 100644 --- a/lib/puppet/resource/type.rb +++ b/lib/puppet/resource/type.rb @@ -214,6 +214,10 @@ class Puppet::Resource::Type scope.setvar("title", resource.title) unless set.include? :title scope.setvar("name", resource.name) unless set.include? :name scope.setvar("module_name", module_name) if module_name and ! set.include? :module_name + + if caller_name = scope.parent_module_name and ! set.include?(:caller_module_name) + scope.setvar("caller_module_name", caller_name) + end scope.class_set(self.name,scope) if hostclass? end -- cgit