diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-22 22:48:17 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-23 13:10:40 -0700 |
| commit | 7a4fcf2835ac414fe3c5b1b4e4b16c13a2c92d09 (patch) | |
| tree | 133347ca992d6356472e1f967d25c78a6dc8582c /lib/puppet/util/rdoc/parser.rb | |
| parent | 341654ea16e662e31bb97ca260397939ac34692e (diff) | |
| download | puppet-7a4fcf2835ac414fe3c5b1b4e4b16c13a2c92d09.tar.gz puppet-7a4fcf2835ac414fe3c5b1b4e4b16c13a2c92d09.tar.xz puppet-7a4fcf2835ac414fe3c5b1b4e4b16c13a2c92d09.zip | |
(#6820) Fix RDOC parser to work with Ruby 1.9
Lovely RDOC changed where it put everything in Ruby 1.9. Now there's
some conditional logic depending on Ruby version to determine which
files to requrie. The tests still fail, but at least they run now.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'lib/puppet/util/rdoc/parser.rb')
| -rw-r--r-- | lib/puppet/util/rdoc/parser.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb index 0f746e2ea..762ce25f0 100644 --- a/lib/puppet/util/rdoc/parser.rb +++ b/lib/puppet/util/rdoc/parser.rb @@ -7,13 +7,19 @@ require "rdoc/code_objects" require "puppet/util/rdoc/code_objects" require "rdoc/tokenstream" -require "rdoc/markup/simple_markup/preprocess" -require "rdoc/parsers/parserfactory" + +if ::RUBY_VERSION =~ /1.9/ + require "rdoc/markup/preprocess" + require "rdoc/parser" +else + require "rdoc/markup/simple_markup/preprocess" + require "rdoc/parsers/parserfactory" +end module RDoc class Parser - extend ParserFactory + extend ParserFactory unless ::RUBY_VERSION =~ /1.9/ SITE = "__site__" |