msg-chumby-display 0.1.0 → 0.2.0

data/Rakefile

@@ -13,10 +13,11 @@ begin
     gem.add_dependency "flukso4r", ">= 0.3.1"
     gem.add_dependency "mongrel", ">= 1.1.5"
     gem.add_dependency "xml-simple", ">= 1.0.12"
+    gem.add_dependency "msg-flukso-localinterface", ">= 0.0.1"
     gem.bindir='bin'
     gem.executables=['msg-chumby-daemon']
     gem.default_executable = 'msg-chumby-daemon'
-    gem.files = FileList["[A-Z]*", "{bin,widget,lib,test}/**/*"]
+    gem.files = FileList["[A-Z]*", "{bin,etc,widget,lib,test}/**/*"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/msg-chumby-daemon

@@ -1,17 +1,102 @@
 #!/usr/bin/env ruby
+###
+## 
+# msg-chumby-daemon: A Ruby library for the Chumby mySmartGrid daemon
+# Copyright (C) 2010 Mathias Dalheimer (md@gonium.net)
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#  
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+##
+###
 
 libpath=File.join(File.dirname(__FILE__), '..', 'lib')
 $:.unshift << libpath 
 #puts "Using library path #{$:.join(":")}" 
 require 'rubygems'
 require 'msg-chumby-daemon.rb'
+require 'msg-flukso-localinterface.rb'
+require 'optparse'
+require 'ostruct'
 
-#TODO: Make generic. This is the ID of the CC-HPC flukso.
-sensor_id="67e9fa794684e4902730be208e9d734e"
-token="bb8640e074de14b9d444be7b1359707f"
+###
+## Commandline parser
+#
+class Optparser
+  CODES = %w[iso-2022-jp shift_jis euc-jp utf8 binary]
+  CODE_ALIASES = { "jis" => "iso-2022-jp", "sjis" => "shift_jis" }
+  #
+  # Return a structure describing the options.
+  #
+  def self.parse(args)
+    # The options specified on the command line will be collected in *options*.
+    # We set default values here.
+    options = OpenStruct.new
+    options.inplace = false
+    options.encoding = "utf8"
+    options.verbose = false
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: #{$0} [options]"
+      opts.separator ""
+      opts.separator "Specific options:"
+     opts.on("-c", "--config FILE", "The file where the configuration lives.") do |file|
+        options.config_file = file
+      end
+      # Boolean switch.
+      opts.on("-v", "--verbose", "Run verbosely") do |v|
+        options.verbose = v
+      end
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+    end
+    opts.parse!(args)
+    options
+  end
+end
+
+###
+## Script startup
+#
+options = Optparser.parse(ARGV)
+$verbose = options.verbose
+if options.config_file == nil
+  puts "Please provide a configuration file... (-h for details)."
+  exit(-1);
+end
+if not File.exists?(options.config_file) 
+  puts " Configuration file #{options.config_file} not found - no database configuration available!"
+  exit(-3);
+else
+  $CONFIG=YAML.load_file(options.config_file);
+  puts "Using this configuration:" if $verbose
+  puts "#{$CONFIG}" if $verbose
+  sensor_id=$CONFIG['SENSOR_ID']
+  token=$CONFIG['ACCESS_TOKEN']
+  if $CONFIG['FLUKSO_LOCATION_METHOD'].upcase == "STATIC"
+    host=$CONFIG['FLUKSO_HOST'];
+    port=$CONFIG['FLUKSO_PORT'];
+    discoveryMechanism=FluksoLocal::DiscoverStaticConfiguration.new(host, port);
+    location=discoveryMechanism.getFluksoLocation();
+  end
+  local_id=$CONFIG['FLUKSO_LOCAL_ID']
+  puts "Using Flukso at location #{location} with ID #{local_id}" if $verbose
+end
 
 reading_cache=MSG_Chumby::Reading_Cache.new();
-$demo_importer=MSG_Chumby::DemoReadingImporter.new(reading_cache, 400);
+#$demo_importer=MSG_Chumby::RandomReadingImporter.new(reading_cache, 400);
+$demo_importer=MSG_Chumby::LastMinuteImporter.new(reading_cache, location, local_id);
 $lasthour_importer=MSG_Chumby::LastHourImporter.new(reading_cache, sensor_id, token);
 $lastday_importer=MSG_Chumby::LastDayImporter.new(reading_cache, sensor_id, token);
 $shortterm_thread=nil;
@@ -23,25 +108,25 @@ def startAll
   $server.start();
   $shortterm_thread=Thread.new() {
     loop do
-      puts "Running short term import" 
-      begin
-        $demo_importer.doWork();
-      rescue StandardError => e
-        puts "ERROR in short-term thread: #{e}"
-      end
-      sleep(3);
+    puts "Running short term import" 
+    begin
+      $demo_importer.doWork();
+    rescue StandardError => e
+      puts "ERROR in short-term thread: #{e}"
+    end
+    sleep(3);
     end
   }
   $longterm_thread=Thread.new() {
     loop do
-      puts "Running long term import" 
-      begin
-        $lasthour_importer.doWork();
-        $lastday_importer.doWork();
-      rescue StandardError => e
-        puts "ERROR in long-term thread: #{e}"
-      end
-      sleep(10);
+    puts "Running long term import" 
+    begin
+      $lasthour_importer.doWork();
+      $lastday_importer.doWork();
+    rescue StandardError => e
+      puts "ERROR in long-term thread: #{e}"
+    end
+    sleep(10);
     end
   }
   $server.join();

data/etc/msgchumbydaemonrc

@@ -0,0 +1,8 @@
+# These are the access parameters of the CC-HPC demo flukso - replace
+# with your own parameters!
+ACCESS_TOKEN: "bb8640e074de14b9d444be7b1359707f"
+SENSOR_ID: "67e9fa794684e4902730be208e9d734e"
+FLUKSO_LOCATION_METHOD: "static"
+FLUKSO_HOST: "192.168.1.102"
+FLUKSO_PORT: "80"
+FLUKSO_LOCAL_ID: "d69779ec53a9323b695ee86b5328dd28"

data/lib/msg-chumby-daemon/http-xml-server.rb

@@ -49,6 +49,40 @@ module MSG_Chumby
     end
   end
 
+  class LastMinuteHandler < Mongrel::HttpHandler
+    def initialize(reading_cache)
+      @reading_cache=reading_cache;
+    end
+    def process(request, response)
+      response.start(200) do |head,out|
+        head["Content-Type"] = "text/xml"
+        readings=(@reading_cache.last_minute())  
+        # Even if there are currently no readings we need to provide
+        # them.
+        if readings==nil
+          readings = Array.new();
+          (0..59).each {|i|
+            timestamp = Time.now.to_i - i
+            readings << Flukso::UTCReading.new(timestamp, 0.0) 
+          }
+        end
+        flat_data=Array.new;
+        readings.each{|reading|
+          if not reading.nan? #(reading.value*1.0).nan?
+            # Skip NaN values.
+          #else
+            time=Time.at(reading.utc_timestamp);
+            current_reading=
+              {'time' => [ time.strftime("%H:%M:%S")], 'value' => [reading.value]};
+            flat_data << current_reading
+          end
+        }
+        #pp flat_data
+        out.write(XmlSimple.xml_out( { 'reading' => flat_data} ,{'RootName' => "last_minute"}));
+      end
+    end
+  end
+ 
   class LastHourHandler < Mongrel::HttpHandler
     def initialize(reading_cache)
       @reading_cache=reading_cache;
@@ -124,6 +158,7 @@ module MSG_Chumby
       @server.register("/time", TimeHandler.new)
       @server.register("/reset", ResetHandler.new)
       @server.register("/last_reading", LastReadingHandler.new(reading_cache))
+      @server.register("/last_minute", LastMinuteHandler.new(reading_cache))
       @server.register("/last_hour", LastHourHandler.new(reading_cache))
       @server.register("/last_day", LastDayHandler.new(reading_cache))
     end

data/lib/msg-chumby-daemon/reading-cache.rb

@@ -5,6 +5,8 @@ module MSG_Chumby
     def initialize
       @last_reading=nil;
       @last_reading_mutex=Mutex.new();
+      @last_minute=nil;
+      @last_minute_mutex=Mutex.new();
       @last_hour=nil;
       @last_hour_mutex=Mutex.new();
       @last_day=nil;
@@ -23,6 +25,20 @@ module MSG_Chumby
       end
       return retval
     end
+    def update_last_minute(readings)
+      raise "Please provide an Array instance" if readings.class != Array
+      @last_minute_mutex.synchronize do
+        @last_minute=readings
+      end
+    end
+    def last_minute
+      retval=nil
+      @last_minute_mutex.synchronize do
+        retval=@last_minute
+      end
+      return retval
+    end
+ 
     def update_last_hour(readings)
       raise "Please provide an Array instance" if readings.class != Array
       @last_hour_mutex.synchronize do

data/lib/msg-chumby-daemon/reading-importer.rb

@@ -6,7 +6,8 @@ end
 
 module MSG_Chumby
   BASE_URL="https://api.mysmartgrid.de/sensor"
-  class DemoReadingImporter
+  # Generates random readings for standalone demos.
+  class RandomReadingImporter
     def initialize(reading_cache, max_reading)
       @reading_cache=reading_cache
       @max_reading=max_reading
@@ -18,6 +19,35 @@ module MSG_Chumby
       @reading_cache.update_last_reading(reading);
     end
   end
+  class LastMinuteImporter
+    def initialize(reading_cache, location, local_id)
+      @reading_cache=reading_cache
+      @query=FluksoLocal::Query.new(location)
+      @local_id=local_id
+    end
+    def doWork
+      begin
+        values=@query.getReadings(@local_id);
+        # handle last value
+        last_value=values.max
+        #puts "Last reading: timestamp = #{last_value[0]}, value=#{last_value[1]}"
+        reading=Flukso::UTCReading.new(last_value[0], last_value[1])
+        @reading_cache.update_last_reading(reading);
+        # now handle last minute
+        last_minute=Array.new();
+        values.each{|current|
+          currentreading=Flukso::UTCReading.new(current[0], current[1])
+          last_minute << currentreading
+        }
+        last_minute.sort! {|a, b|
+          a.utc_timestamp <=> b.utc_timestamp
+        }
+        @reading_cache.update_last_minute(last_minute);
+      rescue StandardError => bam
+        puts "Cannot retrieve last minute: #{bam}"
+      end
+    end
+  end
   class LastHourImporter
     def initialize(reading_cache, sensor_id, token)
       @reading_cache=reading_cache

data/widget/currentpower/currentpower Report.txt

@@ -0,0 +1,33 @@
+currentpower.swf Filmbericht
+-----------------------------
+
+Metadaten
+---------
+Byte    Wert
+----    ----
+1290    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> <xmp:CreatorTool>Adobe Flash CS4 Professional</xmp:CreatorTool> <xmp:CreateDate>2010-03-15T15:58:56+01:00</xmp:CreateDate> <xmp:MetadataDate>2010-06-10T12:00:10+02:00</xmp:MetadataDate> <xmp:ModifyDate>2010-06-10T12:00:10+02:00</xmp:ModifyDate> </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"> <xmpMM:InstanceID>xmp.iid:05801174072068118F62D3F217E0363A</xmpMM:InstanceID> <xmpMM:DocumentID>xmp.did:05801174072068118F62D3F217E0363A</xmpMM:DocumentID> <xmpMM:OriginalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</xmpMM:OriginalDocumentID> <xmpMM:DerivedFrom rdf:parseType="Resource"> <stRef:instanceID>xmp.iid:F87F11740720681191099C69294AD041</stRef:instanceID> <stRef:documentID>xmp.did:F87F11740720681191099C69294AD041</stRef:documentID> <stRef:originalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</stRef:originalDocumentID> </xmpMM:DerivedFrom> </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <dc:format>application/x-shockwave-flash</dc:format> </rdf:Description> </rdf:RDF> 
+
+Bild #    Bild Byte    Gesamt Byte    Szene
+------    ---------    -----------    ----------------
+      1          16089          16089    Szene 1 (AS 2.0-Klassen Exportbild)
+
+Szene                        Form Byte    Text Byte    ActionScript Byte
+-------------------------    ---------    ---------    -----------------
+Szene 1                                0           523                  1275
+
+Symbol                       Form Byte    Text Byte    ActionScript Byte
+-------------------------    ---------    ---------    -----------------
+reset_button                        9877             0                     0
+
+Schriftart                 Byte        Zeichen    
+-----------------------    --------    -----------
+AllerDisplay                   1502    AWaekltu
+Aller                          1375     Wenortv
+
+ActionScript Byte    Position
+-----------------    --------
+              1275    Szene 1:Ebene 1:1
+
+
+
+

data/widget/currentpower/currentpower.html

@@ -299,13 +299,13 @@ function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
 		'play', 'true',
 		'loop', 'true',
 		'scale', 'showall',
-		'wmode', 'window',
+		'wmode', 'direct',
 		'devicefont', 'false',
 		'id', 'currentpower',
 		'bgcolor', '#ffffff',
 		'name', 'currentpower',
 		'menu', 'true',
-		'allowFullScreen', 'false',
+		'allowFullScreen', 'true',
 		'allowScriptAccess','sameDomain',
 		'movie', 'currentpower',
 		'salign', ''
@@ -314,8 +314,8 @@ function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
 <noscript>
 	<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="320" height="240" id="currentpower" align="middle">
 	<param name="allowScriptAccess" value="sameDomain" />
-	<param name="allowFullScreen" value="false" />
-	<param name="movie" value="currentpower.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#ffffff" />	<embed src="currentpower.swf" quality="high" bgcolor="#ffffff" width="320" height="240" name="currentpower" align="middle" allowScriptAccess="sameDomain" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.adobe.com/go/getflashplayer_de" />
+	<param name="allowFullScreen" value="true" />
+	<param name="movie" value="currentpower.swf" /><param name="quality" value="high" /><param name="wmode" value="direct" /><param name="bgcolor" value="#ffffff" />	<embed src="currentpower.swf" quality="high" wmode="direct" bgcolor="#ffffff" width="320" height="240" name="currentpower" align="middle" allowScriptAccess="sameDomain" allowFullScreen="true" type="application/x-shockwave-flash" pluginspage="http://www.adobe.com/go/getflashplayer_de" />
 	</object>
 </noscript>
 </body>

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msg-chumby-display
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mathias Dalheimer
@@ -9,39 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-07-08 00:00:00 +02:00
 default_executable: msg-chumby-daemon
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flukso4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongrel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: xml-simple
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        - 12
         version: 1.0.12
-    version: 
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: msg-flukso-localinterface
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id004
 description: "The mySmartGrid project provides means to manage your household energy consumption. This gem provides the runtime environment for the Chumby: it queries the mySmartGrid webservice and forwards that information to a Flash application running on the Chumby."
 email: md@gonium.net
 executables: 
@@ -57,6 +97,7 @@ files:
 - Rakefile
 - VERSION
 - bin/msg-chumby-daemon
+- etc/msgchumbydaemonrc
 - lib/msg-chumby-daemon.rb
 - lib/msg-chumby-daemon/http-xml-server.rb
 - lib/msg-chumby-daemon/reading-cache.rb
@@ -65,8 +106,10 @@ files:
 - test/helper.rb
 - test/test_msg-chumby-display.rb
 - widget/currentpower/Makefile
+- widget/currentpower/currentpower Report.txt
 - widget/currentpower/currentpower.fla
 - widget/currentpower/currentpower.html
+- widget/currentpower/currentpower.swd
 - widget/currentpower/currentpower.swf
 has_rdoc: true
 homepage: http://github.com/gonium/msg-chumby-display
@@ -78,21 +121,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Displays various information from the mySmartGrid project on your Chumby