Pass OptionParser to CLI.exe as option to allow for use in usage. This is necessary as command-specific options are added in the exe, so that option parser must be used when issuing help messages in order to see help on those options.

Author: gkellogg

bin/rdf

@@ -26,4 +26,5 @@ end
 
 abort options.banner if ARGV.empty? && !options.options[:evaluate]
 
-RDF::CLI.exec(ARGV, options.options)
+# Add option_parser to parsed options to enable help
+RDF::CLI.exec(ARGV, options.options.merge(option_parser: options))

lib/rdf/cli.rb

@@ -345,16 +345,16 @@ def self.exec(args, options = {})
       cmds, args = args.partition {|e| commands.include?(e.to_s)}
 
       if cmds.empty?
-        usage(options)
+        usage(options.fetch(:option_parser, self.options))
         abort "No command given"
       end
 
       if cmds.first == 'help'
         on_cmd = cmds[1]
         if on_cmd && COMMANDS.fetch(on_cmd.to_sym, {})[:help]
-          usage(self.options, banner: "Usage: #{self.basename.split('/').last} #{COMMANDS[on_cmd.to_sym][:help]}")
+          usage(options.fetch(:option_parser, self.options), banner: "Usage: #{self.basename.split('/').last} #{COMMANDS[on_cmd.to_sym][:help]}")
         else
-          usage(self.options)
+          usage(options.fetch(:option_parser, self.options))
         end
         return
       end