junoser 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7be39da90e3e4cc1fe59887e5c1a870c5d3aecd2
-  data.tar.gz: 0704721d4e179efa93a0f788040667fa165cb8f8
+  metadata.gz: c1712996f972e957b0606905fdad4a5e1888623d
+  data.tar.gz: 05fe617f94ace5f76847da3da6e950b6661bda4f
 SHA512:
-  metadata.gz: 434a77e3b1d7430b009fef5219785df71f43ff8d08a5826b5a3f81af3525a7b00ffb0370e1c9a08e852b6206b6cc08f7b45a40bf82307b88c643069ca2d93037
-  data.tar.gz: 87293dcbcb0cc72acfc4a61b43f544b2d5d9c75b6977c49b326968d6f1006e2597feae0c45703c9558b3aac1bbe1689006466766ec26f8507237e66d1d942d1a
+  metadata.gz: 8055f567929e8499ceb8b2ace5415ab82526f82e76aee1bfd72fa56eca5972dda99374daf725c4de823c52b52faae1d7fcfd48523a6173f9536dcb35c7ec5c9b
+  data.tar.gz: 98733286e456322ce034ad6be647cb2d33f4d4481ecab034a7224284aac3a3f6d05237d7b292ad2f44ee3855bd18894b52f82bd90842e0ed84d2b8a2db2d26ad

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3.1
   - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.4 / 2017-02-18
+
+* Newly supported syntax
+  * system processes app-engine-virtual-machine-management-service traceoptions
+  * Some platforms expect "system processes dhcp", not "system processes dhcp-service"
+  * "storm-control" under family bridge
+* Bug fix
+  * Appropriately extract "vlan <vlan-name>"
+
 ## 0.2.3 / 2016-08-28
 
 * Newly supported syntax

data/LICENSE.txt

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

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

data/Rakefile

@@ -40,6 +40,7 @@ end
 
 Rake::TestTask.new do |t|
   t.verbose = true
+  t.warning = false
 end
 
 desc 'Run tests'

data/example/vsrx-12.1.x47.rb

@@ -1949,6 +1949,9 @@ rule(:configuration) do
                                                   ),
                                                   c(
                                                     "isid-list" arg
+                                                  ),
+                                                  "storm-control" (
+                                                    storm_control
                                                   )
                                               )
                                           ),
@@ -6984,24 +6987,7 @@ rule(:ethernet_switching_type) do
             )
         ),
         "storm-control" (
-            c(
-                "default",
-                "action-shutdown",
-                "interface" ("all" | "name") (
-                    c(
-                        "bandwidth" arg,
-                        "no-broadcast",
-                        "no-unknown-unicast",
-                        "level" arg,
-                        c(
-                          "multicast",
-                          "no-multicast",
-                          "no-registered-multicast",
-                          "no-unregistered-multicast"
-                        )
-                    )
-                )
-            )
+          storm_control
         )
     )
 end
@@ -10297,6 +10283,9 @@ rule(:interfaces_type) do
                                 ),
                                 c(
                                   "isid-list" arg
+                                ),
+                                "storm-control" (
+                                  storm_control
                                 )
                             )
                         ),
@@ -14649,6 +14638,9 @@ rule(:juniper_dynamic_profile_object) do
                                                 ),
                                                 c(
                                                   "isid-list" arg
+                                                ),
+                                                "storm-control" (
+                                                  storm_control
                                                 )
                                             )
                                         ),
@@ -31267,6 +31259,29 @@ rule(:juniper_system) do
                           "disable"
                         )
                     )
+                ),
+                "app-engine-virtual-machine-management-service" (
+                  c(
+                    "traceoptions" (
+                      c(
+                        "no-remote-trace",
+                        "file" (
+                          c(
+                            "filename" arg,
+                            "size" arg,
+                            "files" arg,
+                            "world-readable",
+                            "no-world-readable",
+                            "match" (
+                              regular_expression
+                            )
+                          )
+                        ).as(:oneline),
+                        "level" arg,
+                        "flag" ("active-directory-authentication" | "configuration" | "db" | "ip-user-mapping" | "ip-user-probe" | "ipc" | "user-group-mapping" | "wmic" | "all").as(:oneline)
+                      )
+                    )
+                  )
                 )
             )
         ),
@@ -32690,6 +32705,9 @@ rule(:lr_interfaces_type) do
                                 ),
                                 c(
                                   "isid-list" arg
+                                ),
+                                "storm-control" (
+                                  storm_control
                                 )
                             )
                         ),
@@ -38369,3 +38387,24 @@ rule(:service_nat_object) do
     )
   )
 end
+
+rule(:storm_control) do
+  c(
+    "default",
+    "action-shutdown",
+    "interface" ("all" | "name") (
+      c(
+        "bandwidth" arg,
+        "no-broadcast",
+        "no-unknown-unicast",
+        "level" arg,
+        c(
+          "multicast",
+          "no-multicast",
+          "no-registered-multicast",
+          "no-unregistered-multicast"
+        )
+      )
+    )
+  )
+end

data/junoser.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "nokogiri"
   spec.add_development_dependency "test-unit"
 end

data/lib/junoser/development.rb

@@ -1,2 +1,3 @@
+require 'underscorable'
 require 'junoser/xsd/parsable'
 require 'junoser/ruler'

data/lib/junoser/parser.rb

@@ -1995,6 +1995,9 @@ module Junoser
                                                       ),
                                                       c(
                                                         a(str("isid-list"), arg)
+                                                      ),
+                                                      b(str("storm-control"),
+                                                        storm_control
                                                       )
                                                   )
                                               ),
@@ -7010,24 +7013,7 @@ module Junoser
                 )
             ),
             b(str("storm-control"),
-                c(
-                    str("default"),
-                    str("action-shutdown"),
-                    a(str("interface"), str("all") | arg,
-                        c(
-                            a(str("bandwidth"), arg),
-                            str("no-broadcast"),
-                            str("no-unknown-unicast"),
-                            a(str("level"), arg),
-                            c(
-                              str("multicast"),
-                              str("no-multicast"),
-                              str("no-registered-multicast"),
-                              str("no-unregistered-multicast")
-                            )
-                        )
-                    )
-                )
+              storm_control
             )
         )
     end
@@ -10315,6 +10301,9 @@ module Junoser
                                     ),
                                     c(
                                       a(str("isid-list"), arg)
+                                    ),
+                                    b(str("storm-control"),
+                                      storm_control
                                     )
                                 )
                             ),
@@ -14646,6 +14635,9 @@ module Junoser
                                                     ),
                                                     c(
                                                       a(str("isid-list"), arg)
+                                                    ),
+                                                    b(str("storm-control"),
+                                                      storm_control
                                                     )
                                                 )
                                             ),
@@ -16072,7 +16064,7 @@ module Junoser
                             str("persistent-learning")
                         )
                     ),
-                    a(str("vlan"), str("all") | str("vlan-name"),
+                    a(str("vlan"), str("all") | arg,
                         c(
                             c(
                               b(str("arp-inspection"),
@@ -24328,7 +24320,7 @@ module Junoser
                     ).as(:oneline)
                 )
             ),
-            a(str("vlan"), str("all") | str("vlan-name"),
+            a(str("vlan"), str("all") | arg,
                 c(
                     str("disable"),
                     a(str("version"), arg),
@@ -24954,7 +24946,7 @@ module Junoser
                     ).as(:oneline)
                 )
             ),
-            a(str("vlan"), str("all") | str("vlan-name"),
+            a(str("vlan"), str("all") | arg,
                 c(
                     str("disable"),
                     a(str("version"), arg),
@@ -30866,7 +30858,7 @@ module Junoser
                             )
                         )
                     ),
-                    b(str("dhcp-service"),
+                    b((str("dhcp-service") | str("dhcp")),
                         c(
                             c(
                               str("disable")
@@ -31079,6 +31071,28 @@ module Junoser
                               str("disable")
                             )
                         )
+                    ),
+                    b(str("app-engine-virtual-machine-management-service"),
+                      c(
+                        b(str("traceoptions"),
+                          c(
+                            str("no-remote-trace"),
+                            b(str("file"),
+                              sca(
+                                a(str("size"), arg),
+                                a(str("files"), arg),
+                                str("world-readable"),
+                                str("no-world-readable"),
+                                b(str("match"),
+                                  regular_expression
+                                )
+                              )
+                            ).as(:oneline),
+                            a(str("level"), arg),
+                            a(str("flag"), str("active-directory-authentication") | str("configuration") | str("db") | str("ip-user-mapping") | str("ip-user-probe") | str("ipc") | str("user-group-mapping") | str("wmic") | str("all")).as(:oneline)
+                          )
+                        )
+                      )
                     )
                 )
             ),
@@ -32486,6 +32500,9 @@ module Junoser
                                     ),
                                     c(
                                       a(str("isid-list"), arg)
+                                    ),
+                                    b(str("storm-control"),
+                                      storm_control
                                     )
                                 )
                             ),
@@ -38145,5 +38162,26 @@ module Junoser
         )
       )
     end
+
+    rule(:storm_control) do
+      c(
+        str("default"),
+        str("action-shutdown"),
+        a(str("interface"), str("all") | arg,
+          c(
+            a(str("bandwidth"), arg),
+            str("no-broadcast"),
+            str("no-unknown-unicast"),
+            a(str("level"), arg),
+            c(
+              str("multicast"),
+              str("no-multicast"),
+              str("no-registered-multicast"),
+              str("no-unregistered-multicast")
+            )
+          )
+        )
+      )
+    end
   end
 end

data/lib/junoser/ruler.rb

@@ -49,10 +49,12 @@ module Junoser
 
       str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
       str.gsub! '"vlan" ("id-name" | "all")', '"vlan" ("all" | arg)'
+      str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
       str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
       str.gsub! '"path-list" arg (', 'b(ipaddr,'
+      str.gsub! '"dhcp-service" (', '("dhcp-service" | "dhcp") ('
 
       str.gsub!(/(s\(\s*)"address" arg/) { "#{$1}arg" }
       str.gsub!(/^(\s*"idle-timeout" \(\s*c\(\s*c\(\s*"forever",\s*)"timeout" arg/) { "#{$1}arg" }

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/junoser/xsd/element.rb

@@ -1,4 +1,3 @@
-require 'active_support/inflector'
 require 'junoser/xsd/base'
 require 'junoser/xsd/complex_type'
 

data/lib/junoser/xsd/parsable.rb

@@ -1,4 +1,3 @@
-require 'active_support/inflector'
 require 'junoser/xsd/complex_type'
 require 'junoser/xsd/element'
 require 'nokogiri'

data/lib/underscorable.rb

@@ -0,0 +1,15 @@
+module Underscorable
+  # Port from activesupport-4.2.7.1/lib/active_support/inflector/methods.rb
+  def underscore
+    return self unless self =~ /[A-Z-]|::/
+    word = self.to_s.gsub(/::/, '/')
+    word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)((?=a)b)(?=\b|[^a-z])/) { "#{$1 && '_'}#{$2.downcase}" }
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+end
+
+String.include Underscorable

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +121,7 @@ files:
 - lib/junoser/xsd/restriction.rb
 - lib/junoser/xsd/sequence.rb
 - lib/junoser/xsd/simple_content.rb
+- lib/underscorable.rb
 homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
@@ -154,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: PEG parser for JUNOS configuration.