Skip to content
Snippets Groups Projects
Commit 21c7e102 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Fix double-loading of Tag::Tag class in Ruby 1.8.

Ruby 1.8 doesn't understand that we have loaded this class already
and will re-load it and then give warnings.
parent fdb5b703
Branches
Tags
No related merge requests found
......@@ -24,7 +24,14 @@ module JsDuck
# Loads tag classes from given dir or single file.
def load(path)
if File.directory?(path)
Dir[path+"/**/*.rb"].each {|file| require(file) }
Dir[path+"/**/*.rb"].each do |file|
# Ruby 1.8 doesn't understand that "jsduck/tag/tag" and
# "./lib/jsduck/tag/tag.rb" refer to the same file. So
# explicitly avoid loading this file (as it's required on
# top already) to prevent warnings of constants getting
# defined multiple times.
require(file) unless file =~ /jsduck\/tag\/tag\.rb$/
end
else
require(path)
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment