cbor-diag 0.5.8 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ce2154bebe9237e19250a539bbd30ef39834545bfd2a6e3300f21b1fab9d96
-  data.tar.gz: 5986f189ccf5d06fc90fda46890cbbc97768929355b039d823cb6046768c5cca
+  metadata.gz: 9b0da5131896552d6bd336a401413b35987ce36a8a007a4f495f6be129bb96b9
+  data.tar.gz: a3e51b152b59cadf5b5dda60c1bc2cfc7b8356cccced607ae5b7f5998945b60c
 SHA512:
-  metadata.gz: cdc1056ab81a9eb943ddcf1e63025634d51d61a3bd2f06bc98f10aa220b322fb5d0742e1511c8c144df9c0d1ce63be2d810e16395e15e2c48418c6bad9242950
-  data.tar.gz: 3e9e5ec91bce71170dae957881de0453b3d4841bfe3e5936f6600e8fc299190038cf6be591e3b3cfca186a93bd9170bf0ef15ae0bee4b425b213a9becec32910
+  metadata.gz: 9939f8edabf591e7e17bf0294589e6208e44f4656ed59c62cabc562e295fc765b2075391320ff51e0fd499c24f305ae372de450d6461f9b68e8d47d0be8575d6
+  data.tar.gz: 57c99ecad423f8c1a556a5e40e24aac0f5fb0fb6efcedb1d3c35ceac94a27a67aabe7215d31f6dc9e57e36633fe69cd81faa903402cb2b78f0030459bcea4d09

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,7 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+ARGF.binmode
+i = ARGF.read
+puts CBOR::pretty_seq(i)

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.8"
+  s.version = "0.5.13"
   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-pretty.rb

@@ -17,6 +17,15 @@ module CBOR
     Buffer.new(s).pretty_item_final(indent, max_target)
   end
 
+  def self.pretty_seq(s, indent = 0, max_target = 40)
+    b = Buffer.new(s)
+    res = ''                    # XXX: not all indented the same
+    while !b.empty?
+      res << b.pretty_item_final(indent, max_target, true)
+    end
+    res
+  end
+
   class Buffer
 
   def take_and_print(n, prefix = '')
@@ -72,11 +81,13 @@ module CBOR
     nil
   end
 
-  def pretty_item_final(indent = 0, max_target = 40)
+  def pretty_item_final(indent = 0, max_target = 40, seq = false)
     @out = ''
     @indent = indent
     pretty_item
-    raise if @pos != @buffer.size
+    unless seq
+      raise if @pos != @buffer.size
+    end
     target = [@out.each_line.map {|ln| ln =~ /#/ || 0}.max, max_target].min
     @out.each_line.map {|ln|
       col = ln =~ /#/

data/lib/cbor-pure.rb

@@ -314,6 +314,10 @@ module CBOR
     ret
   end
 
+  def empty?
+    @pos == buffer.size
+  end
+
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.13
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-02-24 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