Merge branch 'master' of http://git.sysphere.org/vicious

Conflicts:
	contrib/init.lua
	helpers.lua
	widgets/init.lua

CHANGES

@@ -2,6 +2,19 @@
 Full changelog is available online:
     http://git.sysphere.org/vicious/log/?showmsg=1
 ---------------------------------------------------
+dcc2b60 vicious: load widget modules only when needed
+06e8f7c mpd: allow named keys or positional arguments
+729ceb7 dio: import string.match()
+c2f7fbc dio: provide stats for all devices, rewritten by Joerg
+6522f58 cpu: another 10 percent optimization from Joerg
+753ce61 cpu: calculation and optimization fixes by Joerg
+f85d944 gmail: fixed misleading comment
+31d7b2f bat: fixed "no such device" for current and power
+d385843 helpers: properly handle magic characters
+6ddad31 bat: added power_now support
+fd0718e contrib: added a README with pulse.lua documented
+9f4302c contrib: rewrite pulse module
+5160cfe Next release, tag 2.0.2
 add54f8 README: added missing register() documentation
 fe2e432 TODO: fix contrib/sensors for Ian
 7625933 wifi: proper fix for SSID regexp

README

@@ -29,9 +29,9 @@ $XDG_CONFIG_HOME (usually ~/.config):
 
   $ mv vicious $XDG_CONFIG_HOME/awesome/
 
-If you want you can disable widgets you will not use, to avoid having
-useless modules sitting in your memory. You can comment out any widget
-type from the "Configure widgets" list in the widgets/init.lua file.
+Vicious will only load modules for widget types you intend to use in
+your awesome configuration, to avoid having useless modules sitting in
+your memory.
 
 Then add the following to the top of your rc.lua:
 

TODO

@@ -5,14 +5,14 @@
 
 
 * Vicious
+** TODO Implement intelligent multigraph support
+** TODO Expand raid to grab data for all available devices
 ** TODO Consider commiting power drain support to bat.lua
 ** TODO Document contrib widgets in contrib/README
-** TODO Consider multigraph, graph stacking, support
 ** TODO Complete the hddtemp fix
    - In certain setups regexp does not match all devices
      - The regexp catches the first device name, but last stats
      - Shortening the match introduced new problems IIRC
-** TODO Expand raid to grab data for all available devices
 ** TODO Add fan speed to thermal.lua
 ** TODO Fix contrib/sensors for Ian
    - > it does work and provides the lm_sensors

contrib/init.lua

@@ -5,12 +5,13 @@
 --  * (c) 2010, Adrian C. <anrxc@sysphere.org>
 ---------------------------------------------------
 
-
+-- {{{ Setup environment
 local setmetatable = setmetatable
-local require_once = require("vicious.helpers").require_once
+local wrequire = require("vicious.helpers").wrequire
 
 -- Vicious: widgets for the awesome window manager
 module("vicious.contrib")
+-- }}}
 
 -- Load modules at runtime as needed
-setmetatable(_M,   {__index = require_once} )
+setmetatable(_M, { __index = wrequire })

helpers.lua

@@ -9,6 +9,8 @@
 
 -- {{{ Grab environment
 local pairs = pairs
+local rawget = rawget
+local require = require
 local tonumber = tonumber
 local io = { open = io.open }
 local setmetatable = setmetatable
@@ -31,11 +33,10 @@ local scroller = {}
 -- }}}
 
 -- {{{ Helper functions
-
--- {{{ Require a submodule once
-function require_once(t,  key)                                                                                        
-	local module = rawget(t,  key)                                                                                
-	return module or require(t._NAME.."."..key)
+-- {{{ Loader of vicious modules
+function wrequire(table,  key)
+    local module = rawget(table,  key)
+    return module or require(table._NAME .. "." .. key)
 end
 -- }}}
 

widgets/init.lua

@@ -5,11 +5,13 @@
 --  * (c) 2010, Adrian C. <anrxc@sysphere.org>
 ---------------------------------------------------
 
+-- {{{ Setup environment
 local setmetatable = setmetatable
-local require_once = require("vicious.helpers").require_once
+local wrequire = require("vicious.helpers").wrequire
 
 -- Vicious: widgets for the awesome window manager
 module("vicious.widgets")
+-- }}}
 
 -- Load modules at runtime as needed
-setmetatable(_M,  {__index = require_once} )
+setmetatable(_M, { __index = wrequire })