junoser 0.4.2 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37eb9172418859fd2a4144cdd0d4b47c657162e02117cfb9fe73a33fe9ca0e2
-  data.tar.gz: 4791fbaf136985e1b16a4dba7daaf2fc2dbcee8ed85508d2e3c65b5b3f4575b9
+  metadata.gz: 713f225a607c33ca8acdd832a0252b217da1c5cfc9d9d5075efee87cde04dff1
+  data.tar.gz: 98bc62a4a4c37c6f654412807f989d486beb4a813d65db661e94883b34294b76
 SHA512:
-  metadata.gz: 5961c24e760831bf52f6edb82c5972aefb023d99639091fb2c12d95f083ef57e9e2703fd441dbb0c1d5e44b5e386834679e910873e44825c9a7c103243fa2c6c
-  data.tar.gz: 9e41dcfb72bfe2f5b801506c50725a4a0da2f56a09a8ddeedb8cb7d4b8ae82864008c89cdf2da837ced1c83d39d2e7d53640bba5f7dcb459d434e0d173862659
+  metadata.gz: 18c5b6efde1452334353e90676e3375e730fecada9c2b09f173ea40e4f9a6dce54ffe6dc7adfdf65306673f56e86efd50cdbc91a9ed865ae2465f6caddfcdfbc
+  data.tar.gz: c5d9a62f138d08985959bc5dc48213b311a7ea814750e24e4048d4f0c272a6f16b3d60d33ccf06eed2ac72bfd26a0d24bbc19165aa668e8bc8ace2f1f6976049

data/.github/workflows/test-linux.yaml

@@ -0,0 +1,30 @@
+name: Test on Ubuntu
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.1', '3.0', '2.7']
+        os: [ubuntu-latest]
+        experimental: [false]
+        include:
+          - ruby-version: head
+            os: ubuntu-latest
+            experimental: true
+
+    name: Test with ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake test

data/.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+    rev: v5.0.0
+    hooks:
+      - id: commitlint
+        stages: [commit-msg]
+        additional_dependencies: ['@commitlint/config-conventional']

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.4.5] - 2022-04-27
+
+### Fixed
+
+* Ignore "replace:" tag in structured form
+
+
+## [0.4.4] - 2022-02-26
+
+### Fixed
+
+* "snmp name" instead of "snmp system-name"
+
+
+## [0.4.3] - 2021-09-28
+
+### Fixed
+
+* A Nokogiri's [security vulnerability](https://github.com/advisories/GHSA-2rr5-8q37-2w7h)
+
+
 ## [0.4.2] - 2021-08-30
 
 ### Added

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.4.2)
+    junoser (0.4.5)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.5.3)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    mini_portile2 (2.8.0)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parslet (2.0.0)
-    power_assert (2.0.0)
-    racc (1.5.2)
-    rake (13.0.3)
-    test-unit (3.4.4)
+    power_assert (2.0.1)
+    racc (1.6.0)
+    rake (13.0.6)
+    test-unit (3.5.3)
       power_assert
 
 PLATFORMS
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.2.16
+   2.2.26

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 Shintaro Kojima
+Copyright (c) 2015-2022 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

@@ -1,6 +1,6 @@
 # Junoser
 
-[![Build Status](https://travis-ci.org/codeout/junoser.svg)](https://travis-ci.org/codeout/junoser)
+[![Test on Ubuntu](https://github.com/codeout/junoser/actions/workflows/test-linux.yaml/badge.svg)](https://github.com/codeout/junoser/actions/workflows/test-linux.yaml)
 [![Code Climate](https://codeclimate.com/github/codeout/junoser.png)](https://codeclimate.com/github/codeout/junoser)
 [![Inline docs](http://inch-ci.org/github/codeout/junoser.svg)](http://inch-ci.org/github/codeout/junoser)
 
@@ -103,4 +103,4 @@ Or send a pull request to fix.
 
 ## Copyright and License
 
-Copyright (c) 2015-2021 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
+Copyright (c) 2015-2022 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).

data/commitlint.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  extends: ["@commitlint/config-conventional"],
+  rules: {
+  },
+};

data/lib/junoser/display/set.rb

@@ -59,12 +59,16 @@ module Junoser
         current_statement = ''
 
         current_stack.each do |stack|
+          stack.gsub! 'replace: ', ''
+
           if stack.gsub!('inactive: ', '')
             statements << "deactivate #{current_statement}#{stack}"
           end
           current_statement << "#{stack} "
         end
 
+        str.gsub! 'replace: ', ''
+
         if str.gsub!('inactive: ', '')
           statements << "deactivate #{current_statement}#{str}"
         end

data/lib/junoser/js_ruler.rb

@@ -168,6 +168,8 @@ module Junoser
       str.gsub! 'policy | Define a policy context from this zone', 'from-zone | Define a policy context from this zone'
       # "to-zone-name | Destination zone" -> "to-zone | Destination zone"
       str.gsub! 'to-zone-name | Destination zone', 'to-zone | Destination zone'
+      # "system-name | System name override" -> "name | System name override"
+      str.gsub! 'system-name | System name override', 'name | System name override'
 
       fix_route_filter(str)
 

data/lib/junoser/parser.rb

@@ -8746,7 +8746,7 @@ module Junoser
               ).as(:oneline),
               b(str("snmp"),
                   c(
-                      a(str("system-name"), arg),
+                      a(str("name"), quote | arg),
                       a(str("description"), quote | arg),
                       a(str("location"), quote | arg),
                       a(str("contact"), quote | arg),
@@ -14289,7 +14289,7 @@ module Junoser
                               b(str("suppress-tlv-advertisement"),
                                 (str("MANAGEMENT_ADDRESS") | str("SYSTEM_CAPABILITIES") | str("SYSTEM_DESCRIPTION") | str("SYSTEM_NAME") | str("PORT_DESCRIPTION") | str("PORT_ID") | str("CHASSIS_ID"))
                               ),
-                              a(str("system-name"), arg),
+                              a(str("name"), quote | arg),
                               a(str("system-description"), arg),
                               a(str("chassis-id"), arg),
                               b(str("chassis-id-type"),

data/lib/junoser/ruler.rb

@@ -221,6 +221,9 @@ module Junoser
       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)'
     end
 
     def format(str, offset = OFFSET)

data/lib/junoser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.5
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -89,8 +89,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test-linux.yaml"
 - ".gitignore"
-- ".travis.yml"
+- ".pre-commit-config.yaml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -99,6 +100,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- commitlint.config.js
 - example/get-schema.xml
 - example/junos-18.1R3-S9.rb
 - example/mx-19.3R3-S1.3.rb

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6
-  - 2.7
-  - 3.0
-  - ruby-head
-
-before_install:
-  - gem update --system
-  - gem install bundler
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head