[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[James Turnbull]

The following commit has been merged in the upstream branch:
commit fcce46aaf1413ef1cd275d1e3db76324ea2e1088
Author: John A. Barbuto <jbarbuto at corp.sourceforge.com>
Date:   Tue Oct 6 14:32:07 2009 -0700

    Fixed #2702 - Set :outputdir to "doc" if not specified
    
    Signed-off-by: John A. Barbuto <jbarbuto at corp.sourceforge.com>

diff --git a/lib/puppet/application/puppetdoc.rb b/lib/puppet/application/puppetdoc.rb
index 45aba42..a5496cc 100644
--- a/lib/puppet/application/puppetdoc.rb
+++ b/lib/puppet/application/puppetdoc.rb
@@ -79,6 +79,7 @@ Puppet::Application.new(:puppetdoc) do
             if @manifest
                 Puppet::Util::RDoc.manifestdoc(files)
             else
+                options[:outputdir] = "doc" unless options[:outputdir]
                 Puppet::Util::RDoc.rdoc(options[:outputdir], files)
             end
         rescue => detail
diff --git a/spec/unit/application/puppetdoc.rb b/spec/unit/application/puppetdoc.rb
index 2bb74a7..b917375 100755
--- a/spec/unit/application/puppetdoc.rb
+++ b/spec/unit/application/puppetdoc.rb
@@ -320,6 +320,12 @@ describe "puppetdoc" do
                 @puppetdoc.rdoc
             end
 
+            it "should call Puppet::Util::RDoc.rdoc in full mode with outputdir set to doc if no --outputdir" do
+                @puppetdoc.options.expects(:[]).with(:outputdir).returns(false)
+                Puppet::Util::RDoc.expects(:rdoc).with('doc', ['modules','manifests'])
+                @puppetdoc.rdoc
+            end
+
             it "should call Puppet::Util::RDoc.manifestdoc in manifest mode" do
                 @puppetdoc.manifest = true
                 Puppet::Util::RDoc.expects(:manifestdoc)

-- 
Puppet packaging for Debian