jcrvalidator 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b7b9f30fbdce18d3eb52e3fbea46a1a8a1350e
-  data.tar.gz: 80f3a34f4134303c2bc2c2e153330e316b4c0bef
+  metadata.gz: 9a8868c03c216591e509ab1aee8c4f3d33e7acae
+  data.tar.gz: 262f39627844782d4f6703c2767994272b88b89a
 SHA512:
-  metadata.gz: 660737cced532d5aefa2de290c374eb3a69184d7628215ebfed9feac7d99f92ee7307fb470af295982641bb4dfb688497bfe15f45dc4bb6b53d134f5ad31488c
-  data.tar.gz: 6fd4e1d6b0cde8f89794d7529d5f19af9a13d6c51a8c1ab31c8350d1bd8dc58122c8e888304e496374899c4df20bcf92eca0ffd7a558a2637de059ce23250e00
+  metadata.gz: f4cd4e37bcfc7428a4ae1908ecd7a9532380b36a293c29a738f73adbdc1332c8305be556c89ef223f4471b9a8536a6a97947b8129ce3f8acede8a47ac542dbf8
+  data.tar.gz: 3c9e90cef2dd39e472477f55d32730b5252215fba202abb0889cb1e99a243168be6c774cb1b62b474ed894b2abed9c6dbee8e0165d491c86dc493c29d463e1d4

data/bin/jcr

@@ -22,5 +22,5 @@ rescue LoadError
   require 'jcr'
 end
 
-JCR.main
+exit JCR.main
 

data/lib/jcr/jcr.rb

@@ -132,11 +132,11 @@ module JCR
     options = {}
 
     opt_parser = OptionParser.new do |opt|
-      opt.banner = "Usage: jcr [OPTIONS] [JSON_FILE]"
+      opt.banner = "Usage: jcr [OPTIONS] [JSON_FILES]"
       opt.separator  ""
       opt.separator  "Evaluates JSON against JSON Content Rules (JCR)."
       opt.separator  ""
-      opt.separator  "If JSON_FILE is not specified, standard input (STDIN) is used."
+      opt.separator  "If JSON_FILES is not specified, standard input (STDIN) is used."
       opt.separator  ""
       opt.separator  "Use -v to see results, otherwise check the exit code."
       opt.separator  ""
@@ -207,18 +207,40 @@ module JCR
           ctx.override!( ov )
         end
       end
-      data = JSON.parse( ARGF.read )
-      e = ctx.evaluate( data, options[:root_name] )
-      if e.success
-        if options[:verbose]
-          puts "Success!"
+
+      if $stdin.tty?
+        ec = 2
+        ARGV.each do |fn|
+          data = JSON.parse( File.open( fn ).read )
+          e = ctx.evaluate( data, options[:root_name] )
+          if e.success
+            if options[:verbose]
+              puts "Success!"
+            end
+            ec = 0
+          else
+            if options[:verbose]
+              puts "Failure: #{e.reason}"
+            end
+            ec = 1
+          end
         end
-        return 0
+        return ec
       else
-        if options[:verbose]
-          puts "Failure: #{e.reason}"
+        data = JSON.parse( ARGF.read )
+        e = ctx.evaluate( data, options[:root_name] )
+        if e.success
+          if options[:verbose]
+            puts "Success!"
+          end
+          return 0
+        else
+          if options[:verbose]
+            puts "Failure: #{e.reason}"
+          end
+          return 1
         end
-        return 1
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcrvalidator
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Andrew Newton