Update patch CLI to allow patch_file to come from StringIO. Add other elements to enable HTML UI.

Author: gkellogg

lib/ld/patch/format.rb

@@ -20,28 +20,33 @@ class Format < RDF::Format
     def self.cli_commands
       {
         patch: {
-          description: "Patch the current graph using a URI Encoded patch file, or a referenced path file/URI",
+          description: "Patch the current graph using a patch file",
           help: "patch [--patch 'patch'] [--patch-file file]",
           parse: true,
           lambda: -> (argv, opts) do
-            opts[:patch] ||= RDF::Util::File.open_file(opts[:patch_file]) {|f| f.read}
+            opts[:patch] ||= case opts[:patch_file]
+            when IO, StringIO then opts[:patch_file]
+            else RDF::Util::File.open_file(opts[:patch_file]) {|f| f.read}
+            end
             raise ArgumentError, "Patching requires a URI encoded patch or reference to patch resource" unless opts[:patch]
-            $stdout.puts "Patch"
+            opts[:logger].info "Patch"
             patch = LD::Patch.parse(opts[:patch], base_uri: opts.fetch(:patch_file, "http://rubygems.org/gems/ld-patch"))
             RDF::CLI.repository.query(patch)
           end,
           options: [
             RDF::CLI::Option.new(
               symbol: :patch,
               datatype: String,
+              control: :none,
               on: ["--patch STRING"],
               description: "Patch in URI encoded format"
             ) {|v| URI.decode(v)},
             RDF::CLI::Option.new(
               symbol: :patch_file,
               datatype: String,
+              control: :url2,
               on: ["--patch-file URI"],
-              description: "URI of patch file"
+              description: "Patch file"
             ) {|v| RDF::URI(v)},
           ]
         }

spec/format_spec.rb

@@ -26,7 +26,7 @@
     specify {expect(described_class.to_sym).to eq :ldpatch}
   end
 
-  describe ".cli_commands", skip: ("TextMate OptionParser issues" if ENV['TM_SELECTED_FILE']) do
+  describe ".cli_commands" do
     require 'rdf/cli'
     let(:nt) {File.expand_path("../test-files/1triple.nt", __FILE__)}
     let(:patch) {File.expand_path("../test-files/add-1triple.ldpatch", __FILE__)}
@@ -36,6 +36,9 @@
       it "patches from file" do
         expect {RDF::CLI.exec(["patch", "serialize", nt], patch_file: patch)}.to write.to(:output)
       end
+      it "patches from StringIO" do
+        expect {RDF::CLI.exec(["patch", "serialize", nt], patch_file: StringIO.new(File.read(patch)))}.to write.to(:output)
+      end
       it "patches from argument" do
         expect {RDF::CLI.exec(["patch", "serialize", nt], patch: patch_enc)}.to write.to(:output)
       end