summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/rdoc/parser.rb
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2009-11-10 18:19:59 +0100
committerJames Turnbull <james@lovedthanlost.net>2009-11-12 08:02:10 +1100
commit38ec9fcc5f3965942a74c8d7b7dfd1cf1796c0df (patch)
tree7df4540de585f8775d219a5e6c459f21ac77fc10 /lib/puppet/util/rdoc/parser.rb
parent5f7177efeae81c86086d73b3c7869302cfc6a40d (diff)
downloadpuppet-38ec9fcc5f3965942a74c8d7b7dfd1cf1796c0df.tar.gz
puppet-38ec9fcc5f3965942a74c8d7b7dfd1cf1796c0df.tar.xz
puppet-38ec9fcc5f3965942a74c8d7b7dfd1cf1796c0df.zip
Fix #2796 - Fix puppetdoc rdoc selector parsing
This patch fix this bug by adding more to_s methods to ast member so that puppetdoc can just to_s the AST to reconstruct the original puppet code. Of course this is not perfect, but should work most of the time. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/util/rdoc/parser.rb')
-rw-r--r--lib/puppet/util/rdoc/parser.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 2d219d19c..97a245a14 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -271,12 +271,15 @@ class Parser
declaration = ""
define.arguments.each do |arg,value|
declaration << "\$#{arg}"
- if !value.nil?
+ unless value.nil?
declaration << " => "
- if !value.is_a?(Puppet::Parser::AST::ASTArray)
+ case value
+ when Puppet::Parser::AST::Leaf
declaration << "'#{value.value}'"
- else
+ when Puppet::Parser::AST::ASTArray
declaration << "[%s]" % value.children.collect { |v| "'#{v}'" }.join(", ")
+ else
+ declaration << "#{value.to_s}"
end
end
declaration << ", "