junoser 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5bbbf4cbf8b352da5a17d9ad7892d3fa06841ec9
-  data.tar.gz: fc30976c13fd9d3d4f87369f4494b4e0561d353c
+SHA256:
+  metadata.gz: c57ce175272ab8d4f63ed240702c73a709a70103f27f8cf0a6fd77165b08f2fc
+  data.tar.gz: b9cfb28b26ae82b90d3cf2d2609f7d522893e31d3f9f860a09a10f02764896e5
 SHA512:
-  metadata.gz: 594422e8d706bed8b741216bdb2628a004505ebcd5fd277695877e63e5230e2ecd5898f0f47fe12491a5473042a017bda7029940f57352d03b53fe08d34dde7f
-  data.tar.gz: 63d495c8afc1fbd706039429b1f603bfa9644e8976556677926aebfbe99d560be83bacdb1670da27ef15a20df804c2bf290e8b2e35ab1ef7a044f30aa9902116
+  metadata.gz: bfa6f43c77d796fae64975faa7163d3f10accf8068bfb4efd736b5acb89ccc1ce20827848a9fba6dc96aa3899b632970cd403abb7c8a0ce7e8f852a7a22a0559
+  data.tar.gz: 25192747b57063c0a77752ebccd7470b944150f8413a75d1c84854385357e6b41a0e5587d5505daa97227d16eb4023367580f67e36d17be19a156cd19402154d

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Shintaro Kojima
+Copyright (c) 2018 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) 2017 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
+Copyright (c) 2018 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).

data/exe/junoser-squash

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'pathname'
+
+$: << File.expand_path('../../lib', Pathname.new(__FILE__).realpath)
+require 'junoser/squash'
+
+command = :squash
+opts = OptionParser.new do |opts|
+  opts.banner = 'junoser-squash: squash config file.'
+  opts.define_head 'Usage: junoser-squash [path]'
+
+  opts.on_tail '-h', '--help', 'Show this message' do
+    puts opts
+    exit
+  end
+end
+opts.parse!
+case command
+  when :squash
+    puts Junoser::Squash.new($<).transform
+  else
+    puts opts
+    abort
+end

data/lib/junoser/parser.rb

@@ -89563,11 +89563,7 @@ module Junoser
     end
 
     rule(:server_group_type) do
-        c(
-                c(
-                    arg
-                )
-        )
+        s(arg, arg)
     end
 
     rule(:server_leasequery_type) do

data/lib/junoser/ruler.rb

@@ -134,6 +134,7 @@ module Junoser
       str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
       str.gsub!(/^(rule\(:trace_file_type\) do\s*)c\(\s*arg,/) { "#{$1}sca(" }
       str.gsub!(/^(rule\(:archive_object\) do\s*)c\(/) { "#{$1}sc(" }
+      str.gsub!(/^(rule\(:server_group_type\) do\s*)c\(\s*c\(\s*arg\s*\)\s*\)/) { "#{$1}s(arg, arg)" }
       str.gsub!(/^(rule\(:rib_group_inet_type\) do)\s*c\(\s*arg/) do
         format([$1,
                 '  ca(',

data/lib/junoser/squash.rb

@@ -0,0 +1,90 @@
+require 'junoser'
+require 'parslet'
+
+module Junoser
+  class DeleteTransformer < Parslet::Transform
+    rule(config: simple(:config)) do
+      "(#{config.to_s} .*"
+    end
+
+    rule(config: sequence(:configs)) do
+      configs.join("\n")
+    end
+
+    rule(arg: simple(:arg)) do
+      arg
+    end
+
+    rule(label: simple(:label)) do
+      ")#{Regexp.escape(label.to_s)}"
+    end
+
+    rule(label: simple(:label), child: simple(:child)) do
+      "#{Regexp.escape(label.to_s)} #{child}"
+    end
+
+    rule(label: simple(:label), child: sequence(:children)) do
+      %[#{Regexp.escape(label.to_s)} #{children.join(' ')}]
+    end
+
+    rule(statement: simple(:statement), argument: simple(:argument)) do
+      "#{statement} #{argument}"
+    end
+
+    rule(statement: simple(:statement), argument: sequence(:arguments)) do
+      %[#{statement} #{arguments.join(' ')}]
+    end
+
+    rule(oneline: simple(:str)) do
+      str
+    end
+
+    rule(oneline: sequence(:strs)) do
+      strs.join(' ')
+    end
+  end
+
+  class Squash
+    def initialize(io_or_string)
+      @input = io_or_string
+      @lines = []
+      @parser = Junoser::Parser.new
+      @transformer = DeleteTransformer.new
+    end
+
+    def transform
+      config = Junoser::Input.new(@input).read.split("\n")
+      config.each do |l|
+        l.strip!
+        case l
+          when /^set /
+            @lines << l
+          when /^delete /
+            to_delete = @parser.parse(l.gsub(/^delete /, 'set '))
+            delete_lines @transformer.apply(to_delete)
+        end
+      end
+
+      @lines.uniq!
+      remove_subcommand(@lines).map(&:strip).join("\n")
+    end
+
+    private
+
+    def remove_subcommand(lines)
+      lines.each_with_index do |l,i|
+        lines[i..-1].each do |l2|
+          if l.include?(l2) and l != l2
+            lines.delete(l2)
+          end
+        end
+      end
+    end
+
+    def delete_lines(pattern)
+      @lines.each do |l|
+        l.sub!(/#{pattern}/) { $1 }
+      end
+    end
+  end
+end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -85,6 +85,7 @@ email:
 - goodies@codeout.net
 executables:
 - junoser
+- junoser-squash
 extensions: []
 extra_rdoc_files: []
 files:
@@ -100,6 +101,7 @@ files:
 - example/vmx-17.2R1.13.rb
 - example/vsrx-12.1.x47.rb
 - exe/junoser
+- exe/junoser-squash
 - junoser.gemspec
 - lib/junoser.rb
 - lib/junoser/cli.rb
@@ -111,6 +113,7 @@ files:
 - lib/junoser/input.rb
 - lib/junoser/parser.rb
 - lib/junoser/ruler.rb
+- lib/junoser/squash.rb
 - lib/junoser/transformer.rb
 - lib/junoser/version.rb
 - lib/junoser/xsd/base.rb
@@ -144,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: PEG parser for JUNOS configuration.