From 521edea5be3d3780f7adfe00cefd77aaf8081120 Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Fri, 14 Oct 2011 18:58:00 +0300 Subject: [PATCH] Allow loading multiple meta-tags files. --meta-tags option can now accept either a path to file or directory. And one can use the option multiple times to name several files one-by-one. --- lib/jsduck/options.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/jsduck/options.rb b/lib/jsduck/options.rb index 9d2b34fc..98e96f82 100644 --- a/lib/jsduck/options.rb +++ b/lib/jsduck/options.rb @@ -72,6 +72,7 @@ module JsDuck "Mixed", ] @meta_tags = [] + @meta_tag_paths = [] @warnings = true @verbose = false @@ -129,8 +130,12 @@ module JsDuck end # Load user-defined meta-tags - if @meta_tags_path - require @meta_tags_path + @meta_tag_paths.each do |path| + if File.directory?(path) + Dir[path+"/**/*.rb"].each {|file| require(file) } + else + require(path) + end end # Instanciate these meta tags. When builtin implementation for # @tag already exists, replace it with user-defined one. @@ -170,9 +175,9 @@ module JsDuck end opts.on('--meta-tags=PATH', - "Path to Ruby file with custom meta-tag implementations.", - "Experimantal!", " ") do |path| - @meta_tags_path = path + "Path to Ruby file or directory with custom", + "meta-tag implementations. Experimantal!", " ") do |path| + @meta_tag_paths << path end opts.on('--no-warnings', "Turns off warnings.", " ") do -- GitLab