From 97cb2fdaa9e6400d94e90dee024cac0aa62465bf Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:04:53 -0500
Subject: Add more extensive pattern matching

---
 lib/oxidized/model/routeros.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model/routeros.rb')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 4822500..216252a 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From 9f4cd0105e6cd8a39771d3340e14b7cfca5440e2 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:44:14 -0500
Subject: Changing {0,} -> *

---
 lib/oxidized/model/routeros.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model/routeros.rb')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 216252a..fc96512 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+)*\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From d6cdfc119f32bca57c69deb8bcdc83999a84740d Mon Sep 17 00:00:00 2001
From: gerard780 <gerard780@users.noreply.github.com>
Date: Tue, 6 Sep 2016 15:25:54 -0400
Subject: Remove extra new lines added by export command

---
 lib/oxidized/model/routeros.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized/model/routeros.rb')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index fc96512..a92ad5e 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -8,6 +8,7 @@ class RouterOS < Oxidized::Model
 
   cmd '/export' do |cfg|
     cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
+    cfg.gsub! /\\\r\n\s+/, ''   # strip new line
     cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
     cfg.join("\n") + "\n"
   end
-- 
cgit v1.2.1