edn-abnf 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d01eaa954b101a5d9b1a38cba3f8c26e5e6c6dbc8c18229c8d09fc8d03eb70
-  data.tar.gz: 6edb1eacbac4466bfcc4825880eae1c96c93a5af3d4a14cb5104a2c8d203ef98
+  metadata.gz: e0cfa7f5a3324396126a17a2530147bff309fec468d512ede0ca8c436591f44c
+  data.tar.gz: 6850c6fa052ba8b687ac8a0332ed05f27a32781e5132c76754dfd24ad2928e55
 SHA512:
-  metadata.gz: 154a66988a780298dace8e6604b2a7bac226944384c869981fcf181e41c873ae19ca31193349c1cc094aec49b84075da6c622cc0691d974823860329dce0a15c
-  data.tar.gz: 48a564790134c0d21ffc19beefff2456892e3472356c021f2e5181adc333e96ea63882046c56572dd7935a17e6f129e47b86161dc796f121697b53da5525eb0f
+  metadata.gz: dd717eab5c11238c954e70ecf9575524aa1826fccbe7d885c9ac9e5946783314181443ddd17c6af22e5b18a841f472252871e14a3d480e701cdba8c996142658
+  data.tar.gz: ae2f0a9e57e9d4cb64cf3ea2f00f7f5d3e8e47141c2ec1e05276f6c4c3d859661d76003617c9b22c7773cbf067603bdf883c788ad670335e97c4757a25ff1b15

data/bin/edn-abnf

@@ -41,7 +41,7 @@ require 'ostruct'
 
 $error = 0
 
-output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"decoder-test"]
+output_formats = [:basic, :neat, :json, :yaml, :edn, :diag, :pretty, :hex, :cbor, :"test-vector"]
 
 $options = OpenStruct.new
 begin
@@ -65,6 +65,9 @@ begin
     opts.on("-eEDN", "--e=EDN", "supply EDN on command line") do |v|
       $options.edn = v
     end
+    opts.on("-c", "--[no-]cbor", "input is encoded CBOR data item, not EDN") do |v|
+      $options.cbor = v
+    end
     opts.on("-tFMT", "--to=FMT",
             output_formats,
             "Target format (#{output_formats.join("/")}, default: diag)") do |v|
@@ -90,12 +93,8 @@ rescue Exception => e
   exit 1
 end
 
-
 if !$options.edn
-  if ARGV == []
-    warn op
-    exit 1
-  end
+  ARGF.binmode if $options.cbor
   $options.edn = ARGF.read
 else
   if ARGV != []
@@ -106,6 +105,10 @@ end
 edn_file = $options.edn
 
 if $options.lines
+  if $options.cbor
+    warn "*** -l and -c don't combine"
+    exit 1
+  end
   CSV.parse(edn_file) do |ok, ednin, out|
     if ok[0] == "#"
       puts "# #{ok}, #{ednin.inspect}, #{out}" if $options.verbose
@@ -165,11 +168,18 @@ if $options.lines
 end
 
 begin
-  edn = EDN.from_edn(edn_file)
-  result = edn.tree               # XXX .tree?
+  if $options.cbor
+    result = CBOR.decode(edn_file)
+  else
+    edn = EDN.from_edn(edn_file)
+    result = edn.tree               # XXX .tree?
+  end
 rescue CBOR_DIAG::AppParseError, ArgumentError => e
   puts "** #{e}"
   exit 1
+rescue CBOR::OutOfBytesError, RuntimeError, JSON::GeneratorError => e
+  puts "** (encoded CBOR input:) #{e}"
+  exit 1
 end
 
 case $options.target
@@ -200,7 +210,7 @@ when :pretty, :hex, :cbor
   else
     fail "Cannot happen"
   end
-when :"decoder-test"
+when :"test-vector"
   fail "Not a map" unless Hash === result
   tests = result.delete("tests")
   fail "tests not an array" unless Array === tests

data/edn-abnf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "edn-abnf"
-  s.version = "0.5.14"
+  s.version = "0.5.15"
   s.summary = "CBOR Extended Diagnostic Notation (EDN) implemented in ABNF"
   s.description = %q{edn-abnf implements converters and miscellaneous tools for CBOR EDN's ABNF}
   s.author = "Carsten Bormann"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edn-abnf
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Carsten Bormann