← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to lib/puppet/file_serving/mount/plugins.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/file_serving/mount/plugins.rb
 
1
require 'puppet/file_serving/mount'
 
2
 
 
3
# Find files in the modules' plugins directories.
 
4
# This is a very strange mount because it merges
 
5
# many directories into one.
 
6
class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
 
7
    # Return an instance of the appropriate class.
 
8
    def find(relative_path, request)
 
9
        return nil unless mod = request.environment.modules.find { |mod|  mod.plugin(relative_path) }
 
10
 
 
11
        path = mod.plugin(relative_path)
 
12
 
 
13
        return path
 
14
    end
 
15
 
 
16
    def search(relative_path, request)
 
17
        # We currently only support one kind of search on plugins - return
 
18
        # them all.
 
19
        paths = request.environment.modules.find_all { |mod| mod.plugins? }.collect { |mod| mod.plugin_directory }
 
20
        return nil if paths.empty?
 
21
        return paths
 
22
    end
 
23
 
 
24
    def valid?
 
25
        true
 
26
    end
 
27
end