cbor-diag 0.5.7 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff7cbffe3a27ed58ea0b1c9478f4f2a30686a92c83acf0f02bd40788cd906e3
-  data.tar.gz: 222e4f6b162f6135858d200177709cdb86bb5483fb0251e38bfec8972d7ecc39
+  metadata.gz: 3528a462928a5e354625093ab38377abd4591b29b8d9c1b999ec8dc46c4b71ce
+  data.tar.gz: 727c825e585e16487d995a4d501726bbe383f26221a2747e6a1b0945fa8ef1dd
 SHA512:
-  metadata.gz: 1856ce392669ee1466e28d686fd592fd2e6ea5ebfcbce2d70bb5ed1f128771e21bb6a06144a6e81af486374189b854fc23d51d2d1b9598330dc0eda34b89ddb5
-  data.tar.gz: 6dc160dd22f6a858eb80ce4d77e5888e23a28b9b535bf4008be875721e6d7ee12983f0d3a8bbc69e9521e15a2dcd9ccee41e07169acc996be264f9d1a1bc6233
+  metadata.gz: 46c6dbc28aaf1c2dc8938206ff90b66ab9920b6822dbf47ddbcdb32d465d76c5233400d4401625df25e1c4b99d1afd335b30277c2aee253940abf471ac7c1eee
+  data.tar.gz: '029468920932c7d281d03c11030611c363a275db28386e4db273f57e729841cc822ef18bfd704a5f6f825ce7ff8a1e184095127f4721b828b35dea7f859d584e'

data/bin/cbor2diag.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
 
-
-if ARGV[0] == "-e"
-  embcbor = true
+options = ''
+while /\A-([etu]+)\z/ === ARGV[0]
+  options << $1
   ARGV.shift
 end
 
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
-puts o.cbor_diagnostic(try_decode_embedded: !!embcbor)
+puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,
+                       bytes_as_text: /t/ === options,
+                       utf8: /u/ === options)

data/bin/cborseq2diag.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require 'cbor-diagnostic'
+
+options = ''
+while /\A-([etu]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+ARGF.binmode
+i = ARGF.read
+while !i.empty?
+  o, i = CBOR.decode_with_rest(i)
+  out = o.cbor_diagnostic(try_decode_embedded: /e/ === options,
+                          bytes_as_text: /t/ === options,
+                          utf8: /u/ === options)
+  if i.empty?
+    puts out
+  else
+    print out << ', '
+  end
+end

data/bin/cborseq2pretty.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+ARGF.binmode
+i = ARGF.read
+while !i.empty?
+  o, ni = CBOR.decode_with_rest(i)
+  puts CBOR::pretty(i[0...i.size-ni.size])
+  i = ni
+end

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.7"
+  s.version = "0.5.12"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 7049}
   s.author = "Carsten Bormann"

data/lib/cbor-diag-parser.rb

@@ -2265,7 +2265,7 @@ module CBOR_DIAG
   module B64string2
     #"
                 def to_rb;
-                  t = s.text_value.chars.each_slice(4).map(&:join)
+                  t = s.text_value.gsub(/\s/, '').chars.each_slice(4).map(&:join)
                   if last = t[-1]
                     last << "=" * (4 - last.size)
                   end
@@ -2297,11 +2297,11 @@ module CBOR_DIAG
       i2, s2 = index, []
       s3, i3 = [], index
       loop do
-        if has_terminal?(@regexps[gr = '\A[0-9a-zA-Z_\\-+/]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[0-9a-zA-Z_\\-+/\\s]'] ||= Regexp.new(gr), :regexp, index)
           r4 = true
           @index += 1
         else
-          terminal_parse_failure('[0-9a-zA-Z_\\-+/]')
+          terminal_parse_failure('[0-9a-zA-Z_\\-+/\\s]')
           r4 = nil
         end
         if r4
@@ -2315,11 +2315,11 @@ module CBOR_DIAG
       if r3
         s5, i5 = [], index
         loop do
-          if has_terminal?(@regexps[gr = '\A[=]'] ||= Regexp.new(gr), :regexp, index)
+          if has_terminal?(@regexps[gr = '\A[=\\s]'] ||= Regexp.new(gr), :regexp, index)
             r6 = true
             @index += 1
           else
-            terminal_parse_failure('[=]')
+            terminal_parse_failure('[=\\s]')
             r6 = nil
           end
           if r6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.12
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,8 +74,10 @@ executables:
 - cbor2pretty.rb
 - cbor2yaml.rb
 - cborleader2diag.rb
+- cborseq2diag.rb
 - cborseq2json.rb
 - cborseq2neatjson.rb
+- cborseq2pretty.rb
 - cborseq2yaml.rb
 - diag2cbor.rb
 - diag2pretty.rb
@@ -92,8 +94,10 @@ files:
 - bin/cbor2pretty.rb
 - bin/cbor2yaml.rb
 - bin/cborleader2diag.rb
+- bin/cborseq2diag.rb
 - bin/cborseq2json.rb
 - bin/cborseq2neatjson.rb
+- bin/cborseq2pretty.rb
 - bin/cborseq2yaml.rb
 - bin/diag2cbor.rb
 - bin/diag2pretty.rb
@@ -127,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation