lightwaverf 0.1.1 → 0.2.0

data/bin/lightwaverf

@@ -6,7 +6,7 @@ case ARGV[0]
   when 'sequence'
     puts LightWaveRF.new.sequence ARGV[1], ARGV[2]
   when 'energy'
-    puts LightWaveRF.new.energy
+    puts LightWaveRF.new.energy ARGV[1], ARGV[2], ARGV[3]
   when 'timer'
     puts LightWaveRF.new.timer ARGV[1], ARGV[2]
   else

data/lib/lightwaverf.rb

@@ -5,6 +5,7 @@ include Socket::Constants
 class LightWaveRF
 
   @config_file = nil
+  @log_file = nil
   @config = nil
 
   # Display usage info
@@ -33,6 +34,11 @@ class LightWaveRF
     @config_file || File.expand_path('~') + '/lightwaverf-config.yml'
   end
 
+  # Log file getter
+  def get_log_file
+    @log_file || File.expand_path('~') + '/lightwaverf.log'
+  end
+
   # Get the config file, create it if it does not exist
   def get_config
     if ! @config
@@ -111,12 +117,12 @@ class LightWaveRF
   #   device: (String)
   #   state: (String)
   def send room = nil, device = nil, state = 'on', debug = false
-    debug && ( puts 'config is ' + self.get_config.to_s )
+    debug and ( puts 'config is ' + self.get_config.to_s )
     rooms = self.class.get_rooms self.get_config
     state = self.class.get_state state
-    if rooms[room] && device && state && rooms[room]['device'][device]
+    if rooms[room] and device and state and rooms[room]['device'][device]
       command = self.command rooms[room], device, state
-      debug && ( p 'command is ' + command )
+      debug and ( p 'command is ' + command )
       self.raw command
     else
       STDERR.puts self.usage
@@ -141,11 +147,26 @@ class LightWaveRF
     end
   end
 
-  def energy
+  def energy title = nil, note = nil, debug = false
+    debug and note and ( p 'energy: ' + note )
     data = self.raw '666,@?'
+    debug and ( p data )
     # /W=(?<usage>\d+),(?<max>\d+),(?<today>\d+),(?<yesterday>\d+)/.match data # ruby 1.9 only?
     match = /W=(\d+),(\d+),(\d+),(\d+)/.match data
-    match and { 'usage' => match[1], 'max' => match[2], 'today' => match[3], 'yesterday' => match[4] }
+    debug and ( p match )
+    if match
+      data = { 'message' => { 'usage' => match[1].to_i, 'max' => match[2].to_i, 'today' => match[3].to_i }}
+      data['timestamp'] = Time.now.to_s
+      if note
+        data['message']['annotation'] = { 'title' => title.to_s, 'text' => note.to_s }
+      end
+      debug and ( p data )
+      require 'json'
+      File.open( self.get_log_file, 'a' ) do |f|
+        f.write( data.to_json + "\n" )
+      end
+      data['message']
+    end
   end
 
   def raw command
@@ -186,7 +207,7 @@ class LightWaveRF
     require 'net/http'
     require 'rexml/document'
     url = LightWaveRF.new.get_config['calendar'] + '?singleevents=true&start-min=' + Date.today.strftime( '%Y-%m-%d' ) + '&start-max=' + Date.today.next.strftime( '%Y-%m-%d' )
-    debug && ( p url )
+    debug and ( p url )
     parsed_url = URI.parse url
     http = Net::HTTP.new parsed_url.host, parsed_url.port
     http.use_ssl = true
@@ -195,7 +216,7 @@ class LightWaveRF
     doc = REXML::Document.new response.body
     now = Time.now.strftime '%H:%M'
     interval_end_time = ( Time.now + interval.to_i * 60 ).strftime '%H:%M'
-    triggered = 0
+    triggered = []
     doc.elements.each 'feed/entry' do | e |
       command = /(\w+) (\w+)( (\w+))?/.match e.elements['title'].text # look for events with a title like 'lounge light on'
       if command
@@ -216,17 +237,25 @@ class LightWaveRF
           event_times = { event_time => 'on', event_end_time => 'off' }
         end
         event_times.each do | t, s |
-          debug && ( p e.elements['title'].text + ' - ' + now + ' < ' + t + ' < ' + interval_end_time + ' ?' )
-          if t >= now && t < interval_end_time
-            debug && ( p 'so going to turn the ' + room + ' ' + device + ' ' + s.to_s + ' now!' )
+          debug and ( p e.elements['title'].text + ' - ' + now + ' < ' + t + ' < ' + interval_end_time + ' ?' )
+          if t >= now and t < interval_end_time
+            debug and ( p 'so going to turn the ' + room + ' ' + device + ' ' + s.to_s + ' now!' )
             self.send room, device, s.to_s
             sleep 1
-            triggered += 1
+            triggered << [ room, device, s ]
           end
         end
       end
     end
-    triggered.to_s + " events triggered"
+    triggered.length.to_s + " events triggered"
+    title = nil
+    text = nil
+    if triggered.length > 0
+      debug and ( p triggered.length.to_s + ' events so annotating energy log too...' )
+      title = 'timer'
+      text = triggered.map { |e| e.join " " }.join ", "
+    end
+    self.energy title, text, debug
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2013-01-04 00:00:00.000000000 Z
 dependencies: []
 description: Interact with lightwaverf wifi link from code or the command line. Control
-  your lights, heating, sockets etc.
+  your lights, heating, sockets etc. Also logs energy usage.
 email: pauly@clarkeology.com
 executables:
 - lightwaverf