masticate 0.1.4 → 0.1.5

data/bin/masticate

@@ -9,52 +9,56 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: example.rb [options]"
 
-  opts.on("--format FORMAT", "Specify format") do |v|
+  opts.on("--format FORMAT", String, "Specify format") do |v|
     options[:format] = v
   end
 
-  opts.on("--delim DELIMITER", "Specify field delimiter (character or TAB; default is ',')") do |v|
+  opts.on("--delim DELIMITER", String, "Specify field delimiter (character or TAB; default is ',')") do |v|
     options[:col_sep] = v
     options[:col_sep] = "\t" if options[:col_sep] == "TAB"
   end
 
-  opts.on("--quote QUOTE-CHAR", "Specify character used for quoting fields (optional; default is no quoting)") do |char|
+  opts.on("--quote QUOTE-CHAR", String, "Specify character used for quoting fields (optional; default is no quoting)") do |char|
     options[:quote_char] = char
   end
 
+  opts.on("--stats", "(for *sniff*) collect & display input stats") do
+    options[:stats] = true
+  end
+
   opts.on("--fields LIST", Array, "Specify fields to select") do |list|
     options[:fields] = list
   end
 
-  opts.on("--field FIELD", "Specify field to convert") do |f|
+  opts.on("--field FIELD", String, "Specify field to convert") do |f|
     options[:field] = f
   end
 
-  opts.on("--snip DIRECTIVE", "Specify header fields to snip: first N, or by name") do |f|
+  opts.on("--snip DIRECTIVE", String, "Specify header fields to snip: first N, or by name") do |f|
     options[:snip] = f.to_i
   end
 
-  opts.on("--from REGEXP", "Regular expression for gsub conversion") do |s|
+  opts.on("--from REGEXP", String, "Regular expression for gsub conversion") do |s|
     options[:from] = s
   end
 
-  opts.on("--to STRING", "Result string for gsub conversion") do |s|
+  opts.on("--to STRING", String, "Result string for gsub conversion") do |s|
     options[:to] = s
   end
 
-  opts.on("--inlined", "(for *mend* only) Source file has headers inlined on each line") do |v|
-    options[:inlined] = v
+  opts.on("--inlined", "(for *mend* only) Source file has headers inlined on each line") do |b|
+    options[:inlined] = true
   end
 
-  opts.on("--dejunk", "(for *mend* only) Expunge junk lines from source") do |v|
-    options[:dejunk] = v
+  opts.on("--dejunk", "(for *mend* only) Expunge junk lines from source") do |b|
+    options[:dejunk] = true
   end
 
-  opts.on("--by FIELD", "(for *maxrows* only) Field to group by") do |f|
+  opts.on("--by FIELD", String, "(for *maxrows* only) Field to group by") do |f|
     options[:by] = f
   end
 
-  opts.on("--max FIELD", "(for *maxrows* only) Field to find max value for") do |f|
+  opts.on("--max FIELD", String, "(for *maxrows* only) Field to find max value for") do |f|
     options[:max] = f
   end
 end.parse!
@@ -74,7 +78,7 @@ end
 
 case command
 when 'sniff'
-  results = Masticate.sniff(filename)
+  results = Masticate.sniff(filename, options)
   col_sep = results[:col_sep]
   col_sep = "TAB" if col_sep == "\t"
   quote_char = results[:quote_char] || "NONE"

data/lib/masticate/max_rows.rb

@@ -3,10 +3,7 @@ require "csv"
 
 class Masticate::MaxRows < Masticate::Base
   def maxrows(opts)
-    @output = opts[:output] ? File.open(opts[:output], "w") : $stdout
-    csv_options = {}
-    csv_options[:col_sep] = opts[:col_sep] if opts[:col_sep]
-    csv_options[:quote_char] = opts[:quote_char] || "\0"
+    standard_options(opts)
 
     groupby = opts[:by] or raise "missing field to group by"
     maxon = opts[:max] or raise "missing field to max on"
@@ -44,7 +41,7 @@ class Masticate::MaxRows < Masticate::Base
     @output.close if opts[:output]
 
     {
-      :input_count => input_count,
+      :input_count => @input_count,
       :output_count => @output_count
     }
   end

data/lib/masticate/version.rb

@@ -1,3 +1,3 @@
 module Masticate
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: masticate
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152726520 !ruby/object:Gem::Requirement
+  requirement: &2156618420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *2152726520
+  version_requirements: *2156618420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152749240 !ruby/object:Gem::Requirement
+  requirement: &2156617660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152749240
+  version_requirements: *2156617660
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2152748720 !ruby/object:Gem::Requirement
+  requirement: &2156616980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *2152748720
+  version_requirements: *2156616980
 description: Data file crunching
 email:
 - jmay@pobox.com