From 58e3855bb1c98e45f7e366d0f1fc6d834e0e5e43 Mon Sep 17 00:00:00 2001
From: Jeffrey J McCune <jeff.mccune@northstarlabs.net>
Date: Tue, 14 Aug 2007 09:50:42 -0400
Subject: Added optional per-module lib directory.

Puppet now looks for a lib directory inside each module bundle, and adds
the directory to the list searched by Puppet::Util::Autoload.

The intent is to facilitate more sophisticated virtual types and flexibility
within modules.
---
 lib/puppet/util/autoload.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/util/autoload.rb')

diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb
index 42aa56c32..be9e14671 100644
--- a/lib/puppet/util/autoload.rb
+++ b/lib/puppet/util/autoload.rb
@@ -141,7 +141,13 @@ class Puppet::Util::Autoload
 
     # The list of directories to search through for loadable plugins.
     def searchpath
-        [Puppet[:libdir], $:].flatten
+        # JJM: Search for optional lib directories in each module bundle.
+        module_lib_dirs = Puppet[:modulepath].split(":").collect do |d|
+            Dir.glob("%s/*/lib" % d).select do |f|
+                FileTest.directory?(f) 
+            end
+        end.flatten
+        [module_lib_dirs, Puppet[:libdir], $:].flatten
     end
 end
 
-- 
cgit