junoser 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73208784003b23a9dc996cf06ef4941a3da1ad35143848885c3e37a0e921e84
-  data.tar.gz: ae1ded9c7e208d3af98a96cf4c9fe5839b51d79447f1921fb36807f4202017ad
+  metadata.gz: bd8d0023004d5b1a354481038fd124a73b1aff42b66fd0582534dbed3587acfc
+  data.tar.gz: 26215df72ca310d36a6b57e5e288d145c5e575ced116633e023b0d895db4546f
 SHA512:
-  metadata.gz: 8ac8d0ca12b3dada5bea555115c5ac172cc7dd3123c3fb5b85ab01e7f7e116daed5b2e9faebfc6237569719ad363c182522359a0cb1d1f1892f3bb85cfb5cc47
-  data.tar.gz: c37c95e729cdbf60a517845c0561c80b5bbb6e43f5b1dfd0c6ed8a8f49e431028c12ffb6dd0b081e8ce15ce829af599e246635a60df8d7f528d567835271e154
+  metadata.gz: 4fb26b5d915d873942e4ae4fcff612f70664ed933353287597c74da9ecf42f68f7e6f55ce8472e64a73ae2598a77937beacfb1fc9b417b9247e4dfcbcf76904f
+  data.tar.gz: 534d3484149a158d384e2beaabd6a12c33cd16ef993d2ddfb90e61410b76a6dd3ef214e7894c9a2b2541effbe69f7e271b4cc7208d9bb22470efc5e16a912c99

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.7.1] - 2025-02-03
+
+### Added
+
+* Newly supported syntax for vSRX
+  * "system services web-management http"
+
+
+## [0.7.0] - 2024-12-19
+
+### Added
+
+* Recreate parser based on MX 22.4R3-S2.11 xsd
+* Newly supported syntax
+  * "groups xxx when"
+  * "snmp stats-cache-lifetime xxx"
+
+
 ## [0.6.0] - 2024-09-15
 
 ### Added

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.6.0)
+    junoser (0.7.1)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.8.7)
-    nokogiri (1.16.7)
+    mini_portile2 (2.8.8)
+    nokogiri (1.17.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parslet (2.0.0)
-    power_assert (2.0.3)
+    power_assert (2.0.5)
     racc (1.8.1)
     rake (13.2.1)
-    test-unit (3.6.2)
+    test-unit (3.6.7)
       power_assert
 
 PLATFORMS
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.5.9
+   2.6.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2024 Shintaro Kojima
+Copyright (c) 2015-2025 Shintaro Kojima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -103,4 +103,4 @@ Or send a pull request to fix.
 
 ## Copyright and License
 
-Copyright (c) 2015-2024 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
+Copyright (c) 2015-2025 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).

data/Rakefile

@@ -4,7 +4,7 @@ require 'nokogiri'
 require 'pathname'
 require 'rake/testtask'
 
-xsd_path = File.join(__dir__, 'tmp/junos-system-21.2.xsd')
+xsd_path = File.join(__dir__, 'tmp/junos-system-22.4.xsd')
 rule_path = File.join(__dir__, 'tmp/rule.rb')
 ruby_parser_path = File.join(__dir__, 'lib/junoser/parser.rb')
 js_parser_path = File.join(__dir__, 'tmp/junos.js')

data/lib/junoser/js_ruler.rb

@@ -25,6 +25,53 @@ module Junoser
 
     private
 
+    def process_lines(str)
+      # set groups
+      str.gsub! /"groups" \(.*\s*s\(\s*any\s*\)\s*\)/, <<-EOS.strip
+          "groups" arg (  /* Configuration groups */
+            c(
+              this.configuration({ groups: false }),
+              "when" (  /* Specify additional conditions for groups */
+                c(
+                  "chassis" arg  /* Chassis id */,
+                  "member" arg  /* Member of virtual chassis */,
+                  "model" arg  /* Model name */,
+                  "node" arg  /* Node of cluster */,
+                  "peers" arg  /* Hosts on which this group should be effective */,
+                  "routing-engine" arg  /* Routing Engine */,
+                  "time" (  /* Time at which group should be effective */
+                    "to" arg  /* End time([yyyy-mm-dd.]hh:mm) */,
+                    arg
+                  )
+                )
+              )
+            )
+          )
+      EOS
+
+      # set protocols mpls path
+      str.gsub!(/("path" arg \(.*Route of a label-switched path.*)(\s*)c\(/) do
+        "#{$1}#{$2}s(#{$2}ipaddr,"
+      end
+
+      # set protocols iccp peer xxx liveness-detection single-hop
+      str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(.*?c\(\s*"threshold" arg .*?\)\s*\))/m) do
+        "#{$1},\n#{format('"single-hop"', $2)}"
+      end
+
+      # set forwarding-options dhcp-relay server-group
+      str.gsub!(/^(rule\(:(?:v6_)?server_group_type\) do)\n(.*?)\nend/m) do
+        "#{$1}\n  arg.as(:arg) (\n#{$2}\n  )\nend"
+      end
+
+      # set interfaces xxx enable
+      str.gsub!(/^(rule\(:interfaces_type\) do\s*[^\n]*\s*c\()(\s*)/m) do
+        %[#{$1}#{$2}"enable",#{$2}]
+      end
+
+      str
+    end
+
     def process_line(str)
       str = remove_undefined_variables(str)
       str = process_common_syntax(str)
@@ -47,8 +94,8 @@ module Junoser
     end
 
     def process_common_syntax(str)
-      # rule(:foo) do  ->  foo(...args) {
-      str.gsub!(/^rule\(:(\S+)\) do/) { "#$1(...args) { return_next_line" }
+      # rule(:foo) do  ->  foo(opts) {
+      str.gsub!(/^rule\(:(\S+)\) do/) { "#$1(opts) { return_next_line" }
       # end  ->  }
       str.gsub!(/^(\s*)end$/) { "#$1}" }
 
@@ -123,12 +170,12 @@ module Junoser
     end
 
     def process_structural_syntax(str)
-      # "foo" (  /* doc */  ->  "foo | doc": (...args) => {
+      # "foo" (  /* doc */  ->  "foo | doc": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" \(  /\* (.*) \*/|) { "#$1\"#$2 | #$3\": {" }
-      # "foo" (  ->  "foo": (...args) => {
+      # "foo" (  ->  "foo": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" \($|) { "#$1\"#$2\": {" }
 
-      # "foo" arg (  /* doc */  ->  "foo | doc": (...args) => {
+      # "foo" arg (  /* doc */  ->  "foo | doc": (opts) => {
       str.gsub!(%r|^(\s*)"(\S+)" arg \(  /\* (.*) \*/|) { "#$1\"#$2 | #$3\": {" }
 
       str
@@ -210,30 +257,6 @@ module Junoser
       str
     end
 
-    def process_lines(str)
-      # set protocols mpls path
-      str.gsub!(/("path" arg \(.*Route of a label-switched path.*)(\s*)c\(/) do
-        "#{$1}#{$2}s(#{$2}ipaddr,"
-      end
-
-      # set protocols iccp peer xxx liveness-detection single-hop
-      str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(.*?c\(\s*"threshold" arg .*?\)\s*\))/m) do
-        "#{$1},\n#{format('"single-hop"', $2)}"
-      end
-
-      # set forwarding-options dhcp-relay server-group
-      str.gsub!(/^(rule\(:(?:v6_)?server_group_type\) do)\n(.*?)\nend/m) do
-        "#{$1}\n  arg.as(:arg) (\n#{$2}\n  )\nend"
-      end
-
-      # set interfaces xxx enable
-      str.gsub!(/^(rule\(:interfaces_type\) do\s*[^\n]*\s*c\()(\s*)/m) do
-        %[#{$1}#{$2}"enable",#{$2}]
-      end
-
-      str
-    end
-
     def finalize(lines)
       lines = balance_parenthesis(lines)
       objectize_arg_of_s(lines)
@@ -266,6 +289,8 @@ module Junoser
 
       # "arg"  ->  "arg_1"
       lines.gsub('"arg":') { %["arg_#{sequence}":] }
+
+      conditional_groups(lines)
     end
 
     # }  ->  )
@@ -329,6 +354,17 @@ module Junoser
       lines
     end
 
+    def conditional_groups(lines)
+      # "null_13264": this.configuration(false),
+      # ->
+      # (opts === undefined || opts?.configuration !== false) && { "null_13264": this.configuration(false) },
+      #
+      # ref: process_lines()
+      lines.gsub(/("groups\(arg\) \| .*":) {/) {
+        "#{$1} opts?.groups !== false && {"
+      }
+    end
+
     def rule_header
       <<~EOS
         /* eslint-disable semi */