Some CLI fixes.

Author: gkellogg

lib/rdf/cli.rb

@@ -506,11 +506,10 @@ def self.exec(args, output: $stdout, option_parser: nil, messages: {}, **options
       options[:output_format] = options[:output_format].to_sym if options[:output_format]
 
       # Allow repository to be set via option.
-      @repository = options.fetch(:repository) {
-        options[:ordered] ?
+      @repository = options[:repository] ||
+        (options[:ordered] ?
           [].extend(RDF::Enumerable, RDF::Queryable) :
-          RDF::Repository.new
-      }
+          RDF::Repository.new)
 
       # Parse input files if any command requires it
       if cmds.any? {|c| COMMANDS[c.to_sym][:parse]}
@@ -528,8 +527,7 @@ def self.exec(args, output: $stdout, option_parser: nil, messages: {}, **options
         COMMANDS[command.to_sym][:lambda].call(args,
           output: output,
           messages: messages,
-          repository: repository,
-          **options)
+          **options.merge(repository: repository))
       end
 
       # Normalize messages

spec/cli_spec.rb

@@ -123,12 +123,37 @@
   end
 
   describe ".add_command" do
-    it "adds a command" do
+    after {RDF::CLI::COMMANDS.delete(:foo)}
+
+    it "adds a command with block" do
       RDF::CLI.add_command(:foo) do |argv, opts|
         $stdout.puts "Hello, World!"
       end
       expect {RDF::CLI.exec(["foo"])}.to write("Hello, World!").to(:output)
     end
+
+    it "adds a command with lambda option" do
+      lambda = ->(argv, opts) do
+        $stdout.puts "Hello, World!"
+      end
+      RDF::CLI.add_command(:foo, lambda: lambda)
+      expect {RDF::CLI.exec(["foo"])}.to write("Hello, World!").to(:output)
+    end
+
+    it "calls command with repository" do
+      RDF::CLI.add_command(:foo) do |argv, opts|
+        expect(opts).to include(repository: kind_of(RDF::Enumerable))
+      end
+      RDF::CLI.exec(["foo"])
+    end
+
+    it "calls command with specified repository" do
+      repo = double(:repo)
+      RDF::CLI.add_command(:foo, repository: repo) do |argv, opts|
+        expect(opts).to include(repository: repo)
+      end
+      RDF::CLI.exec(["foo"])
+    end
   end
 
   context "commands" do
@@ -215,12 +240,16 @@
     end
 
     it "complains if filtered command is attempted" do
-      RDF::CLI.add_command(:foo, filter: {output_format: :nquads})
+      RDF::CLI.add_command(:filtered, filter: {output_format: :nquads})
       expect do
         expect do
-          RDF::CLI.exec(["foo"], output_format: :ntriples)
+          RDF::CLI.exec(["filtered"], output_format: :ntriples)
         end.to raise_error(ArgumentError)
-      end.to write(%(Command "foo" requires output_format: nquads, not ntriples)).to(:output)
+      end.to write(%(Command "filtered" requires output_format: nquads, not ntriples)).to(:output)
+    end
+
+    it "uses repository specified in command" do
+      RDF::CLI.add_command(:with_repo, repository: double(:repo))
     end
 
     context "chaining" do