Merge branch '0.25.x'

Conflicts:
	lib/puppet/agent.rb
	lib/puppet/application/puppetd.rb
	lib/puppet/parser/ast/leaf.rb
	lib/puppet/util/rdoc/parser.rb

2 files changed, 14 insertions, 5 deletions

diff --git a/spec/unit/application/puppetd.rb b/spec/unit/application/puppetd.rb
index 380608506..04c6daf32 100755
--- a/spec/unit/application/puppetd.rb
+++ b/spec/unit/application/puppetd.rb
@@ -40,7 +40,7 @@ describe "puppetd" do
 
     describe "in preinit" do
         before :each do
-            @pupetd.stubs(:trap)
+            @puppetd.stubs(:trap)
         end
 
         it "should catch INT" do
diff --git a/spec/unit/application/puppetdoc.rb b/spec/unit/application/puppetdoc.rb
index b9173752f..cb60581a4 100755
--- a/spec/unit/application/puppetdoc.rb
+++ b/spec/unit/application/puppetdoc.rb
@@ -290,16 +290,16 @@ describe "puppetdoc" do
                 @puppetdoc.manifest = false
                 Puppet.stubs(:info)
                 Puppet.stubs(:[]).with(:trace).returns(false)
-                Puppet.stubs(:[]).with(:modulepath).returns('modules')
-                Puppet.stubs(:[]).with(:manifestdir).returns('manifests')
+                @env = stub 'env'
+                Puppet::Node::Environment.stubs(:new).returns(@env)
+                @env.stubs(:modulepath).returns(['modules'])
+                @env.stubs(:manifestdir).returns(['manifests'])
                 @puppetdoc.options.stubs(:[]).with(:all).returns(false)
                 @puppetdoc.options.stubs(:[]).with(:outputdir).returns('doc')
                 Puppet.settings.stubs(:[]=).with(:document_all, false)
                 Puppet.settings.stubs(:setdefaults)
                 Puppet::Util::RDoc.stubs(:rdoc)
                 @puppetdoc.stubs(:exit)
-                File.stubs(:expand_path).with('modules').returns('modules')
-                File.stubs(:expand_path).with('manifests').returns('manifests')
                 @old = ARGV.dup
                 ARGV.clear
             end
@@ -331,6 +331,15 @@ describe "puppetdoc" do
                 Puppet::Util::RDoc.expects(:manifestdoc)
                 @puppetdoc.rdoc
             end
+
+            it "should get modulepath and manifestdir values from the environment" do
+                @env.expects(:modulepath).returns(['envmodules1','envmodules2'])
+                @env.expects(:manifestdir).returns(['envmanifests1','envmanifests2'])
+
+                Puppet::Util::RDoc.expects(:rdoc).with('doc', ['envmodules1','envmodules2','envmanifests1','envmanifests2'])
+
+                @puppetdoc.rdoc
+            end
         end
 
         describe "in the other modes" do