lightwaverf 0.4.0 → 0.5.0

data/app/views/_graphs.ejs

@@ -0,0 +1,81 @@
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript">
+  var gauge, gauge_data, gauge_options;
+  google.load( 'visualization', '1.0', { packages: [ 'corechart', 'gauge', 'annotatedtimeline' ] } );
+  google.setOnLoadCallback( function ( ) {
+    var energy_data = new google.visualization.DataTable( );
+    energy_data.addColumn( 'date', 'Date' );
+    energy_data.addColumn( 'number', 'Electricity used' );
+    energy_data.addColumn( 'string', 'title1' );
+    energy_data.addColumn( 'string', 'text1' );
+    if (!Array.prototype.map) {
+      Array.prototype.map = function(callback, thisArg) {
+        var T, A, k;
+        if (this == null) {
+          throw new TypeError(" this is null or not defined");
+        }
+        var O = Object(this);
+        var len = O.length >>> 0;
+        if (typeof callback !== "function") {
+          throw new TypeError(callback + " is not a function");
+        }
+        if (thisArg) {
+          T = thisArg;
+        }
+        A = new Array(len);
+        k = 0;
+        while(k < len) {
+          var kValue, mappedValue;
+          if (k in O) {
+            kValue = O[ k ];
+            mappedValue = callback.call(T, kValue, k, O);
+            A[ k ] = mappedValue;
+          }
+          k++;
+        }
+        return A;
+      };      
+    }
+    var raw_data = <%- summary %>;
+    var start_date = raw_data[0][0];
+    energy_data.addRows( raw_data.map( function ( e ) {
+      if ( e[0] !== start_date ) e[0] += start_date;
+      e[0] = new Date( 1000 * e[0] ); // as it is now a timestamp
+      // var d = '' + e[0];
+      // e[0] = new Date( '20' + d[0] + d[1] + '-' + d[2] + d[3] + '-' + d[4] + d[5] + ' ' + d[6] + d[7] + ':' + d[8] + d[9] );
+      e[1] = e[1] * 10;
+      e[2] = e[2] || '';
+      e[3] = e[3] || '';
+      return e;
+    } ));
+    var chart = new google.visualization.AnnotatedTimeLine( document.getElementById( 'energy_chart' ));
+    chart.draw( energy_data, { displayAnnotations: true, title: '24 hours electricity usage' } );
+  
+    gauge = new google.visualization.Gauge( document.getElementById( 'gauge_div' ));
+    gauge_data = google.visualization.arrayToDataTable( [ ["Label", "Value"], ["Electric", raw_data.pop[1] ] ] );
+    gauge_options = {
+      width: '200',
+      height: '200',
+      redFrom: 90,
+      redTo: 100,
+      yellowFrom: 75,
+      yellowTo: 90,
+      minorTicks: 5
+    };
+    gauge.draw( gauge_data, gauge_options );
+  } );
+  $( function ( ) {
+    $('dt a').click( function ( ) {
+      $(this).parent( ).next('dd').slideDown( );
+      return false;
+    } );
+    $('a.ajax').click( function ( ) {
+      $a = $(this);
+      $.get( $a.attr('href'), function ( js ) {
+        alert( js.result || $a.text( ));
+      } );
+      return false;
+    } );
+  } );
+</script>

data/bin/lightwaverf

@@ -23,6 +23,10 @@ case ARGV[0]
     puts LightWaveRF.new.run_timers ARGV[1], ARGV[2]
   when 'update'
     puts LightWaveRF.new.update_config ARGV[1], ARGV[2]
+  when 'web'
+    puts LightWaveRF.new.build_web_page ARGV[1]
+  when 'summarise'
+    puts LightWaveRF.new.summarise ARGV[1], ARGV[2]
   else
     LightWaveRF.new.send ARGV[0], ARGV[1], ARGV[2], ARGV[3]
 end

data/lib/lightwaverf.rb

@@ -23,6 +23,7 @@ class LightWaveRF
 
   @config_file = nil
   @log_file = nil
+  @summary_file = nil
   @log_timer_file = nil
   @config = nil
   @timers = nil
@@ -108,6 +109,11 @@ class LightWaveRF
     @log_file || File.expand_path('~') + '/lightwaverf.log'
   end
 
+  # Summary file getter
+  def get_summary_file
+    @summary_file || File.expand_path('~') + '/lightwaverf-summary.json'
+  end
+
   # Timer log file getter
   def get_timer_log_file
     @timer_log_file || File.expand_path('~') + '/lightwaverf-timer.log'
@@ -143,18 +149,12 @@ class LightWaveRF
 
   # Get timer cache file, create it if needed
   def get_timer_cache
-    p 'getting timer cache...'
     if ! @timers
-      p 'no timers!'
       if ! File.exists? self.get_timer_cache_file
-        p 'no file!'
-	self.update_timers
-        p 'updated...'
+        self.update_timers
       end
       @timers = YAML.load_file self.get_timer_cache_file
-      p 'timers now ' + @timers.to_s
     end
-    p 'returning, timers now ' + @timers.to_s
     @timers
   end
 
@@ -733,24 +733,24 @@ class LightWaveRF
           debug and ( p "Timezone: " + timezone)
 
           # convert to datetimes
-          start_dt = DateTime.parse(start_date.strip + ' ' + start_time.strip + ' ' + timezone.strip)
-          end_dt = DateTime.parse(end_date.strip + ' ' + end_time.strip + ' ' + timezone.strip)
+          start_dt = DateTime.parse( start_date.strip + ' ' + start_time.strip + ' ' + timezone.strip )
+          end_dt = DateTime.parse( end_date.strip + ' ' + end_time.strip + ' ' + timezone.strip )
 
           # apply time modifier if it exists
           if time_modifier != 0
-            debug and ( p "Adjusting timings by: " + time_modifier.to_s)
-            start_dt = ((start_dt.to_time) + time_modifier*60).to_datetime
-            end_dt = ((end_dt.to_time) + time_modifier*60).to_datetime
+            debug and ( p "Adjusting timings by: " + time_modifier.to_s )
+            start_dt = (( start_dt.to_time ) + time_modifier * 60 ).to_datetime
+            end_dt = (( end_dt.to_time ) + time_modifier * 60 ).to_datetime
           end
 
-          debug and ( p "Start datetime: " + start_dt.to_s)
-          debug and ( p "End datetime: " + end_dt.to_s)
+          debug and ( p "Start datetime: " + start_dt.to_s )
+          debug and ( p "End datetime: " + end_dt.to_s )
 
           # populate the dates
           event['date'] = start_dt
           # handle device entries without explicit on/off state
           if event['type'] == 'device' and ( event['state'].nil? or ( event['state'] != 'on' and event['state'] != 'off' ))
-            debug and ( p "Duplicating event without explicit on/off state...")
+            debug and ( p "Duplicating event without explicit on/off state..." )
             # if not state was given, assume we meant 'on'
             if event['state'].nil?
               event['state'] = 'on'
@@ -946,5 +946,122 @@ class LightWaveRF
     self.log_timer_event 'run', nil, nil, nil, true
   end
 
+  def self.get_contents file
+    file = File.open file, 'r'
+    content = file.read
+    file.close
+    content
+  end
+
+  def build_web_page debug = nil
+
+    rooms = self.class.get_rooms self.get_config
+    list = '<dl>'
+    config = 'usage: lightwaverf ' + rooms.values.first['name'] + ' ' + rooms.values.first['device'].keys.first.to_s + ' on # where "' + rooms.keys.first + '" is a room in ' + self.get_config_file
+    rooms.each do | name, room |
+      debug and ( puts name + ' is ' + room.to_s )
+      list += '<dt>' + name + '</dt><dd><ul>'
+      room['device'].each do | device |
+      	debug and ( puts 'device is ' + device.to_s )
+      	list += '<li>' + room['name'].to_s + ' ' + device.first.to_s + '</li>'
+      end
+      list += '</ul></dd>'
+    end
+    list += '</dl>'
+
+    summary = self.class.get_contents self.get_summary_file
+    js = self.class.get_contents( File.dirname( __FILE__ ) + '/../app/views/_graphs.ejs' ).gsub( '<%- summary %>', summary )
+    date = Time.new.to_s
+    title = self.get_config.has_key?('title') ? self.get_config['title'] : ( 'Lightwaverf energy stats ' + date )
+    intro = <<-end
+        Sample page generated #{date} with <code>lightwaverf web</code>.
+        Check out <a href="https://github.com/pauly/lightwaverf">the new simplified repo</a> for details
+        or <a href="https://rubygems.org/gems/lightwaverf">gem install lightwaverf && lightwaverf web</a>...
+        <br />@todo make a decent, useful, simple, configurable web page...
+    end
+    help = list
+    html = <<-end
+      <html>
+        <head>
+          <title>#{title}</title>
+	  <style type="text/css">
+	    body { font-family: arial, verdana, sans-serif; }
+	    div#energy_chart { width: 800px; height: 600px; }
+	    div#gauge_div { width: 100px; height: 100px; }
+	  </style>
+	</head>
+        <body>
+          <div class="container">
+            <div class="row">
+              <div class="col">
+	        <h1>#{title}</h1>
+	        <p class="intro">#{intro}</p>
+                <div id="energy_chart"></div>
+		<h2>Rooms and devices</h2>
+		<p>@todo make these links to control the devices...</p>
+	        <p class="help">#{help}</p>
+	        #{js}
+	      </div>
+              <div class="col">
+                <div class="col" id="gauge_div"></div>
+	      </div>
+	    </div>
+	  </div>
+	  <p>By <a href="http://www.clarkeology.com/blog/">Paul Clarke</a>, a work in progress.</p>
+	</body>
+      </html>
+    end
+  end
+
+  # summarise the log data for ease of use
+  def summarise days = 7, debug = nil
+    days = days.to_i
+    data = [ ]
+    daily = { }
+    start_date = 0
+    d = nil
+    File.open( self.get_log_file, 'r' ).each_line do | line |
+      line = JSON.parse( line )
+      if line and line['timestamp']
+	new_line = []
+	d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
+	ts = Time.parse( line['timestamp'] ).strftime '%s'
+	ts = ts.to_i
+	if start_date > 0
+	  ts = ts - start_date
+	else
+	  start_date = ts
+	end
+	new_line << ts
+	new_line << line['message']['usage'].to_i / 10
+	if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
+	  new_line << line['message']['annotation']['title']
+	  new_line << line['message']['annotation']['text']
+	end
+	data << new_line
+	if line['message']['today'] > daily[d]['today']
+          daily[d] = line['message']
+	end
+      end
+    end
+    debug and ( puts 'got ' + data.length.to_s + ' lines in the log' )
+    data = data.last( 60 * 24 * days )
+    debug and ( puts 'now got ' + data.length.to_s + ' lines in the log ( 60 * 24 * ' + days.to_s + ' = ' + ( 60 * 24 * days ).to_s + ' )' )
+    if data[0][0] != start_date
+      data[0][0] += start_date
+    end
+    summary_file = self.get_summary_file
+    File.open( summary_file, 'w' ) do |file|
+      file.write data.to_s
+    end
+    # @todo fix the daily stats, every night it reverts to the minimum value...
+    File.open( summary_file.gsub( 'summary', 'daily' ), 'w' ) do | file |
+      file.write daily.to_s
+    end
+    File.open( summary_file.gsub( 'summary', 'daily.' + d ), 'w' ) do | file |
+      file.write daily.select { |key| key == daily.keys.last }.to_s
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -46,8 +46,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ! "    Interact with lightwaverf wifi-link from code or the command line.\n
-  \   Control your lights, heating, sockets etc.\n    Also set up timers using a google
-  calendar and log energy usage.\n"
+  \   Control your lights, heating, sockets, sprinkler etc.\n    Also use a google
+  calendar, for timers, log energy usage, and build a website.\n"
 email: pauly@clarkeology.com
 executables:
 - lightwaverf
@@ -56,6 +56,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lightwaverf.rb
+- app/views/_graphs.ejs
 - bin/lightwaverf
 - bin/lightwaverf-config-json
 homepage: http://www.clarkeology.com/wiki/lightwaverf+ruby