Add logging to script/parse and script/tc

Author: gkellogg

script/parse

@@ -6,6 +6,7 @@ require 'rdf/rdfxml'
 require 'rdf/turtle'
 require 'rdf/ntriples'
 require 'getoptlong'
+require 'logger'
 require 'open-uri'
 
 def run(input, options)
@@ -45,16 +46,18 @@ rescue
   raise
 end
 
+logger = Logger.new(STDERR)
+logger.level = Logger::WARN
+logger.formatter = lambda {|severity, datetime, progname, msg| "#{severity}: #{msg}\n"}
 
 options = {
-  host_language: nil,
   input_format: :rdfxml,
   output: STDOUT,
   output_format: :ntriples,
   strict: true,
   validate: false,
   verbose: false,
-  version: nil,
+  logger: logger
 }
 input = nil
 
@@ -72,12 +75,14 @@ opts = GetoptLong.new(
 )
 opts.each do |opt, arg|
   case opt
-  when '--dbg'            then ::RDF::RDFXML::debug = true
+  when '--dbg'            then logger.level = Logger::DEBUG
   when '--execute'        then input = arg
   when '--format'         then options[:output_format] = arg.to_sym
   when '--input-format'   then options[:input_format] = arg.to_sym
   when '--output'         then options[:output] = File.open(arg, "w")
-  when '--quiet'          then options[:quiet] = true
+  when '--quiet'
+    options[:quiet] = true
+    logger.level = Logger::FATAL
   when '--template'       then options[:haml] = arg.to_sym
   when '--uri'            then options[:base_uri] = arg
   when '--validate'       then options[:validate] = true

script/tc

@@ -45,7 +45,7 @@ def run_tc(tc, options)
     puts "open #{tc.action}" if options[:verbose]
     options = {base_uri: tc.base}.merge(options)
 
-    reader = RDF::Reader.for(tc.action).new(tc.input, base_uri: tc.base, validate: tc.syntax?)
+    reader = RDF::Reader.for(tc.action).new(tc.input, base_uri: tc.base, validate: tc.syntax?, logger: options[:logger])
 
     graph = RDF::Repository.new
     result = nil
@@ -74,6 +74,9 @@ def run_tc(tc, options)
       result ||= "passed"
     end
 
+  rescue Interrupt
+    STDERR.puts "\nHalting"
+    exit(1)
   rescue Exception => e
     STDERR.puts "#{"exception:" unless options[:quiet]}: #{e}"
     if options[:quiet]
@@ -105,8 +108,13 @@ def run_tc(tc, options)
   puts "#{"test result:" unless options[:quiet]} #{result}"
 end
 
+logger = Logger.new(STDERR)
+logger.level = Logger::WARN
+logger.formatter = lambda {|severity, datetime, progname, msg| "#{severity}: #{msg}\n"}
+
 options = {
   output: STDOUT,
+  logger: logger
 }
 
 opts = GetoptLong.new(
@@ -133,10 +141,10 @@ end
 opts.each do |opt, arg|
   case opt
   when '--help'             then help(options)
-  when '--dbg'              then ::RDF::RDFXML::debug = true
+  when '--dbg'              then logger.level = Logger::DEBUG
   when '--earl'             then options[:quiet] = options[:earl] = true
   when '--output'           then options[:output] = File.open(arg, "w")
-  when '--quiet'            then options[:quiet] = true
+  when '--quiet'            then options[:quiet] = true; logger.level = Logger::FATAL
   when '--verbose'          then options[:verbose] = true
   end
 end