junoser 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 713f225a607c33ca8acdd832a0252b217da1c5cfc9d9d5075efee87cde04dff1
-  data.tar.gz: 98bc62a4a4c37c6f654412807f989d486beb4a813d65db661e94883b34294b76
+  metadata.gz: 8e5143d4a1cd52517e76888edab70ba8938e66b98e8869bcf9de3e5963860cee
+  data.tar.gz: be817dc008cd1f482c01e1d577314d72d90f436f582388db43df967dcd9599dd
 SHA512:
-  metadata.gz: 18c5b6efde1452334353e90676e3375e730fecada9c2b09f173ea40e4f9a6dce54ffe6dc7adfdf65306673f56e86efd50cdbc91a9ed865ae2465f6caddfcdfbc
-  data.tar.gz: c5d9a62f138d08985959bc5dc48213b311a7ea814750e24e4048d4f0c272a6f16b3d60d33ccf06eed2ac72bfd26a0d24bbc19165aa668e8bc8ace2f1f6976049
+  metadata.gz: e579496b46fb6297e69909d20dc77f3851a75b10eec1c545530bab725b1953491bfab82d950183e3c99adcb0cd7655e23fcea8d74c5607acd3188ad37fda1edf
+  data.tar.gz: 2ce8eeff3c0af7927c4318e6ace521be67d5ccc3a479e72a2e1a460731785b7622eead33d53bdecf0ab3dabcee507252660675b3421d5231b0f66e2343177eed

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.4.6] - 2022-07-02
+
+### Fixed
+
+* Accept quoted strings under "system license keys key"
+* "protocols bgp ... prefix-limit teardown"
+
+
 ## [0.4.5] - 2022-04-27
 
 ### Fixed

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    junoser (0.4.5)
+    junoser (0.4.6)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
     mini_portile2 (2.8.0)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parslet (2.0.0)
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.2.26
+   2.3.13

data/lib/junoser/parser.rb

@@ -63641,7 +63641,7 @@ module Junoser
     rule(:bgpaf_accepted_prefix_limit) do
         c(
             a(str("maximum"), arg),
-            b(str("teardown"),
+            b(a(str("teardown"), arg),
                 ca(
                     b(str("idle-timeout"),
                         sc(
@@ -63652,7 +63652,8 @@ module Junoser
                         )
                     ).as(:oneline)
                 )
-            )
+            ),
+            str("teardown")
         )
     end
 
@@ -63671,7 +63672,7 @@ module Junoser
     rule(:bgpaf_prefix_limit) do
         c(
             a(str("maximum"), arg),
-            b(str("teardown"),
+            b(a(str("teardown"), arg),
                 ca(
                     b(str("idle-timeout"),
                         sc(
@@ -63682,7 +63683,8 @@ module Junoser
                         )
                     ).as(:oneline)
                 )
-            )
+            ),
+            str("teardown")
         )
     end
 
@@ -97992,7 +97994,7 @@ module Junoser
             ),
             b(str("keys"),
                 c(
-                    a(str("key"), arg)
+                    a(str("key"), quote | arg)
                 )
             ),
             c(

data/lib/junoser/ruler.rb

@@ -14,7 +14,7 @@ module Junoser
       str = @rule.read
       str = remove_comments(str)
       str = process_reserved_element(str)
-      str = str.split(/\n/).map { |l| format(process_line(l)) }.join("\n")
+      str.split(/\n/).map { |l| format(process_line(l)) }.join("\n")
     end
 
     private
@@ -26,16 +26,16 @@ module Junoser
     def process_line(str)
       return str if str =~ /^(.* do|end)$/
 
-      str.gsub!(/("[^"]+")/) { "str(#$1)" } # "foo" -> str("foo")
+      str.gsub!(/("[^"]+")/) { "str(#{$1})" } # "foo" -> str("foo")
 
-      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#$2," } # arg ( -> b(arg,
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#$2, #$3)#$4#$5" } # str("foo") bar -> a(str("foo"), bar)
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#$2, #$3#$4)#$5" } # str("foo") (a | b) -> a(str("foo"), a | b)
+      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#{$2}," } # arg ( -> b(arg,
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#{$2}, #{$3})#{$4}#{$5}" } # str("foo") bar -> a(str("foo"), bar)
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#{$2}, #{$3}#{$4})#{$5}" } # str("foo") (a | b) -> a(str("foo"), a | b)
 
-      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#$2," } # str("foo") ( -> b(str("foo"),
-      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3#$4," } # (a | b) ( -> b((a | b),
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+) \($/) { "#{$1}b(a(#$2, #$3)," } # str("foo") bar ( -> b(a(str("foo"), bar),
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#$2, #$3#$4," } # str("foo") (a | b) ( -> a(str("foo"), a | b,
+      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#{$2}," } # str("foo") ( -> b(str("foo"),
+      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#{$2}#{$3}#{$4}," } # (a | b) ( -> b((a | b),
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f(|,]+) \($/) { "#{$1}b(a(#{$2}, #{$3})," } # str("foo") bar ( -> b(a(str("foo"), bar),
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#{$2}, #{$3}#{$4}," } # str("foo") (a | b) ( -> a(str("foo"), a | b,
 
       str
     end
@@ -52,7 +52,7 @@ module Junoser
       #
       # Statements can be quoted
       #
-      str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
+      str.gsub!(/("ssh-\S+") arg/) { "#{$1} (quote | arg)" }
       str.gsub! '"message" arg', '"message" (quote | arg)'
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
@@ -63,7 +63,7 @@ module Junoser
                 '    quote | arg'], $1)
       end
 
-      str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
+      str.gsub!(/^rule\(:regular_expression\) do\s.*?\s*end/) do
         <<~EOS
           rule(:regular_expression) do
             (quote | arg).as(:arg)
@@ -99,7 +99,7 @@ module Junoser
       #
       # "arg" matches anything so move to the end
       #
-      str.gsub!(/arg \| (".*")/) { "#$1 | arg" }
+      str.gsub!(/arg \| (".*")/) { "#{$1} | arg" }
       str.gsub!(/^(\s*)c\(\s*arg,$/) { "#{$1}ca(" }
       str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
       str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
@@ -130,18 +130,18 @@ module Junoser
       #
       #   "inet",
       #   "inet6"
-      str.gsub!(/"cspf"(.*\s*.*)"cspf-link"/) { %["cspf-link"#$1"cspf"] }
-      str.gsub!(/"http"(.*\s*.*)"https"/) { %["https"#$1"http"] }
-      str.gsub!(/"inet"(.*\s*.*)"inet6"/) { %["inet6"#$1"inet"] }
-      str.gsub!(/"icmp"(.*\s*.*)"icmp6"/) { %["icmp6"#$1"icmp"] }
-      str.gsub!(/"icmp"(.*\s*.*)"icmpv6"/) { %["icmpv6"#$1"icmp"] }
-      str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
-      str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#$1"ospf"] }
+      str.gsub!(/"cspf"(.*\s*.*)"cspf-link"/) { %["cspf-link"#{$1}"cspf"] }
+      str.gsub!(/"http"(.*\s*.*)"https"/) { %["https"#{$1}"http"] }
+      str.gsub!(/"inet"(.*\s*.*)"inet6"/) { %["inet6"#{$1}"inet"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmp6"/) { %["icmp6"#{$1}"icmp"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmpv6"/) { %["icmpv6"#{$1}"icmp"] }
+      str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#{$1}"snmp"] }
+      str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#{$1}"ospf"] }
       str.gsub! '"tls1" | "tls11" | "tls12"', '"tls11" | "tls12" | "tls1"'
-      str.gsub!(/("group1" \| "group2" \| "group5") \| ([^\)]+)/) { "#{$2} | #{$1}"}
+      str.gsub!(/("group1" \| "group2" \| "group5") \| ([^)]+)/) { "#{$2} | #{$1}"}
 
       %w[ccc ethernet-over-atm tcc vpls bridge].each do |encap|
-        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#$1"ethernet"] }
+        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#{$1}"ethernet"] }
       end
 
       str.gsub!(/^(\s*)"path" arg \(\s*c\(\s*sc\(\s*"abstract",\s*c\(\s*"loose",\s*"loose-link",\s*"strict"\s*\)\s*\)\.as\(:oneline\)/) do
@@ -163,9 +163,9 @@ module Junoser
       #
       # Fix .xsd: Elements without "nokeyword" flag
       #
-      str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
+      str.gsub!(/\((.*) \| "name"\)/) { "(#{$1} | arg)" }
       str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
-      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#$1 | arg)" }
+      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#{$1} | arg)" }
 
       %w[filename].each do |key|
         str.gsub! %["#{key}" arg], 'arg'
@@ -220,10 +220,18 @@ module Junoser
       # Fix .xsd: keywords "dest-nat-rule-match", "src-nat-rule-match", "static-nat-rule-match" are wrong
       str.gsub!(/"(dest|src|static)-nat-rule-match"/) { '"match"' }
 
-      str
-
       # Fix .xsd: "snmp system-name" should be "snmp name"
       str.gsub! '"system-name" arg', '"name" (quote | arg)'
+
+      # Fix .xsd: argument of "system license keys key" can be quoted
+      str.gsub!(/^(rule\(:license_object\) do.*?"key") arg/m) { "#{$1} (quote | arg)"}
+
+      # Fix .xsd: "prefix-limit teardown"
+      str.gsub!(/^(\s*)"teardown" (\(.*?as\(:oneline\)\s*\)\s*\))/m) do
+        "#{$1}\"teardown\" arg #{$2},\n#{$1}\"teardown\""
+      end
+
+      str
     end
 
     def format(str, offset = OFFSET)

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/sig/junoser/ruler.rbs

@@ -0,0 +1,21 @@
+# TypeProf 0.21.2
+
+# Classes
+module Junoser
+  class Ruler
+    OFFSET: String
+    @rule: untyped
+
+    def initialize: (untyped input) -> void
+    def to_rule: -> String
+    def rule: -> untyped
+
+    private
+    def remove_comments: (untyped str) -> untyped
+    def process_line: (untyped str) -> untyped
+    def process_reserved_element: (untyped str) -> untyped
+    def format: (Array[String?] | String str, ?String? offset) -> String?
+    def rule_header: -> String
+    def rule_footer: -> String
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -137,6 +137,7 @@ files:
 - lib/junoser/xsd/simple_type.rb
 - lib/junoser/xsd/union.rb
 - lib/underscorable.rb
+- sig/junoser/ruler.rbs
 homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: PEG parser for JUNOS configuration.