Floppy-currentcost 0.2.2 → 0.2.3

data/README

@@ -36,6 +36,8 @@ usage. To use the program, run:
   currentcost_tray_monitor.rb -p your_serial_port_name
 
 The program requires the Gtk2 libraries for Ruby (available from
-http://ruby-gnome2.sourceforge.jp/).
+http://ruby-gnome2.sourceforge.jp/). If the EEML gem (http://github.com/Floppy/eeml-ruby)
+is installed, it can also serve your power data over an HTTP connection to a system like
+Pachube (http://www.pachube.com).
 
 For more details, see http://github.com/Floppy/currentcost-ruby/wikis/currentcosttraymonitor

data/bin/currentcost_tray_monitor.rb

@@ -8,15 +8,29 @@ require 'rubygems'
 require 'currentcost'
 require 'optparse'
 
+# If EEML is available, start a simple server which will serve power information
+begin
+  require 'eeml'
+  require 'webrick'
+  $eeml_server_enabled = true
+rescue LoadError
+  $eeml_server_enabled = false
+end
+
+
 # Command-line options
 options = {:port => '/dev/ttyS0'}
 OptionParser.new do |opts|
   opts.on("-p", "--serial_port SERIAL_PORT", "serial port") do |p|
     options[:port] = p
-  end  
+  end
+  if $eeml_server_enabled == true
+    opts.on("-h", "--http_port HTTP_PORT", "http port") do |h|
+      options[:http_port] = h
+    end
+  end
 end.parse!
 
-
 # Pixbuf images - generated from PNG files with gdk-pixbuf-csource --raw
 GREY =
   # Pixbuf magic (0x47646b50)
@@ -300,6 +314,7 @@ about_item.signal_connect('activate') {
 
 quit_item.signal_connect('activate') {
   $meter.close
+  $eeml_server.shutdown if $eeml_server_enabled && $eeml_server.status == :Running
   Gtk.main_quit
 }
 
@@ -326,6 +341,11 @@ class MeterObserver
     end
     # Set tooltip
     $tray.tooltip = "#{watts} watts"
+    # Update EEML data 
+    if $eeml_server_enabled && $eeml_server.status == :Running
+      $eeml_environment[0].value = watts
+      $eeml_environment.set_updated!
+    end
   rescue
     $tray.pixbuf = $grey_pixbuf
   end
@@ -336,5 +356,28 @@ $meter = CurrentCost::Meter.new(options[:port])
 obs = MeterObserver.new
 $meter.add_observer(obs)
 
+# Create EEML HTTP server if options are set
+if $eeml_server_enabled && options[:http_port]
+  # Create EEML environment
+  $eeml_environment = EEML::Environment.new
+  # Create data object
+  data = EEML::Data.new(0)
+  data.unit = EEML::Unit.new("Watts", :symbol => 'W', :type => :derivedSI)
+  $eeml_environment << data
+  # Create WEBrick server
+  $eeml_server = WEBrick::HTTPServer.new( :Port => options[:http_port] )
+  # Create a simple webrick servlet for index.eeml
+  class EEMLServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET(request, response)
+      response.status = 200
+      response['Content-Type'] = "text/xml"
+      response.body = $eeml_environment.to_eeml
+    end
+  end
+  $eeml_server.mount("/index.eeml", EEMLServlet)
+  trap("INT") {$eeml_server.shutdown}
+  Thread.new{$eeml_server.start}
+end
+
 # Go
 Gtk.main

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-currentcost
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2008-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency