Merge pull request #340 from luizluca/master

Allow rdoc to run without gem
ruby · Dec 20, 2015 · e682367 · e682367
2 parents 292df1a + a608b2d
commit e682367
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
@@ -109,6 +109,8 @@ class Error < RuntimeError; end
   def self.load_yaml
     begin
       gem 'psych'
+    rescue NameError => e # --disable-gems
+      raise unless e.name == :gem
     rescue Gem::LoadError
     end
 

diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
@@ -10,6 +10,8 @@
 
 begin
   gem 'json'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
 rescue Gem::LoadError
 end