dock_driver 0.2.0 → 0.2.1

data/History.rdoc

@@ -1,5 +1,11 @@
 = History
 
+=== 0.2.1 / 2012-11-21
+
+* 2 minor enhancements
+  * Whitespace Fixes
+  * Better example.dock_driver.yml
+
 === 0.2.0 / 2012-11-21
 
 * 1 major enhancement

data/data/example.dock_driver.yml

@@ -1,16 +1,38 @@
 ---
-dock_driver:
-    command: 'dzen2'
-    template: ''
 dock:
-    items:
-        - name: gronald
-          command: foo --bar baz
-          frequency: 1.5
-        - name: aphrodite
-          command: feeblebeeble -vqnf 42
-          scan: 'Gort: (\d+)'
-          frequency: 3
+
+  template: 
+    '
+    ^fg(gray75)<%= user %>^fg(gray50)@^fg(gray75)<%= host %>
+    ^fg(skyblue2)<%= day %>
+    ^fg(skyblue3)<%= date %>
+    ^fg(white)mail <%= mail %>
+    ^fg(white)uptime ^fg(skyblue4)<%= uptime %>
+    '
+  command:
+    dzen2 -dock -ta r -x 0 -y 0 -w 1920 -h 18 -bg black -fg white
+    -fn "-*-terminus-medium-r-*-*-10-*-*-*-*-*-*-*"
+    -e "button3="
+
+  items:
+    - name: day
+      command: date '+%A'
+      frequency: 60
+    - name: date
+      command: date '+%F'
+      frequency: 1
+    - name: uptime
+      command: uptime
+      frequency: 5
+    - name: user
+      command: 'whoami'
+      frequency: 600
+    - name: host
+      command: 'hostname'
+      frequency: 600
+    - name: mail
+      command: 'dock_mail.rb'
+
 logging:
-    __default__: warn (color)
-    dock_driver: debug (color)
+  __default__: warn (color)
+  dock_driver: warn (color)

data/lib/dock_driver/dock.rb

@@ -41,7 +41,7 @@ module DockDriver
             merged    = CONFIG_DEFAULTS.merge( section )
             @items    = merged[:items]
             @command  = merged[:command]
-            @template = ERB.new( merged[:template] )
+            @template = ERB.new( merged[:template].strip.gsub( /\s+/, ' ' ) )
         end
 
         #####################################################################
@@ -111,7 +111,7 @@ module DockDriver
         ### Provide output for the dock.
         def to_s
             vbind = OpenStruct.new( self.items ).send( :binding )
-            return self.class.template.result( vbind ).gsub( /\s+/, ' ' )
+            return self.class.template.result( vbind )
         end
 
     end

data/lib/dock_driver/dock_item.rb

@@ -31,10 +31,10 @@ module DockDriver
         def run
             self.log.debug "%s is running." % self.name
             loop do
-                sleep self.frequency
+                self.output = `#{self.command}`.strip.gsub( /\s+/, ' ')
                 # TODO output scanning
-                self.output = `#{self.command}`
                 self.notify_observers
+                sleep self.frequency
             end
         end
 

data/lib/dock_driver.rb

@@ -18,10 +18,10 @@ module DockDriver
     log_as :dock_driver
 
     # Project version.
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     # Project revision.
-    REVISION = %$Revision: aa11bde4afd8 $
+    REVISION = %$Revision: d740e7d038cb $
 
     # The default location of a user's config file.
     USER_CONFIG_FILE = Pathname( '~/.dock_driver.yml' )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dock_driver
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Michael Hix
@@ -59,11 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 3
-        - 1
-        version: "3.1"
+        - 3
+        version: "3.3"
   type: :development
   name: hoe
   version_requirements: *id002