lib/yard/rubygems/doc_manager.rb in yard-0.8.3 vs lib/yard/rubygems/doc_manager.rb in yard-0.8.4

- old
+ new

@@ -1,7 +1,10 @@ -require 'rubygems/user_interaction' -require 'rubygems/doc_manager' +begin + require 'rubygems/user_interaction' + require 'rubygems/doc_manager' +rescue LoadError +end class Gem::DocManager def self.load_yardoc require File.expand_path(File.join(File.dirname(__FILE__), *%w(.. .. yard))) end @@ -32,11 +35,11 @@ ui.errs.puts "(continuing with the rest of the installation)" ensure Dir.chdir(old_pwd) end - undef setup_rdoc + begin undef setup_rdoc; rescue NameError; end def setup_rdoc if File.exist?(@doc_dir) && !File.writable?(@doc_dir) then raise Gem::FilePermissionError.new(@doc_dir) end @@ -62,18 +65,24 @@ self.class.load_yardoc say "Building YARD (yri) index for #{@spec.full_name}..." run_yardoc '-c', '-n' end - alias install_ri_yard_orig install_ri - alias install_ri install_ri_yard + begin + alias install_ri_yard_orig install_ri + alias install_ri install_ri_yard + rescue NameError; end + def install_rdoc_yard if @spec.has_rdoc? install_rdoc_yard_orig elsif @spec.has_yardoc? install_yardoc end end - alias install_rdoc_yard_orig install_rdoc - alias install_rdoc install_rdoc_yard + + begin + alias install_rdoc_yard_orig install_rdoc + alias install_rdoc install_rdoc_yard + rescue NameError; end end