jgrep 1.0.0 → 1.0.1

data/bin/jgrep

@@ -1,16 +1,58 @@
 #!/usr/bin/env ruby
 
 require 'jgrep'
+require 'optparse'
+
+options = {:flat => false}
+
+OptionParser.new do |opts|
+    opts.banner = "Usage: jgrep [options] \"expression\""
+    opts.on("-s", "--simple FIELD", "Display a single field from each of the resulting json documents") do |field|
+        options[:field] = field
+    end
+    opts.on("-f", "--flat", "Display non pretty json") do
+        options[:flat] = true
+    end
+
+end.parse!
+
 
 begin
-    raise "Please pass a valid arugment to jgrep" if ARGV == []
+    raise "Please pass a valid arugment to jgrep" if ARGV == [] || ARGV ==["-s"]
 rescue Exception => e
     STDERR.puts e
     exit 1
 end
 
-json = STDIN.read
+begin
+    json = STDIN.read
 
+    unless options[:field]
+        result = JGrep::jgrep((json), ARGV.last)
+        unless result == "[]"
+            (options[:flat] == false) ? puts(JSON.pretty_generate(result)) : puts(result.to_json)
+        end
+    else
+        if options[:field] =~ /=|<|>/
+            raise "'-s' flag requires a field to display"
+        end
 
-result = JGrep::jgrep((json), ARGV[0])
-puts result unless result == "[]"
+        result = JGrep::jgrep((json), ARGV.last)
+
+        result.each do |r|
+            options[:field].split(".").each do |node|
+                unless r.is_a? Array
+                    r = r[node]
+                else
+                    break
+                end
+            end
+            unless r.nil?
+                (!r.is_a?(Array) || !r.is_a?(Hash)) ? puts(r) : puts(JSON.pretty_generate(r))
+            end
+        end
+    end
+rescue Exception => e
+    STDERR.puts "Error - #{e}"
+    exit 1
+end

data/jgrep.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.0.0"
+    s.version = "1.0.1"
 
     s.authors = ["P Loubser"]
     s.date = %q{2011-07-19}

data/lib/jgrep.rb

@@ -18,7 +18,7 @@ module JGrep
                     result << document
                 end
             end
-            return result.to_json
+            return result
 
         rescue NameError => e
             var = e.to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - P Loubser