junoser 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7776ec2f4f218bc73f44b1c5aa16c13a3ce0318c742e510ca0e5baacd9d240
-  data.tar.gz: 9e41514a27fa4bfa7a2a176dbc43ffa87223f327533da52ee861f75eee0ea43a
+  metadata.gz: d2f7cf47c90df6c85894a4139d839ef0508328017b341f1b36a3d33af1c80636
+  data.tar.gz: 052afe8daf0090bcc2345a92e1e6b32787a4feb7cfcd45906a58ab46fd7ac822
 SHA512:
-  metadata.gz: db7dd7a497c0755db7fe171eb1480d1be3735bdf158fb4551b3925ac1e800f43aa41fe14290d12d31d960d6557c684fd62da80a1e09a75ddd4f01b3e3f0457e3
-  data.tar.gz: d83a17169dbf5b833c4dfb0d8a68835ea9cb1ed9d2188360445a5d5132bdeb3c38c72c84f17ac22e4b42778c1ba3e240e200d293cbc5b2f1267a3405c0d29760
+  metadata.gz: 9b19b660982613861c9747782ff5002c7dc21cab047081e421bf0b45a920b2f40d27125b72e951e780c15cbf8653c632cbee44323553d6b83ff3bbc5276c34bf
+  data.tar.gz: b66c59b3d594714a9dada165a97930e326f82283a4a3a2c9270168197e0072ff09e5d44855582e96b5472e584311d76f4d14a53612d4464898f7dcfb1c9e8ead

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.3.12] - 2020-02-06
+
+### Fixed
+
+* "insert" statement whose last two tokens are keyword and argument, with the following single "before" (or "after") argument
+  * eg) insert protocols bgp group foo export bar insert baz
+
 ## [0.3.11] - 2020-01-28
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.3.10)
+    junoser (0.3.12)
       parslet
 
 GEM
@@ -27,4 +27,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/lib/junoser/squash.rb

@@ -22,9 +22,9 @@ module Junoser
         when /^activate /
           delete_lines l.gsub(/^activate /, 'deactivate ')
         when /^insert (.*) before (.*)/
-          insert_before insert_pattern("set #{$1}"), $2
+          insert_before "set #{$1}", $2
         when /^insert (.*) after (.*)/
-          insert_after insert_pattern("set #{$1}"), $2
+          insert_after "set #{$1}", $2
         end
       end
 
@@ -72,18 +72,14 @@ module Junoser
       "(#{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}" }
+    def insert_before(statement_to_insert, key_statement)
+      key_tokens = key_statement.strip.split
+      key_statement = (statement_to_insert.strip.split[0..-(key_tokens.size+1)] + key_tokens).join(' ')
 
-      lines_to_insert = @lines.select { |l| l =~ /#{pattern_to_insert}/ }
-      @lines.reject! { |l| l =~ /#{pattern_to_insert}/ }
+      lines_to_insert = @lines.select { |l| l.include?(statement_to_insert) }
+      @lines.reject! { |l| l.include?(statement_to_insert) }
 
-      key_index = @lines.index { |l| l =~ /#{key_pattern}/ }
+      key_index = @lines.index { |l| l.include?(key_statement) }
       @lines.insert(key_index, lines_to_insert).flatten!
     end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet