cbor-diag 0.5.15 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631d4dd7cf5f08c4a1a33f2a021eb2627da7007d5ad16e10ac83182fd161fb49
-  data.tar.gz: 4ca7971612f93597169a0af602d9b919e5dd67b2291d0999aea328fba8150c20
+  metadata.gz: ce766a02a4e89480afebeacc8d954f187bed26e306e4100529cc7174a3a7493e
+  data.tar.gz: ade034f6ae05df4ddc29a100b523c6ed19127cfc7b83ee37e2f5482c6212fb49
 SHA512:
-  metadata.gz: b9d148ad270cddc39982052b895e18b1d1c3e0bc7b4b574e4267c7cfb07b76e013e20af1ba1c15ae7e6e9465860bd9cc485d6ad2c369a6a29ab6d3bed1924aa2
-  data.tar.gz: 4be65c57df7e7f2d64ef7e26672ba0835f4a9ff9b4e78387c0ba50ea3e0ec83e75e32ee21b97996af11529f76c4e3b9cd5038189906febf5f5f3cffde1089dad
+  metadata.gz: 61c8f2391568315618435c2470d442b7d0d1baf378f302dcbaf089179d4fc3a3af818ff95dba546264d86d44f1da8a4abc8e5450e121d557796eb07f16064571
+  data.tar.gz: b4f20f51b47a6b2771d2c1a42668dcdf6a25b49e8d7a020254e1ae5a60f2c896cdd972b80a416d3f3026ddbf89d29d03f67ea9cc97be7045a5e48d9c4b5a9b00

data/bin/cbor2diag.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 options = ''
-while /\A-([etu]+)\z/ === ARGV[0]
+while /\A-([cdetu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -10,6 +12,8 @@ end
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+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,
                        bytes_as_text: /t/ === options,
                        utf8: /u/ === options)

data/bin/cbor2json.rb

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

data/bin/cbor2u8.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'cbor-pure'
+require 'cbor-pretty'
+
+ARGF.binmode
+i = ARGF.read
+i.bytes.each_slice(8) do |s|
+  puts s.map {|b| "0x%02x," % b}.join(" ")
+end

data/bin/cbor2yaml.rb

@@ -2,6 +2,8 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 class Array
   def to_yaml_style()
@@ -9,7 +11,15 @@ class Array
   end
 end
 
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
 ARGF.binmode
 i = ARGF.read
 o = CBOR.decode(i)
+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,5 +1,13 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cdetu]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
@@ -7,4 +15,8 @@ o,r = CBOR.decode_with_rest(i)
 if r != ''
   warn "** ignoring rest of #{r.bytesize} bytes after first CBOR data item"
 end
-puts o.cbor_diagnostic
+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,
+                       bytes_as_text: /t/ === options,
+                       utf8: /u/ === options)

data/bin/cborseq2diag.rb

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'cbor-diagnostic'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 options = ''
-while /\A-([etu]+)\z/ === ARGV[0]
+while /\A-([cdetu]+)\z/ === ARGV[0]
   options << $1
   ARGV.shift
 end
@@ -11,6 +13,8 @@ ARGF.binmode
 i = ARGF.read
 while !i.empty?
   o, i = CBOR.decode_with_rest(i)
+  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,
                           bytes_as_text: /t/ === options,
                           utf8: /u/ === options)

data/bin/cborseq2json.rb

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

data/bin/cborseq2neatjson.rb

@@ -2,10 +2,20 @@
 require 'json'
 require 'cbor-pure'
 require 'neatjson'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
 
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  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)
 end

data/bin/cborseq2yaml.rb

@@ -2,6 +2,8 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
 class Array
   def to_yaml_style()
@@ -9,10 +11,19 @@ class Array
   end
 end
 
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+
 ARGF.binmode
 i = ARGF.read
 while i != ''
   o, i = CBOR.decode_with_rest(i)
+  o = o.cbor_pre_canonicalize if /c/ === options
+  o = o.cbor_prepare_deterministic if /d/ === options
   puts YAML.dump(o)
 end
 

data/bin/json2cbor.rb

@@ -1,14 +1,20 @@
 #!/usr/bin/env ruby
 require 'json'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
-if ARGV[0] == "-v"
-  verbose = true
+options = ''
+while /\A-([cdv]+)\z/ === ARGV[0]
+  options << $1
   ARGV.shift
 end
 
 $stdout.binmode
 i = ARGF.read
-o = CBOR.encode(JSON.load(i))
+o = JSON.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+o = CBOR.encode(o)
 print o
-warn "JSON size: #{i.size} bytes, CBOR size: #{o.size} bytes." if verbose
+warn "JSON size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/json2json.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = JSON.load(i)
+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

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'cbor-pure'
+require 'neatjson'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+$stdout.binmode
+i = ARGF.read
+o = JSON.load(i)
+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

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'json'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+class Array
+  def to_yaml_style()
+    all? {|x| Integer === x } && length < 20 ? :inline : super
+  end
+end
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = JSON.load(i)
+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,14 +2,20 @@
 require 'psych.rb'              # WTF
 require 'yaml'
 require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
 
-if ARGV[0] == "-v"
-  verbose = true
+options = ''
+while /\A-([cdv]+)\z/ === ARGV[0]
+  options << $1
   ARGV.shift
 end
 
 $stdout.binmode
 i = ARGF.read
-o = CBOR.encode(YAML.load(i))
+o = YAML.load(i)
+o = o.cbor_pre_canonicalize if /c/ === options
+o = o.cbor_prepare_deterministic if /d/ === options
+o = CBOR.encode(o)
 print o
-warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if verbose
+warn "YAML size: #{i.size} bytes, CBOR size: #{o.size} bytes." if /v/ === options

data/bin/yaml2json.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'psych.rb'              # WTF
+require 'yaml'
+require 'cbor-pure'
+require 'cbor-deterministic'
+require 'cbor-canonical'
+
+options = ''
+while /\A-([cd]+)\z/ === ARGV[0]
+  options << $1
+  ARGV.shift
+end
+
+i = ARGF.read
+o = YAML.load(i)
+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.15"
+  s.version = "0.5.17"
   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"
@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'treetop', '~>1'
   s.add_dependency 'json'
   s.add_dependency 'neatjson'
+  s.add_dependency 'cbor-deterministic'
+  s.add_dependency 'cbor-canonical'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbor-diag
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.17
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,12 +66,41 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cbor-deterministic
+  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'
+- !ruby/object:Gem::Dependency
+  name: cbor-canonical
+  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:
 - cbor2diag.rb
 - cbor2json.rb
 - cbor2pretty.rb
+- cbor2u8.rb
 - cbor2yaml.rb
 - cborleader2diag.rb
 - cborseq2diag.rb
@@ -82,16 +111,21 @@ executables:
 - diag2cbor.rb
 - diag2pretty.rb
 - json2cbor.rb
+- json2json.rb
+- json2neatjson.rb
 - json2pretty.rb
+- json2yaml.rb
 - pretty2cbor.rb
 - pretty2diag.rb
 - yaml2cbor.rb
+- yaml2json.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/cbor2diag.rb
 - bin/cbor2json.rb
 - bin/cbor2pretty.rb
+- bin/cbor2u8.rb
 - bin/cbor2yaml.rb
 - bin/cborleader2diag.rb
 - bin/cborseq2diag.rb
@@ -102,10 +136,14 @@ files:
 - bin/diag2cbor.rb
 - bin/diag2pretty.rb
 - bin/json2cbor.rb
+- bin/json2json.rb
+- bin/json2neatjson.rb
 - bin/json2pretty.rb
+- bin/json2yaml.rb
 - bin/pretty2cbor.rb
 - bin/pretty2diag.rb
 - bin/yaml2cbor.rb
+- bin/yaml2json.rb
 - cbor-diag.gemspec
 - lib/cbor-diag-parser.rb
 - lib/cbor-diagnostic.rb