Allow CLI commands to define arguments, and use in rdf binary.

Author: gkellogg

bin/rdf

@@ -11,6 +11,17 @@ options = RDF::CLI.options do
   self.on('-V', '--version', 'Display the RDF.rb version and exit.') do
     puts RDF::VERSION; exit
   end
+
+  ARGV.select {|a| RDF::CLI.commands.include?(a)}.each do |cmd|
+    # Load command-specific options
+    Array(RDF::CLI::COMMANDS[cmd.to_sym][:options]).each do |cli_opt|
+      on_args = cli_opt.on || []
+      on_args << cli_opt.description if cli_opt.description
+      self.on(*on_args) do |arg|
+        self.options[cli_opt.symbol] = cli_opt.call(arg)
+      end
+    end
+  end
 end
 
 abort options.banner if ARGV.empty? && !options.options[:evaluate]

lib/rdf/cli.rb

@@ -409,6 +409,7 @@ def self.commands
     # @option options [String] description
     # @option options [String] help string to display for help
     # @option options [Boolean] parse parse input files in to Repository, or not.
+    # @option options [Array<RDF::CLI::Option>] options specific to this command
     # @yield argv, opts
     # @yieldparam [Array<String>] argv
     # @yieldparam [Hash] opts
@@ -422,7 +423,7 @@ def self.add_command(command, options = {}, &block)
     # @return [Array<String>] list of available formats
     def self.formats(reader: false, writer: false)
       f = RDF::Format.sort_by(&:to_sym).each.
-        select {|f| (reader ? f.reader : (writer ? f.writer : true))}.
+        select {|f| (reader ? f.reader : (writer ? f.writer : (f.reader || f.writer)))}.
         inject({}) do |memo, reader|
           memo.merge(reader.to_sym => reader.name)
       end