junoser 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4593e83820c87e14eb51c1bc781a7ef739a30fd81ddbb0438a144b637897d8bc
-  data.tar.gz: 9334a3f8c869085ac0d435f48b0cbc3add246b105f49215d72b355a8d2880dc6
+  metadata.gz: 3a3ba4fa96e3b50240e889334a924403ae8cf4f508c1e86120450aa0760fe75f
+  data.tar.gz: 6f034ac0b34aff7aed1f7aed0d87b902996ae1cdbbc0d0f6ed2896f50caaf939
 SHA512:
-  metadata.gz: c7c4846a31f13cb84d6c82d08c6dd07b21cfa4941799bfff38f82e353db29bc8ffb8c8663b7b29cb658bc37eba9b49802d09c15c5c07ada303bdf7fee1654ca8
-  data.tar.gz: 1802d0a8ba430e735d4f5f6c96264adf71396c30010a7fc8d620ad5ccb040b15595bd9e0f88f5db5ccd6c4fc980887d7f25f74a29ff539a0477467b8c4c2ba09
+  metadata.gz: ef0675b148025de1a36a95ec7bcd0ea92863a6740c6122ba6c675e02400ae7ab0cc59237083a4d01c11a56b8c070285b4817d7067fd702f7cd07990d4616cd19
+  data.tar.gz: c5cb5388660e8dd1605e39e7f1a02a2f7b118841d60927865e86ceea1d53c7a92b92390c552f60d3f33ea7d6dd8c7df94151e70a26a26bd0fe48e1d49029abb9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.3.10] - 2020-01-09
+
+### Added
+
+* Experimentally support "insert" statement
+
+### Fixed
+
+* junoser-squash unexpectedly kept statements intact due to tokenization bug
+* junoser-squash unexpectedly removed "deactivate" statements
+* "deactivate" to "inactive:" translation during "junoser -s"
+
 ## [0.3.9] - 2019-11-17
 
 ### Fixed
@@ -15,14 +27,14 @@
 
 ## [0.3.7] - 2019-09-03
 
-### Fixed
-
-* "apply-groups" translation between "display set" and structured form
-
 ### Added
 
 * Support "deactivate ... apply-groups"
 
+### Fixed
+
+* "apply-groups" translation between "display set" and structured form
+
 
 ## [0.3.6] - 2019-08-25
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.3.9)
+    junoser (0.3.10)
       parslet
 
 GEM

data/LICENSE.txt

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

data/lib/junoser/display/config_store.rb

@@ -78,7 +78,7 @@ module Junoser
       def match(str)
         each do |statement, store|
           # NOTE: return the first object
-          return [statement, store] if str =~ /^#{Regexp.escape(statement)}(\b|$)/
+          return [statement, store] if str =~ /^#{Regexp.escape(statement)}((?= )|$)/
         end
 
         []
@@ -87,7 +87,7 @@ module Junoser
       def inverse_match(str)
         each do |statement, store|
           # NOTE: return the first object
-          return [statement, store] if statement =~ /^#{str}\b/
+          return [statement, store] if statement =~ /^#{str}(?= )/
         end
 
         []

data/lib/junoser/squash.rb

@@ -2,62 +2,12 @@ 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
-
-    rule(enum: simple(:str)) do
-      str
-    end
-
-    rule(enum: 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
+      @transformer = Junoser::Transformer.new
     end
 
     def transform
@@ -65,11 +15,14 @@ module Junoser
       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)
+        when /^(set|deactivate) /
+          @lines << l
+        when /^delete /
+          delete_lines delete_pattern(l.gsub(/^delete /, 'set '))
+        when /^insert (.*) before (.*)/
+          insert_before insert_pattern("set #{$1}"), $2
+        when /^insert (.*) after (.*)/
+          insert_after insert_pattern("set #{$1}"), $2
         end
       end
 
@@ -80,7 +33,7 @@ module Junoser
     private
 
     def remove_subcommand(lines)
-      lines.each_with_index do |l,i|
+      lines.each_with_index do |l, i|
         lines[i..-1].each do |l2|
           if l.include?(l2) and l != l2
             lines.delete(l2)
@@ -94,5 +47,48 @@ module Junoser
         l.sub!(/#{pattern}/) { $1 }
       end
     end
+
+    def split_last_token(line)
+      tokens = join_arg(@transformer.apply(@parser.parse(line))).split("\n")
+      tokens.map! { |t|
+        t.gsub!(/arg\((.*)\)/) { "#$1" } # Strip arg
+        Regexp.escape(t.strip)
+      }
+
+      [tokens[0..-2].join(' '), tokens.last]
+    end
+
+    # Ported from lib/junoser/display/config_store.rb
+    def join_arg(str)
+      str.gsub!(/\narg\((.*)\)$/) { " #$1" }
+      str.gsub!(/arg\((.*)\)/) { "#$1" }
+      str
+    end
+
+    def delete_pattern(line)
+      line, last_token = split_last_token(line)
+      "(#{line}\s+)#{last_token}.*"
+    end
+
+    def insert_pattern(line)
+      line, last_token = split_last_token(line)
+      "(#{line})\s+#{last_token}"
+    end
+
+    def insert_before(pattern_to_insert, key_token)
+      key_pattern = pattern_to_insert.sub(/\).*/) { ") #{key_token}" }
+
+      lines_to_insert = @lines.select { |l| l =~ /#{pattern_to_insert}/ }
+      @lines.reject! { |l| l =~ /#{pattern_to_insert}/ }
+
+      key_index = @lines.index { |l| l =~ /#{key_pattern}/ }
+      @lines.insert(key_index, lines_to_insert).flatten!
+    end
+
+    def insert_after(pattern_to_insert, key_token)
+      @lines.reverse!
+      insert_before pattern_to_insert, key_token
+      @lines.reverse!
+    end
   end
 end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: PEG parser for JUNOS configuration.