Please review pull request #377: (#11786) Fixing specs' running in Ruby 1.9 opened by (kavu)
Description:
Fixed specs' running through the renaming of required files
in lib/puppet/util/rdoc/parser.rb, also added one tiny condition
for Ruby 1.9.3 and 1.9.2. Ugly fix, but it works. Anyway, there
are still some failing specs.
Also fixed some tab intendation characters.
- Opened: Sat Jan 21 22:24:51 UTC 2012
- Based on: puppetlabs:master (5e98876f5c91e7019ef9ea0842e30bdcfe8098b2)
- Requested merge: kavu:tickets/master/11786_fixing_specs_running_fail_on_ruby_1_9_3 (7a9e5cc2c8739ebca2265d18b75e6518e35492e3)
Diff follows:
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb index 05e3aab..6a52c0b 100644 --- a/lib/puppet/util/rdoc/parser.rb +++ b/lib/puppet/util/rdoc/parser.rb @@ -6,14 +6,15 @@ # rdoc mandatory includes require "rdoc/code_objects" require "puppet/util/rdoc/code_objects" -require "rdoc/tokenstream" + +require (::RUBY_VERSION == "1.9.3" ? "rdoc/token_stream" : "rdoc/tokenstream") if ::RUBY_VERSION =~ /1.9/ - require "rdoc/markup/preprocess" - require "rdoc/parser" + require "rdoc/markup/preprocess" unless ::RUBY_VERSION == "1.9.3" + require "rdoc/parser" else - require "rdoc/markup/simple_markup/preprocess" - require "rdoc/parsers/parserfactory" + require "rdoc/markup/simple_markup/preprocess" + require "rdoc/parsers/parserfactory" end module RDoc
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
