wemo 0.0.2 → 0.0.7

data/README.md

@@ -1,6 +1,6 @@
 # Wemo
 
-TODO: Write a gem description
+I sort of combined some stuff.  Hopefully noone is upset about the combination, I tried to make it clear where I found stuff.
 
 ## Installation
 
@@ -16,9 +16,20 @@ Or install it yourself as:
 
     $ gem install wemo
 
+Use from the command line:
+
+    $ wemo start friendlyName
+
+    $ wemo start light
+    $ wemo start pump
+    $ wemo stop pump
+    $ wemo stop light
+    $ wemo start 'exhaust fan'
+
 ## Usage
 
-TODO: Write usage instructions here
+    Wemo.off('friendlyName')
+    Wemo.on('friendlyName')
 
 ## Contributing
 

data/lib/wemo.rb

@@ -11,4 +11,8 @@ module Wemo
   def self.off(name)
     Wemo::Switch.send_command(name, 'off')
   end
+
+  def self.status(name)
+    Wemo::Switch.status(name)
+  end
 end

data/lib/wemo/switch.rb

@@ -2,70 +2,121 @@
 
 require 'curb'
 require 'simple_upnp'
+require 'nokogiri'
 module Wemo
   class Switch
+
+    attr_accessor :name, :state, :location, :details
+
+    def initialize(name)
+      self.name = name
+      self.find_device
+      self
+    end
+
     def self.on(name)
-      send_command(name, 'on')
+      new(name).on
     end
 
     def self.off(name)
-      send_command(name, 'off')
+      new(name).off
+    end
+
+    def self.status(name)
+      new(name).status
+    end
+
+    def on
+      set_binary_state(1)
+    end
+
+    def off
+      set_binary_state(0)
     end
 
-    def self.state(name)
-      send_command(name, 'off')
+    def status
+      get_binary_state
     end
 
-    def self.set_binary_state(device_location, signal)
-      c = Curl::Easy.new(device_location.to_s + 'upnp/control/basicevent1')
+    def set_binary_state(signal)
+      find_device unless self.location != nil
+      c = Curl::Easy.new(self.location.to_s + 'upnp/control/basicevent1')
       c.headers["Content-type"] = 'text/xml; charset="utf-8"'
       c.headers["SOAPACTION"] = "\"urn:Belkin:service:basicevent:1#SetBinaryState\""
       c.verbose = false
       begin
         c.http_post("<?xml version='1.0' encoding='utf-8'?><s:Envelope xmlns:s='http://schemas.xmlsoap.org/soap/envelope/' s:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'><s:Body><u:SetBinaryState xmlns:u='urn:Belkin:service:basicevent:1'><BinaryState>#{signal}</BinaryState></u:SetBinaryState></s:Body></s:Envelope>")
         c.perform
-      rescue Curb::Err
+      rescue 
       end
+      self.state = signal
         # c.body_str
     end
 
-    def self.send_command(wemo, action)
-      case action
-      when "on"
-        signal = 1
-      when "off"
-        signal = 0
+
+    def get_binary_state
+      find_device unless self.location != nil
+      c = Curl::Easy.new(self.location.to_s + 'upnp/control/basicevent1')
+      c.headers["Content-type"] = 'text/xml; charset="utf-8"'
+      c.headers["SOAPACTION"] = "\"urn:Belkin:service:basicevent:1#GetBinaryState\""
+      c.verbose = false
+      begin
+        c.http_post("<?xml version=\"1.0\" encoding=\"utf-8\"?><s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"><s:Body><u:GetBinaryState xmlns:u=\"urn:Belkin:service:basicevent:1\"></u:GetBinaryState></s:Body></s:Envelope>")
+        c.perform
+      rescue 
       end
-      include_location_details = true
-      wemo_device = nil
-      device_name = nil
-      device_location = nil
+        
+      xml =  Nokogiri::XML(c.body_str).text.strip.to_i
+      self.state = xml
+      if xml == 0
+        return false
+      else
+        return true
+      end
+    end
 
+    def find_device
       SimpleUpnp::Discovery.find do |device|
         begin
-          device_json = device.to_json(include_location_details)
+          device_json = device.to_json(true)
         rescue
           next
         end
-
         # puts device_json.inspect
-        
+
         if device_json['root']
           if device_json['root']['device']
             if device_json['root']['device']['friendlyName']
               friendlyName = device_json['root']['device']['friendlyName']
-              if friendlyName.downcase == wemo.strip.downcase
-                wemo_device = device_json['root']['device']
-                device_name = friendlyName
-                device_location = /https?:\/\/[\S]+\//.match(device.location)
+              if friendlyName.downcase == self.name.strip.downcase
+                self.details = device_json['root']['device']
+                self.name = friendlyName
+                self.location = /https?:\/\/[\S]+\//.match(device_json[:location]).to_s
                 break
               end
             end
           end
         end
       end
-      if wemo_device
-        set_binary_state(device_location, signal)
+      status
+    end
+
+    def self.send_command(name, action)
+      case action
+      when "on"
+        signal = 1
+      when "off"
+        signal = 0
+      when 'status'
+        signal = false
+      end
+      d = Wemo::Switch.new(name)
+      if d.details
+        if signal
+          response = d.set_binary_state(signal)
+        else
+          response = d.get_binary_state
+        end
       end
     end
   end

data/lib/wemo/version.rb

@@ -1,3 +1,3 @@
 module Wemo
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

data/wemo.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_dependency 'simple_upnp'
   spec.add_dependency 'curb'
+  spec.add_dependency 'nokogiri'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wemo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: this is a combo.  I took several things from around and fixed them, mostly
   taken from https://github.com/bobbrodie/siriproxy-wemo
 email:
@@ -109,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1162693111217817383
+      hash: 2588951935745406503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1162693111217817383
+      hash: 2588951935745406503
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23