jgrep 1.3.0.1 → 1.3.1

data/bin/jgrep

@@ -3,21 +3,68 @@
 require 'jgrep'
 require 'optparse'
 
-options = {:flat => false, :start => nil}
+@options = {:flat => false, :start => nil}
+
+def print_json(result)
+    unless @options[:flat]
+        result = result.first if @options[:stream]
+        puts(JSON.pretty_generate(result))
+    else
+        puts(result.first.to_json)
+    end
+end
+
+def do_grep(json, expression)
+    unless @options[:field]
+        result = JGrep::jgrep((json), expression, nil, @options[:start])
+        unless result == [] or @options[:quiet] == true
+            print_json(result)
+        end
+    else
+        if @options[:field].is_a? Array
+            JGrep::validate_filters(@options[:field])
+            result = JGrep::jgrep((json), expression, @options[:field], @options[:start])
+            unless result == [] or @options[:quiet] == true
+                print_json(result)
+            end
+
+        else
+            JGrep::validate_filters(@options[:field])
+            result = JGrep::jgrep((json), expression, @options[:field], @options[:start])
+            unless result.first.is_a?(Hash) || result.flatten.first.is_a?(Hash)
+                unless @options[:quiet] == true
+                    result.map{|x| puts x unless x.nil?}
+                end
+            else
+                unless @options[:quiet] == true
+                    print_json(result)
+                end
+            end
+        end
+    end
+end
 
 begin
     OptionParser.new do |opts|
         opts.banner = "Usage: jgrep [options] \"expression\""
         opts.on("-s", "--simple [FIELDS]", "Display only one or more fields from each of the resulting json documents") do |field|
-            if (field.split(" ")).size > 1
-                options[:field] = field.split(" ")
+            unless field.nil?
+                if (field.split(" ")).size > 1
+                    @options[:field] = field.split(" ")
+                else
+                    @options[:field] = field
+                end
             else
-                options[:field] = field
+                raise "-s flag requires a field value"
             end
         end
 
         opts.on("-c", "--compact", "Display non pretty json") do
-            options[:flat] = true
+            @options[:flat] = true
+        end
+
+        opts.on("-n", "--stream", "Display continuous output from continuous input") do
+            @options[:stream] = true
         end
 
         opts.on("-f", "--flatten", "Makes output as flat as possible") do
@@ -25,11 +72,11 @@ begin
         end
 
         opts.on("-i", "--input [FILENAME]", "Specify input file to parse") do |filename|
-            options[:file] = filename
+            @options[:file] = filename
         end
 
         opts.on("-q", "--quiet", "Quiet; don't write to stdout.  Exit with zero status if match found.") do
-            options[:quiet] = true
+            @options[:quiet] = true
         end
 
         opts.on("-v", "--verbose", "Verbose output") do
@@ -37,12 +84,16 @@ begin
         end
 
         opts.on("--start [FIELD]", "Where in the data to start from") do |field|
-            options[:start] = field
+            @options[:start] = field
         end
     end.parse!
 rescue OptionParser::InvalidOption => e
     puts e.to_s.capitalize
     exit 1
+
+rescue Exception => e
+    puts e
+    exit 1
 end
 
 begin
@@ -58,52 +109,35 @@ begin
 
     expression = "" if expression.nil?
 
+    #Continuously gets if inputstream in constant
     #Load json from standard input if tty is false
     #else find and load file from command line arugments
-    unless STDIN.tty?
-        json = STDIN.read
-    else
-        if options[:file]
-            json = File.read(options[:file])
+
+    if @options[:stream]
+        unless STDIN.tty?
+            while json = gets
+                do_grep(json, expression)
+            end
         else
             raise "No json input specified"
         end
-    end
-
-    unless options[:field]
-        result = JGrep::jgrep((json), expression, nil, options[:start])
-        unless result == [] or options[:quiet] == true
-            (options[:flat] == false) ? puts(JSON.pretty_generate(result)) : puts(result.to_json)
-        end
-        if result.length == 0
-            exit 1
-        end
     else
-        if options[:field].is_a? Array
-            JGrep::validate_filters(options[:field])
-            result = JGrep::jgrep((json), expression, options[:field], options[:start])
-            unless result == [] or options[:quiet] == true
-                puts(JSON.pretty_generate(result))
-            end
-
+        unless STDIN.tty?
+            json = STDIN.read
+            do_grep(json, expression)
         else
-            JGrep::validate_filters(options[:field])
-            result = JGrep::jgrep((json), expression, options[:field], options[:start])
-            unless result.first.is_a?(Hash) || result.flatten.first.is_a?(Hash)
-                unless options[:quiet] == true
-                    result.map{|x| puts x unless x.nil?}
-                end
+            if @options[:file]
+                json = File.read(@options[:file])
+                do_grep(json, expression)
             else
-                unless options[:quiet] == true
-                    puts(JSON.pretty_generate(result))
-                end
-            end
-            unless result.length > 0
-                exit 1
+                raise "No json input specified"
             end
         end
     end
 
+rescue Interrupt
+    STDERR.puts "Exiting..."
+    exit 1
 rescue Exception => e
     if e.is_a?(SystemExit)
         exit e.status

data/jgrep.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
     s.name = "jgrep"
-    s.version = "1.3.0.1"
+    s.version = "1.3.1"
 
     s.authors = ["P Loubser"]
-    s.date = %q{2011-08-05}
+    s.date = %q{2011-12-15}
     s.default_executable = "jgrep"
     s.add_dependency('json')
     s.description = "Compare a list of json documents to a simple logical language and returns matches as output"

data/lib/jgrep.rb

@@ -4,12 +4,28 @@ require 'parser/parser.rb'
 require 'parser/scanner.rb'
 require 'rubygems'
 require 'json'
-#require 'yajl/json_gem'
 
 module JGrep
     @verbose = false
     @flatten = false
 
+    class JGrep
+        attr_accessor :value, :expression
+
+        def initialize()
+            @value = ""
+            @expression = ""
+        end
+
+        def match_expression(expression)
+            return !::JGrep.jgrep(@value, expression).empty?
+        end
+
+        def match_value(value)
+            return !::JGrep.jgrep(value, @expression).empty?
+        end
+    end
+
     def self.verbose_on
         @verbose = true
     end
@@ -26,7 +42,11 @@ module JGrep
         errors = ""
         begin
             JSON.create_id = nil
-            json = JSON.parse(json)
+
+            if json.class == String
+                json = JSON.parse(json)
+            end
+
             if json.is_a? Hash
                 json = [json]
             end
@@ -48,7 +68,7 @@ module JGrep
                             pp document
                             STDERR.puts "Error - #{e} \n\n"
                         else
-                            errors = "One or more the json documents could not be parsed. Run jgrep -v for to display documents"
+                            errors = "One or more the json documents could not be parsed. Run jgrep -v to display documents"
                         end
                     end
                 end
@@ -72,6 +92,7 @@ module JGrep
         end
     end
 
+
     #Convert a specific hash inside a JSON document to an array
     #Mark is a string in the format foo.bar.baz that points to
     #the array in the document.

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 0
   - 1
-  version: 1.3.0.1
+  version: 1.3.1
 platform: ruby
 authors: 
 - P Loubser
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 +01:00
+date: 2011-12-15 00:00:00 +00:00
 default_executable: jgrep
 dependencies: 
 - !ruby/object:Gem::Dependency