lightwaverf 0.0.7 → 0.0.8

data/bin/lightwaverf

@@ -1,7 +1,10 @@
 #!/usr/bin/ruby
 require 'lightwaverf'
-if ARGV[0] == 'help'
-  LightWaveRF.new.help
-else
-  LightWaveRF.new.send ARGV[0], ARGV[1], ARGV[2]
+case ARGV[0]
+  when 'help'
+    puts LightWaveRF.new.help
+  when 'energy'
+    puts LightWaveRF.new.energy
+  else
+    LightWaveRF.new.send ARGV[0], ARGV[1], ARGV[2], ARGV[4]
 end

data/lib/lightwaverf.rb

@@ -9,13 +9,16 @@ class LightWaveRF
 
   def usage
     rooms = self.class.get_rooms self.get_config
-    'usage: lightwaverf ' + rooms.keys.first + ' ' + rooms.values.first['device'].keys.first.to_s + ' on'
+    'usage: lightwaverf ' + rooms.keys.first + ' ' + rooms.values.first['device'].keys.first.to_s + ' on # where "' + rooms.keys.first + '" is a room in ' + self.get_config_file
   end
 
   def help
     help = self.usage + "\n"
-    help += 'your rooms, devices, and sequences, as defined in ' + self.get_config_file + ":\n"
+    help += "your rooms, devices, and sequences, as defined in " + self.get_config_file + ":\n\n"
     help += YAML.dump self.get_config['room']
+    room = self.get_config['room'].keys.last
+    device = self.get_config['room'][room].last
+    help += "\n\nso to turn on " + room + " " + device + " type \"lightwaverf " + room + " " + device + " on\"\n"
   end
 
   def config_json
@@ -68,6 +71,10 @@ class LightWaveRF
         state = 'F1'
       when 1..100
         state = 'FdP' + ( state * 0.32 ).round.to_s
+      else
+        if state
+          p 'did not recognise state, got ' + state
+        end
     end
     state
   end
@@ -108,6 +115,15 @@ class LightWaveRF
     end
   end
 
+  # A sequence of events
+  # maybe I really mean a "mood" here?
+  #
+  # Example:
+  #   >> LightWaveRF.new.sequence 'lights'
+  #
+  # Arguments:
+  #   name: (String)
+  #   debug: (Boolean)
   def sequence name, debug = false
     if self.get_config['sequence'][name]
       self.get_config['sequence'][name].each do | task |
@@ -119,8 +135,10 @@ class LightWaveRF
 
   def energy
     data = self.raw '666,@?'
+    p data
     # /W=(?<usage>\d+),(?<max>\d+),(?<today>\d+),(?<yesterday>\d+)/.match( data ) # ruby 1.9 only?
-    /W=(\d+),(\d+),(\d+),(\d+)/.match( data )
+    match = /W=(\d+),(\d+),(\d+),(\d+)/.match( data )
+    { 'usage' => match[0], 'max' => match[1], 'today' => match[2], 'yesterday' => match[3] }
   end
 
   def raw command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-12-30 00:00:00.000000000 Z
 dependencies: []
-description: Interact with lightwaverf wifi link from the command line
+description: Interact with lightwaverf wifi link from code or the command line
 email: pauly@clarkeology.com
 executables:
 - lightwaverf