junoser 0.4.1 → 0.4.4

data/lib/junoser/ruler.rb

@@ -137,6 +137,8 @@ module Junoser
       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}"}
 
       %w[ccc ethernet-over-atm tcc vpls bridge].each do |encap|
         str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#$1"ethernet"] }
@@ -212,7 +214,16 @@ module Junoser
       # Fix .xsd: "members" accepts [ foo bar ]
       str.gsub! '"members" arg', '"members" any'
 
+      # Fix .xsd: "term_object" accepts multiple conditions
+      str.gsub!(/^(rule\(:term_object\) do\s*arg\.as\(:arg\) \(\s*)c\(/) { "#{$1}sc(" }
+
+      # 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)'
     end
 
     def format(str, offset = OFFSET)

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.4.1"
+  VERSION = "0.4.4"
 end

data/lib/junoser/xsd/base.rb

@@ -34,14 +34,16 @@ module Junoser
       end
 
       def oneliner?
-        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[text()="oneliner"]').empty?
+        # don't use "/flag" as xsd manipulation automatically add "xsd:" prefix
+        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="oneliner"]').empty?
       end
 
 
       private
 
       def nokeyword?
-        @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[text()="nokeyword"]').empty?
+        # don't use "/flag" as xsd manipulation automatically add "xsd:" prefix
+        @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="nokeyword"]').empty?
       end
 
       def has_single_child_of?(klass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2022-02-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
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: PEG parser for JUNOS configuration.

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