cbor-diag 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222a5a85e9ce7a04e69d4620d0bbcd851500cea2b56ff6206b317f10c04bbeb8
-  data.tar.gz: 61b1b698cd6e8a0a34d532053e5f8784a1a4fe2c9c94713f75359a795926aea3
+  metadata.gz: 8dbeccb9b1a15bac6beb52ab1388adddac2c19cf5fce92d2184de8120326fb5e
+  data.tar.gz: ccd67a87d8e7c04518e0fc7852e4eac5076182cdbe58a97b7e2daea13acbfc53
 SHA512:
-  metadata.gz: b43b8603b856c370d9290fe89c8b6fdc3242c0fe4124704a46c3734c9123a3d4e4da9f21fb838dc55145eae216b0277b5ed57435bcabe56f2df751c0968f6633
-  data.tar.gz: 9ae5c2a6d02c854c5e0b4cd0de9f3210ce83d7cd61c86b3eaa1585a478cc54e9df0d0aa1998f28b835483ccfb296787942a40799af717faa8971b6e74de53cc9
+  metadata.gz: 1f1cadddbfc82820493a77b7c50eb1bbb365be5a61016ee155f5ab88895f667d4c789d03b6d8e78983b5a765d34c316053dfbe8b730716f3d2979061759624b4
+  data.tar.gz: e3eff5464c68065fb23c2158fba3209880878edb8ecb04bc225bd757b572343f23513856da112377517f2318c5d8c0f2872579e2faa197088eda952ac4e01e48

data/bin/cbor2diag.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -12,6 +13,8 @@ end
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,

data/bin/cbor2json.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -13,6 +14,8 @@ end
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts JSON.pretty_generate(o)

data/bin/cbor2yaml.rb

@@ -2,6 +2,7 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -12,7 +13,7 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -20,6 +21,8 @@ end
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 puts YAML.dump(o)

data/bin/cborleader2diag.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -15,6 +16,8 @@ o,r = CBOR.decode_with_rest(i)
 if r != ''
   warn "** ignoring rest of #{r.bytesize} bytes after first CBOR data item"
 end
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,

data/bin/cborseq2diag.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -13,6 +14,8 @@ ARGF.binmode
 i = ARGF.read
 while !i.empty?
   o, i = CBOR.decode_with_rest(i)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
   o = o.cbor_pre_canonicalize if /c/ === options
   o = o.cbor_prepare_deterministic if /d/ === options
   out = o.cbor_diagnostic(try_decode_embedded: /e/ === options,

data/bin/cborseq2json.rb

@@ -5,7 +5,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +14,8 @@ ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
   o = o.cbor_pre_canonicalize if /c/ === options
   o = o.cbor_prepare_deterministic if /d/ === options
   puts JSON.pretty_generate(o)

data/bin/cborseq2neatjson.rb

@@ -6,7 +6,7 @@ require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -15,6 +15,8 @@ ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
   o = o.cbor_pre_canonicalize if /c/ === options
   o = o.cbor_prepare_deterministic if /d/ === options
   puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/cborseq2yaml.rb

@@ -2,6 +2,7 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -12,7 +13,7 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -22,6 +23,8 @@ ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
   o = o.cbor_pre_canonicalize if /c/ === options
   o = o.cbor_prepare_deterministic if /d/ === options
   puts YAML.dump(o)

data/bin/diag2diag.rb

@@ -7,16 +7,19 @@ unless ''.respond_to? :b
 end
 require 'cbor-pretty'
 require 'cbor-diagnostic'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdetu]+)\z/ === ARGV[0]
+while /\A-([cdetpqu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 def diagnostic(o, options)
+  o = o.to_packed_cbor if /p/ === options
+  o = o.to_unpacked_cbor if /q/ === options
   o = o.cbor_pre_canonicalize if /c/ === options
   o = o.cbor_prepare_deterministic if /d/ === options
   puts o.cbor_diagnostic(try_decode_embedded: /e/ === options,

data/bin/json2cbor.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdv]+)\z/ === ARGV[0]
+while /\A-([cdpqv]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -13,6 +14,8 @@ end
 $stdout.binmode
 i = ARGF.read
 o = JSON.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 o = CBOR.encode(o)

data/bin/json2json.rb

@@ -1,17 +1,20 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 i = ARGF.read
 o = JSON.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts JSON.pretty_generate(o)

data/bin/json2neatjson.rb

@@ -2,11 +2,12 @@
 require 'json'
 require 'cbor-pure'
 require 'neatjson'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +15,8 @@ end
 $stdout.binmode
 i = ARGF.read
 o = JSON.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts JSON.neat_generate(o, after_comma: 1, after_colon: 1)

data/bin/json2yaml.rb

@@ -3,6 +3,7 @@ require 'psych.rb'              # WTF
 require 'yaml'
 require 'json'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
@@ -13,13 +14,15 @@ class Array
 end
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 i = ARGF.read
 o = JSON.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts YAML.dump(o)

data/bin/yaml2cbor.rb

@@ -2,11 +2,12 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cdv]+)\z/ === ARGV[0]
+while /\A-([cdpqv]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -14,6 +15,8 @@ end
 $stdout.binmode
 i = ARGF.read
 o = YAML.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 o = CBOR.encode(o)

data/bin/yaml2json.rb

@@ -3,17 +3,20 @@ require 'json'
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-packed'
 require 'cbor-deterministic'
 require 'cbor-canonical'
 
 options = ''
-while /\A-([cd]+)\z/ === ARGV[0]
+while /\A-([cdpq]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
 
 i = ARGF.read
 o = YAML.load(i)
+o = o.to_packed_cbor if /p/ === options
+o = o.to_unpacked_cbor if /q/ === options
 o = o.cbor_pre_canonicalize if /c/ === options
 o = o.cbor_prepare_deterministic if /d/ === options
 puts JSON.pretty_generate(o)

data/cbor-diag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cbor-diag"
-  s.version = "0.5.19"
+  s.version = "0.5.20"
   s.summary = "CBOR (Concise Binary Object Representation) diagnostic notation"
   s.description = %q{cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742}
   s.author = "Carsten Bormann"
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'neatjson'
   s.add_dependency 'cbor-deterministic'
   s.add_dependency 'cbor-canonical'
+  s.add_dependency 'cbor-packed'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cbor-packed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: cbor-diag implements diagnostic notation for CBOR, RFC 8949 and RFC 8742
 email: cabo@tzi.org
 executables:
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: CBOR (Concise Binary Object Representation) diagnostic notation