[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit af521fade9bf64704bab00ddf5d81aa1f987fb7e
Author: Luke Kanies <luke at reductivelabs.com>
Date:   Wed Apr 7 23:10:21 2010 -0700

    Adding #3518 - basic dot format support
    
    This allows you to ask for a node's catalog in
    dot format, for inputting into graphviz et al.
    
    Signed-off-by: Luke Kanies <luke at reductivelabs.com>

diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb
index 62569d4..92f778c 100644
--- a/lib/puppet/network/formats.rb
+++ b/lib/puppet/network/formats.rb
@@ -186,3 +186,6 @@ Puppet::Network::FormatHandler.create(:pson, :mime => "text/pson", :weight => 10
         klass.from_pson(data)
     end
 end
+
+# This is really only ever going to be used for Catalogs.
+Puppet::Network::FormatHandler.create(:dot, :mime => "text/dot", :required_methods => [:render_method])
diff --git a/spec/unit/network/formats.rb b/spec/unit/network/formats.rb
index 7b0c0ad..78b35fd 100755
--- a/spec/unit/network/formats.rb
+++ b/spec/unit/network/formats.rb
@@ -263,6 +263,16 @@ describe "Puppet Network Format" do
         end
     end
 
+    describe "dot" do
+        before do
+            @dot = Puppet::Network::FormatHandler.format(:dot)
+        end
+
+        it "should have its mimetype set to text/dot" do
+            @dot.mime.should == "text/dot"
+        end
+    end
+
     describe Puppet::Network::FormatHandler.format(:raw) do
         before do
             @format = Puppet::Network::FormatHandler.format(:raw)

-- 
Puppet packaging for Debian