explain in shiba-0.1.2

- old
+ new

@@ -8,54 +8,13 @@
 require 'shiba/output'
 
 require 'optionparser'
 
 options = {}
-parser = OptionParser.new do |opts|
-  opts.banner = "Usage: explain -h HOST -d DB -u USER -p PASS [-f QUERY_FILE] [-s STATS_FILE] "
 
-  opts.on("-h","--host HOST", "sql host") do |h|
-    options["host"] = h
-  end
-
-  opts.on("-d","--database DATABASE", "sql database") do |d|
-    options["database"] = d
-  end
-
-  opts.on("-u","--user USER", "sql user") do |u|
-    options["username"] = u
-  end
-
-  opts.on("-p","--password PASSWORD", "sql password") do |p|
-    options["password"] = p
-  end
-
-  opts.on("-i","--index INDEX", "index of query to inspect") do |i|
-    options["index"] = i.to_i
-  end
-
-  opts.on("-l", "--limit NUM", "stop after processing NUM queries") do |l|
-    options["limit"] = l.to_i
-  end
-
-  opts.on("-s","--stats FILES", "location of index statistics tsv file") do |f|
-    options["stats_file"] = f
-  end
-
-  opts.on("-f", "--file FILE", "location of file containing queries") do |f|
-    options["file"] = f
-  end
-
-  opts.on("-o", "--output FILE", "write to file instead of stdout") do |f|
-    options["output"] = f
-  end
-
-  opts.on("--debug") do
-    options["debug"] = true
-  end
-end
-
+parser = Shiba::Configure.make_options_parser(options)
+parser.banner = "Run a list of queries through shiba's analyzer."
 parser.parse!
 
 ["database", "username"].each do |opt|
   if !options[opt]
     $stderr.puts "Required: #{opt}"
@@ -65,16 +24,16 @@
 end
 
 file = options.delete("file")
 file = File.open(file, "r") if file
 
-output = options.delete("output")
+output = options.delete("explain")
 output = File.open(output, 'w') if output
 
 Shiba.configure(options)
 
-schema_stats_fname = options["stats_file"]
+schema_stats_fname = options["stats"]
 
 if schema_stats_fname && !File.exist?(schema_stats_fname)
   $stderr.puts "No such file: #{schema_stats_fname}"
   exit 1
 end
@@ -100,6 +59,6 @@
 
 file = $stdin if file.nil?
 output = $stdout if output.nil?
 
 queries = Shiba::Analyzer.analyze(file, output, schema_stats, options)
-Shiba::Output.new(queries).make_web!
+Shiba::Output.new(queries, { 'output' => options['output'] }).make_web!