junoser 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d373ec94d7ebe3053b4f01d01d54beb15b49af4e2e8fbab4b29f9641632b5715
-  data.tar.gz: 046c510a4c5072759810abd68c8df4ce25c7cab976806182cdf0020dbd5b3f6c
+  metadata.gz: bd8d0023004d5b1a354481038fd124a73b1aff42b66fd0582534dbed3587acfc
+  data.tar.gz: 26215df72ca310d36a6b57e5e288d145c5e575ced116633e023b0d895db4546f
 SHA512:
-  metadata.gz: c8acdf3b078ddc961ba28f3be6f9c2b3870b2f3ee85a81b7bec28fee09a390709e0783e520c67ef3b30fe87b15a317d7dcb879bdadd3d3b3d3d101a3fdb05c32
-  data.tar.gz: 9f4ff9fda7f65b1a318dcd43858874e7823e0008028071a0a2b20c951cdbdf04b6665e521044a572fd46f34626a345d543f2df9366524f55d07cf99dbfb55064
+  metadata.gz: 4fb26b5d915d873942e4ae4fcff612f70664ed933353287597c74da9ecf42f68f7e6f55ce8472e64a73ae2598a77937beacfb1fc9b417b9247e4dfcbcf76904f
+  data.tar.gz: 534d3484149a158d384e2beaabd6a12c33cd16ef993d2ddfb90e61410b76a6dd3ef214e7894c9a2b2541effbe69f7e271b4cc7208d9bb22470efc5e16a912c99

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.7.1] - 2025-02-03
+
+### Added
+
+* Newly supported syntax for vSRX
+  * "system services web-management http"
+
+
 ## [0.7.0] - 2024-12-19
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.7.0)
+    junoser (0.7.1)
       parslet
 
 GEM
@@ -12,7 +12,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parslet (2.0.0)
-    power_assert (2.0.4)
+    power_assert (2.0.5)
     racc (1.8.1)
     rake (13.2.1)
     test-unit (3.6.7)
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.5.16
+   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/lib/junoser/js_ruler.rb

@@ -29,17 +29,20 @@ module Junoser
       # set groups
       str.gsub! /"groups" \(.*\s*s\(\s*any\s*\)\s*\)/, <<-EOS.strip
           "groups" arg (  /* Configuration groups */
-            "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
+            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
+                  )
                 )
               )
             )
@@ -91,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}" }
 
@@ -167,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
@@ -286,6 +289,8 @@ module Junoser
 
       # "arg"  ->  "arg_1"
       lines.gsub('"arg":') { %["arg_#{sequence}":] }
+
+      conditional_groups(lines)
     end
 
     # }  ->  )
@@ -349,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 */

data/lib/junoser/parser.rb

@@ -86863,6 +86863,14 @@ module Junoser
                               httpd_traceoptions_type
                             ),
                             a(str("management-url"), arg),
+                            # Ported from vSRX 18.4R1.8
+                            b(str("http"),
+                              a(str("port"), arg),
+                              b(str("interface"),
+                                interface_name
+                              )
+                            ),
+                            # End of vSRX 18.4R1.8
                             b(str("https"),
                                 c(
                                     a(str("port"), arg),
@@ -86876,6 +86884,16 @@ module Junoser
                                     )
                                 )
                             ),
+                            # Ported from vSRX 18.4R1.8
+                            b(str("http"),
+                                c(
+                                    a(str("port"), arg),
+                                    b(str("interface"),
+                                        interface_name
+                                    )
+                                )
+                            ),
+                            # End of vSRX 18.4R1.8
                             b(str("control"),
                                 c(
                                     a(str("max-threads"), arg)

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Shintaro Kojima
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -141,7 +140,6 @@ files:
 homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: PEG parser for JUNOS configuration.
 test_files: []