diff options
Diffstat (limited to 'lib/puppet/module.rb')
| -rw-r--r-- | lib/puppet/module.rb | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index 2b6777c43..d332392f9 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -4,6 +4,12 @@ require 'puppet/util/logging' class Puppet::Module include Puppet::Util::Logging + class InvalidName < ArgumentError + def message + "Invalid module name; module names must be alphanumeric (plus '-')" + end + end + TEMPLATES = "templates" FILES = "files" MANIFESTS = "manifests" @@ -11,28 +17,6 @@ class Puppet::Module FILETYPES = [MANIFESTS, FILES, TEMPLATES, PLUGINS] - # Search through a list of paths, yielding each found module in turn. - def self.each_module(*paths) - paths = paths.flatten.collect { |p| p.split(File::PATH_SEPARATOR) }.flatten - - yielded = {} - paths.each do |dir| - next unless FileTest.directory?(dir) - - Dir.entries(dir).each do |name| - next if name =~ /^\./ - next if yielded.include?(name) - - module_path = File.join(dir, name) - next unless FileTest.directory?(module_path) - - yielded[name] = true - - yield Puppet::Module.new(name) - end - end - end - # Return an array of paths by splitting the +modulepath+ config # parameter. Only consider paths that are absolute and existing # directories @@ -53,6 +37,9 @@ class Puppet::Module def initialize(name, environment = nil) @name = name + + assert_validity() + if environment.is_a?(Puppet::Node::Environment) @environment = environment else @@ -152,4 +139,8 @@ class Puppet::Module return File.join(path, "lib") end end + + def assert_validity + raise InvalidName unless name =~ /^[\w-]+$/ + end end |