lightwaverf 0.0.4 → 0.0.6

data/bin/lightwaverf-config-json

@@ -1,3 +1,3 @@
 #!/usr/bin/ruby
 require 'lightwaverf'
-p LightWaveRF.new.config_json
+puts LightWaveRF.new.config_json

data/lib/lightwaverf.rb

@@ -20,7 +20,8 @@ class LightWaveRF
 
   def config_json
     require 'json'
-    JSON self.get_config
+    require 'pp'
+    JSON.generate self.get_config
   end
     
   def set_config_file file
@@ -47,9 +48,10 @@ class LightWaveRF
     rooms = { }
     r = 1
     config['room'].each do | name, devices |
-      rooms[name] = { 'id' => 'R' + r.to_s, 'device' => { }}
+      rooms[name] = { 'id' => 'R' + r.to_s, 'name' => name, 'device' => { }}
       d = 1
       devices.each do | device |
+        # @todo possibly need to complicate this to get a device name back in here
         rooms[name]['device'][device] = 'D' + d.to_s
         d += 1
       end
@@ -64,7 +66,7 @@ class LightWaveRF
         state = 'F0'
       when 'on'
         state = 'F1'
-      when 1..99
+      when 1..100
         state = 'FdP' + ( state * 0.32 ).round.to_s
     end
     state
@@ -80,7 +82,8 @@ class LightWaveRF
   #   device: (String)
   #   state: (String)
   def command room, device, state
-    "666,!" + room['id'] + room['device'][device] + state + "|"
+    # @todo get the device name in here...
+   '666,!' + room['id'] + room['device'][device] + state + '|' + room['name'] + ' ' + room['id'] + '|via @pauly'
   end
 
   # Turn one of your devices on or off
@@ -99,7 +102,7 @@ class LightWaveRF
     if rooms[room] && device && state && rooms[room]['device'][device]
       command = self.command rooms[room], device, state
       debug && ( p 'command is ' + command )
-      UDPSocket.new.send command, 0, self.get_config['host'], 9760
+      self.raw command
     else
       STDERR.puts self.usage
     end
@@ -115,12 +118,28 @@ class LightWaveRF
   end
 
   def energy
-    listener = UDPSocket.new
-    listener.bind '0.0.0.0', 9761
-    UDPSocket.new.send "666,@?", 0, self.get_config['host'], 9760
-    data, addr = listener.recvfrom 200
-    listener.close
-    data = /W=(?<usage>\d+),(?<max>\d+),(?<today>\d+),(?<yesterday>\d+)/.match( data )
+    data = self.raw '666,@?'
+    begin
+      /W=(?<usage>\d+),(?<max>\d+),(?<today>\d+),(?<yesterday>\d+)/.match( data )
+    rescue
+      data
+    end
+  end
+
+  def raw command
+    response = nil
+    begin
+      listener = UDPSocket.new
+      listener.bind '0.0.0.0', 9761
+    rescue
+      response = "can't bind to listen for a reply"
+    end
+    UDPSocket.new.send command, 0, self.get_config['host'], 9760
+    if ! response
+      response, addr = listener.recvfrom 200
+      listener.close
+    end
+    response
   end
 
 end

metadata

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