Fixing #1544 - plugins in modules now works again

We had to fix the fileserving plumbing to use the request
environment instead of trying to use the node environment.
This was apparently never fixed after we added the environment
to the URI in REST calls.

There's still a bit of refactoring left to clean up the APIs used
in some of this code.

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 83 insertions, 0 deletions

diff --git a/spec/integration/indirector/file_content/file_server.rb b/spec/integration/indirector/file_content/file_server.rb
index 965bd8fd1..b3c63fc33 100755
--- a/spec/integration/indirector/file_content/file_server.rb
+++ b/spec/integration/indirector/file_content/file_server.rb
@@ -8,11 +8,36 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/indirector/file_content/file_server'
 require 'shared_behaviours/file_server_terminus'
 
+require 'puppet_spec/files'
+
 describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
     it_should_behave_like "Puppet::Indirector::FileServerTerminus"
+    include PuppetSpec::Files
 
     before do
         @terminus = Puppet::Indirector::FileContent::FileServer.new
         @test_class = Puppet::FileServing::Content
     end
+
+    it "should find file content in the environment specified in the request" do
+        path = tmpfile("file_content_with_env")
+
+        Dir.mkdir(path)
+
+        modpath = File.join(path, "mod")
+        FileUtils.mkdir_p(File.join(modpath, "lib"))
+        file = File.join(modpath, "lib", "file.rb")
+        File.open(file, "w") { |f| f.puts "1" }
+
+        env = Puppet::Node::Environment.new("foo")
+        env.stubs(:modulepath).returns [path]
+        Puppet.settings[:modulepath] = "/no/such/file"
+
+        result = Puppet::FileServing::Content.search("plugins", :environment => "foo", :recurse => true)
+
+        result.should_not be_nil
+        result.length.should == 2
+        result[1].should be_instance_of(Puppet::FileServing::Content)
+        result[1].content.should == "1\n"
+    end
 end
diff --git a/spec/integration/node/environment.rb b/spec/integration/node/environment.rb
new file mode 100755
index 000000000..68dfd93a3
--- /dev/null
+++ b/spec/integration/node/environment.rb
@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'puppet_spec/files'
+
+describe Puppet::Node::Environment do
+    include PuppetSpec::Files
+
+    it "should be able to return each module from its environment with the environment, name, and path set correctly" do
+        base = tmpfile("env_modules")
+        Dir.mkdir(base)
+
+        dirs = []
+        mods = {}
+        %w{1 2}.each do |num|
+            dir = File.join(base, "dir#{num}")
+            dirs << dir
+            Dir.mkdir(dir)
+            mod = "mod#{num}"
+            moddir = File.join(dir, mod)
+            mods[mod] = moddir
+            Dir.mkdir(moddir)
+        end
+
+        environment = Puppet::Node::Environment.new("foo")
+        environment.stubs(:modulepath).returns dirs
+
+        environment.modules.each do |mod|
+            mod.environment.should == environment
+            mod.path.should == mods[mod.name]
+        end
+    end
+
+    it "should not yield the same module from different module paths" do
+        base = tmpfile("env_modules")
+        Dir.mkdir(base)
+
+        dirs = []
+        mods = {}
+        %w{1 2}.each do |num|
+            dir = File.join(base, "dir#{num}")
+            dirs << dir
+            Dir.mkdir(dir)
+            mod = "mod"
+            moddir = File.join(dir, mod)
+            mods[mod] = moddir
+            Dir.mkdir(moddir)
+        end
+
+        environment = Puppet::Node::Environment.new("foo")
+        environment.stubs(:modulepath).returns dirs
+
+        mods = environment.modules
+        mods.length.should == 1
+        mods[0].path.should == File.join(base, "dir1", "mod")
+    end
+end