[augeas-devel] [PATCH] securetty: added handling of emtpy lines/comments

[Frederik Wagner]

* lenses/securetty.aug:
        added handling of comments and empty lines
* lenses/tests/test_securetty.aug:
        added test for enhanced lens
---
 lenses/securetty.aug            |    8 +++++---
 lenses/tests/test_securetty.aug |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lenses/securetty.aug b/lenses/securetty.aug
index 87e9115..1b16217 100644
--- a/lenses/securetty.aug
+++ b/lenses/securetty.aug
@@ -5,11 +5,13 @@
 module Securetty =
    autoload xfm

-   let word = /[^ \t\n]+/
+   let word = /[^ \t\n#]+/
    let eol = Util.eol
+   let empty = Util.empty
+   let comment = Util.comment

-   let record = [ seq "securetty" . store word . eol ]
-   let lns = record*
+   let record = [ seq "securetty" . store word . (comment|eol) ]
+   let lns = ( empty | comment | record )*

    let filter = (incl "/etc/securetty")
    let xfm = transform lns filter
diff --git a/lenses/tests/test_securetty.aug b/lenses/tests/test_securetty.aug
index 8d3e9bf..c257a0d 100644
--- a/lenses/tests/test_securetty.aug
+++ b/lenses/tests/test_securetty.aug
@@ -8,3 +8,25 @@ module Test_securetty =
     { "1" = "tty0" }
     { "2" = "tty1" }
     { "3" = "tty2" }
+
+ (* complete test *)
+ let complete = "# some comment
+
+tty0
+# X11 display
+:0.0
+
+console  # allow root from console
+"
+
+ (* declare the lens to test and the resulting tree *)
+ test Securetty.lns get complete =
+    { "#comment" = "some comment" }
+    {}
+    { "1" = "tty0" }
+    { "#comment" = "X11 display" }
+    { "2" = ":0.0" }
+    {}
+    { "3" = "console"
+      { "#comment" = "allow root from console" } }
+
-- 
1.7.0