cddl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de407896d680d320c446c027731247c60a315a97
-  data.tar.gz: eae775c3385f92d9fde90bca5c6daa758f4c1683
+  metadata.gz: d1070fa01f476cb900016c1b95c4c484aa8554e6
+  data.tar.gz: 424df46b269ae91a60fcb9cf4276b8f6f55f5f93
 SHA512:
-  metadata.gz: 45ca44b99561f01a106f615827392d83c509f43fba5cb2384c80aae133e15c611ffa487bd6109db0b18fd90bc0c6a14c233f6e81c3a266fed136234cb7424783
-  data.tar.gz: 8477bb82d3ec84c50d901c90f5af53f7f5431904fcdfe048f7d7f864835948cc9778ef87b0813815dbaff2d5b49d3f1979d2424b389915b49dccb3d36fd099e3
+  metadata.gz: 621214556cefefda17498ef05c345755d72cd0bc3264b5c2540c5c2285abf86ea74a6ef99df78fedcc9fe30408f97b4be00506e648dfc02795512ea87086ca30
+  data.tar.gz: f31756c68e80f4ccf514aa85dbc3dca77cdb73b4605c3db6edd2cab3e094e091ea8c3cc1bb62088f31aa156dbed68e27231fac495c1334dabfecaeebe2d5c8b0

data/bin/cddl

@@ -19,6 +19,7 @@ def read_arg(arg)
   if arg == "-"
     STDIN.read
   else
+    usage unless arg
     File.read(arg)
   end
 end
@@ -27,27 +28,33 @@ def parser
   @parser ||= CDDL::Parser.new(read_arg(ARGV[0]))
 end
 
-case ARGV[1]
-when /\Ar/                      # secret
-  pp parser.rules
-when /\Ag/
-  n = 1
-  n = ARGV[2].to_i if ARGV[2]
-  n.times do
-    g = parser.generate
-    puts g.cbor_diagnostic
-  end
-when /\Aj/
-  n = 1
-  n = ARGV[2].to_i if ARGV[2]
-  n.times do
-    g = parser.generate
-    puts JSON.pretty_generate(g)
+begin
+  case ARGV[1]
+  when /\Ar/                      # secret
+    $advanced = true
+    pp parser.rules
+  when /\Ag/
+    n = 1
+    n = ARGV[2].to_i if ARGV[2]
+    n.times do
+      g = parser.generate
+      puts g.cbor_diagnostic
+    end
+  when /\Aj/
+    n = 1
+    n = ARGV[2].to_i if ARGV[2]
+    n.times do
+      g = parser.generate
+      puts JSON.pretty_generate(g)
+    end
+  when /\Av/
+    instance = read_arg(ARGV[2])
+    instance = CBOR.decode(instance.b) rescue JSON.load(instance)
+    p parser.validate(instance)
+  else
+    usage
   end
-when /\Av/
-  instance = File.read(ARGV[2])
-  instance = CBOR.decode(instance.b) rescue JSON.load(instance)
-  p parser.validate(instance)
-else
-  usage
+rescue CDDL::ParseError => e
+  warn e.message
+  exit 1
 end

data/cddl.gemspec

@@ -1,12 +1,13 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
   s.add_dependency('abnc')
   s.add_dependency('json')
   s.add_dependency('regexp-examples')
+  s.add_dependency('colorize')
   s.files = `git ls-files`.split("\n").grep(/^[a-z]/)
   s.files = Dir['lib/**/*.rb'] + %w(cddl.gemspec) + Dir['data/**/*.abnf'] + Dir['data/**/*.cddl'] + Dir['test-data/**/*.cddl'] + Dir['test/**/*.rb']
   s.require_path = 'lib'

data/lib/cddl.rb

@@ -3,6 +3,7 @@ require 'pp'
 require 'pathname'
 require 'cbor-pure'
 require 'regexp-examples'
+require 'colorize'
 
 module CDDL
 
@@ -13,6 +14,8 @@ module CDDL
 
   MANY = Float::INFINITY
 
+  class ParseError < ArgumentError; end
+
   class Parser
     def initialize(source_text)
       @abnf = Peggy::ABNF.new
@@ -21,12 +24,26 @@ module CDDL
       expected_length = source_text.length + PRELUDE.length
       if expected_length != presult
         upto = @abnf.parse_results.keys.max
-        puts "UPTO: #{upto}"
-        pp @abnf.parse_results[upto]
-        pp @abnf.parse_results[presult]
-        p presult
-        puts @abnf.ast?
-        raise "parse error at #{presult} upto #{upto} of #{expected_length}"
+        puts "UPTO: #{upto}" if $advanced
+        pp @abnf.parse_results[upto] if $advanced
+        pp @abnf.parse_results[presult] if $advanced
+        puts "SO FAR: #{presult}"  if $advanced
+        puts @abnf.ast? if $advanced
+        presult ||= 0
+        part1 = source_text[[presult - 100, 0].max...presult]
+        part3 = source_text[upto...[upto + 100, source_text.length].min]
+        if upto - presult < 100
+          part2 = source_text[presult...upto]
+        else
+          part2 = source_text[presult, 50] + "......." + source_text[upto-50, 50]
+        end
+        warn "*** Look for syntax problems around the #{
+               "%%%".colorize(background: :light_yellow)} markers:\n#{
+               part1}#{"%%%".colorize(color: :green, background: :light_yellow)}#{
+               part2}#{"%%%".colorize(color: :red, background: :light_yellow)}#{
+               part3}"
+        raise ParseError, "*** Parse error at #{presult} upto #{upto} of #{
+                          source_text.length} (#{expected_length})."
       end
       puts @abnf.ast? if $debug_ast
       @ast = @abnf.ast?

data/test-data/wrong1.cddl

@@ -0,0 +1,17 @@
+reputation-object = {
+  application: tstr
+  reputons: [* reputon]
+
+
+reputon = {
+  rater: tstr
+  assertion: tstr
+  rated: tstr
+  rating: float16
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * any: any
+}

data/test-data/wrong1a.cddl

@@ -0,0 +1,23 @@
+reputation-object = {
+  application: tstr
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * any: any
+  reputons: [* reputon]
+
+
+reputon = {
+  rater: tstr
+  assertion: tstr
+  rated: tstr
+  rating: float16
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * any: any
+}

data/test-data/wrong2.cddl

@@ -0,0 +1,17 @@
+reputation-object = {
+  application: tstr
+  reputons: [* reputon]
+}
+
+reputon = 
+  rater: tstr
+  assertion: tstr
+  rated: tstr
+  rating: float16
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * any: any
+}

data/test-data/wrong2a.cddl

@@ -0,0 +1,17 @@
+reputation-object = {
+  application: tstr
+  reputons: [* reputon]
+}
+
+reputon = {
+  rater: tstr
+  assertion: tstr
+  rated: tstr
+  rating: float16
+  ? confidence: float16
+  ? normal-rating: float16
+  ? sample-size: uint
+  ? generated: uint
+  ? expires: uint
+  * any: any
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Carsten Bormann
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: A parser, generator, and validator for CDDL
 email: cabo@tzi.org
 executables:
@@ -86,6 +100,10 @@ files:
 - test-data/reused_named_group.cddl
 - test-data/structure.cddl
 - test-data/two_anonymous_groups.cddl
+- test-data/wrong1.cddl
+- test-data/wrong1a.cddl
+- test-data/wrong2.cddl
+- test-data/wrong2a.cddl
 - test/test-cddl.rb
 homepage: http://github.com/cabo/cddl
 licenses: