bump

ajenti · May 4, 2015 · fd05e32 · fd05e32
1 parent b523763
commit fd05e32
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 22 deletions.
diff --git a/ajenti-core/aj/__init__.py b/ajenti-core/aj/__init__.py
@@ -7,7 +7,7 @@
 
 # imported by installer, no 3rd party imports here!
 
-__version__ = '2.0.35'
+__version__ = '2.0.36'
 
 # Global state
 

diff --git a/plugins/ace/.last-upload b/plugins/ace/.last-upload
@@ -1 +1 @@
-1429540561.59
+1429718578.62
diff --git a/plugins/augeas/.last-upload b/plugins/augeas/.last-upload
@@ -1 +1 @@
-1429540624.68
+1429718641.73
diff --git a/plugins/auth_users/.last-upload b/plugins/auth_users/.last-upload
@@ -1 +1 @@
-1429540344.44
+1429718215.75
diff --git a/plugins/core/.last-upload b/plugins/core/.last-upload
@@ -1 +1 @@
-1429540614.58
+1429718629.7
diff --git a/plugins/dashboard/.last-upload b/plugins/dashboard/.last-upload
@@ -1 +1 @@
-1429540313.03
+1429718174.14
diff --git a/plugins/datetime/.last-upload b/plugins/datetime/.last-upload
@@ -1 +1 @@
-1429540384.63
+1429718253.1
diff --git a/plugins/filemanager/.last-upload b/plugins/filemanager/.last-upload
@@ -1 +1 @@
-1429540380.39
+1429718248.69
diff --git a/plugins/filesystem/.last-upload b/plugins/filesystem/.last-upload
@@ -1 +1 @@
-1429540636.13
+1429718653.22
diff --git a/plugins/network/.last-upload b/plugins/network/.last-upload
@@ -1 +1 @@
-1429540339.68
+1429718210.53
diff --git a/plugins/notepad/.last-upload b/plugins/notepad/.last-upload
@@ -1 +1 @@
-1429540318.12
+1429718187.23
diff --git a/plugins/packages/.last-upload b/plugins/packages/.last-upload
@@ -1 +1 @@
-1429540364.95
+1429718234.89
diff --git a/plugins/passwd/.last-upload b/plugins/passwd/.last-upload
@@ -1 +1 @@
-1429540323.02
+1429718194.82
diff --git a/plugins/plugins/.last-upload b/plugins/plugins/.last-upload
@@ -1 +1 @@
-1429540379.01
+1429718243.81
diff --git a/plugins/power/.last-upload b/plugins/power/.last-upload
@@ -1 +1 @@
-1429540619.04
+1429718635.29
diff --git a/plugins/services/.last-upload b/plugins/services/.last-upload
@@ -1 +1 @@
-1429540355.65
+1429718225.97
diff --git a/plugins/settings/.last-upload b/plugins/settings/.last-upload
@@ -1 +1 @@
-1429540332.76
+1429718204.11
diff --git a/plugins/supervisor/.last-upload b/plugins/supervisor/.last-upload
@@ -1 +1 @@
-1429540334.5
+1429718205.23
diff --git a/plugins/supervisor/supervisor.aug b/plugins/supervisor/supervisor.aug
@@ -1,9 +1,36 @@
 module Supervisor =
 
-let comment    = IniFile.comment /[#;]/ "#"
+let comment = 
+    IniFile.comment /[#;]/ "#"
+
+let title_comment = 
+    [ label "#titlecomment" . del /[ \t]*[#;][ \t]*/ " # " . store /[^ \t\r\n]([^\r\n]*[^ \t\r\n])?/ ]
+
+let title_noeol (kw:regexp)
+    = Util.del_str "[" . key kw . Util.del_str "]" . title_comment? . Util.eol
+
+
+let indented_title_noeol (kw:regexp)
+   = Util.indent . title_noeol kw
+
+let entry_generic_nocomment (kw:lens) (sep:lens)
+                            (comment_re:regexp) (comment:lens) =
+     let bare_re_noquot = (/[^ \t\r\n]/ - comment_re)
+  in let bare_re = (/[^\r\n]/ - comment_re)+
+  in let no_quot = /[^"\r\n]*/
+  in let bare = (store (bare_re_noquot . (bare_re* . bare_re_noquot)?))
+  in [ kw . sep . (Sep.opt_space . bare)? . (comment|Util.eol) ]
+
+let entry_generic (kw:lens) (sep:lens) (comment_re:regexp) (comment:lens) =
+  entry_generic_nocomment kw sep comment_re comment | comment
+
+let indented_entry (kw:regexp) (sep:lens) (comment:lens) =
+     entry_generic (Util.indent . key kw) sep IniFile.comment_re comment
+
+
 let sep        = IniFile.sep "=" "="
-let entry      = IniFile.indented_entry IniFile.entry_re sep comment
-let title      = IniFile.indented_title IniFile.record_re
+let entry      = indented_entry IniFile.entry_re sep comment
+let title      = indented_title_noeol IniFile.record_re
 let record     = IniFile.record title entry
 let lns        = IniFile.lns record comment
 let filter = (incl "/etc/supervisor/supervisord.conf") . Util.stdexcl

diff --git a/plugins/terminal/.last-upload b/plugins/terminal/.last-upload
@@ -1 +1 @@
-1429540396.83
+1429718263.05
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
@@ -6,3 +6,4 @@ python-exconsole>=0.1.5
 requests>=0.12.0
 reconfigure>=0.1.41
 pyOpenSSL
+psutil>=2