huemote 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be51c602e6af5ead50c6971f39506a6a5032421
-  data.tar.gz: 114b210e64560c8a666030a6098e37767da0bc2e
+  metadata.gz: 33e0123a389a11d755de13f14aa2f4826ab35f7b
+  data.tar.gz: 2bc12f2992fa4e3611aed8c43f8a80bb7247f115
 SHA512:
-  metadata.gz: 4b2a0ff35970f5de67a3dc2997370f0cc758200ea12e01224abd329872365555b17ed6350e60af22481d00416efaaa82f0fb6c2097ece58f3c76da56154cfd5a
-  data.tar.gz: 63f14a307fce18f9cbeaeb9552de0b8612a57547c576ee702f8025a571f6803f192521786af8cb647652b588530782201ea2d2b7c6ead929afe559e44f24bd39
+  metadata.gz: 019d60ce3b9a6a8631c2fa717ede95b202d93616b1abd7d721de35efbe283a4e59b2c62e3d53bdbefb5f39cae268396df024ca56bf7b02f563b94948f3e25b59
+  data.tar.gz: 7b5afa4964f62c0ded5435a290a2d04abb9f821e57f7066e5819a8ff25f4e3d9eb15170a99a6582071bcbc395188d77fd36cc4724a36bc2cb0e33b2bd38fdd63

data/lib/huemote.rb

@@ -8,8 +8,8 @@ module Huemote
   require_relative './huemote/bridge'
 
   class << self
-    def discover(socket=nil)
-      Huemote::Bridge.discover
+    def discover(broadcast='255.255.255.255')
+      Huemote::Bridge.send(:discover,broadcast)
     end
   end
 end

data/lib/huemote/bridge.rb

@@ -5,82 +5,22 @@ module Huemote
   class Bridge
     DEVICE_TYPE = "Huemote"
     USERNAME = "HuemoteRubyGem"
-    MULTICAST_ADDR = '239.255.255.250'
-    BIND_ADDR = '0.0.0.0'
-    PORT = 1900
-    DISCOVERY= <<-EOF
-M-SEARCH * HTTP/1.1\r
-HOST: 239.255.255.250:1900\r
-MAN: "ssdp:discover"\r
-MX: 10\r
-ST: urn:schemas-upnp-org:device:Basic:1\r
-\r
-EOF
 
     class << self
       def get
-        @bridge ||= begin
-          client = Huemote::Client.new
-          body = nil
-          device = fetch_upnp.detect{|host,port|body = client.get("http://#{host}:#{port}/description.xml").body; body.match('<modelURL>http://www.meethue.com</modelURL>')}
-          self.new(*device,body)
-        end
+        @bridge ||= discover
       end
 
       private
 
-      def discover(socket = nil)
-        @bridge = nil
+      def discover(broadcast = '255.255.255.255')
         client  = Huemote::Client.new
-        body    = nil
-
-        devices, socket = fetch_upnp(true,socket)
-        device = devices.detect{|host,port|body = client.get("http://#{host}:#{port}/description.xml").body; body.match('<modelURL>http://www.meethue.com</modelURL>')}
-        @bridge = self.new(*device,body)
+        arp = `ping -t 1 #{broadcast} > /dev/null && arp -na | grep 0:17:88`.split("\n")[0]
+        host = /\((\d+\.\d+\.\d+\.\d+)\)/.match(arp)[1]
 
-        socket
-      end
+        body = client.get("http://#{host}:80/description.xml").body
 
-      def ssdp_socket
-        socket = UDPSocket.new
-        socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, IPAddr.new(MULTICAST_ADDR).hton + IPAddr.new(BIND_ADDR).hton)
-        socket.setsockopt(Socket::IPPROTO_IP, Socket::IP_MULTICAST_TTL, 1)
-        socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1)
-        socket.bind(BIND_ADDR,PORT)
-        socket
-      end
-
-      def listen(socket,devices)
-        sleep 1
-        Thread.start do
-          loop do
-            message, _ = socket.recvfrom(1024)
-            match = message.match(/LOCATION:\s+http:\/\/([^\/]+)/)
-            devices << match[1].split(':') if match
-          end
-        end
-      end
-
-      def fetch_upnp(return_socket=false,socket=nil)
-        socket ||= ssdp_socket
-        devices = []
-
-        3.times { socket.send(DISCOVERY, 0, MULTICAST_ADDR, PORT) }
-
-        # The following is a bit silly, but is necessary for JRuby support,
-        # which seems to have some issues with socket interruption. If you have
-        # a working JRuby solution that doesn't require this kind of hackery,
-        # by all means, submit a pull request!
-
-        listen(socket,devices).tap{|l|sleep 1; l.kill}
-        devices.uniq!
-
-        if return_socket
-          [devices,socket]
-        else
-          socket.close
-          devices
-        end
+        @bridge = self.new(host,80,body)
       end
     end
 

data/lib/huemote/client.rb

@@ -41,13 +41,13 @@ module Huemote
       end
     end
 
-    module HTTParty
-      DEPENDENCIES = ['httparty']
-      def self.extended(base)
-        base.instance_variable_set(:@lib,::HTTParty)
-        base.extend(SmartLib)
-      end
-    end
+    #module HTTParty
+    #  DEPENDENCIES = ['httparty']
+    #  def self.extended(base)
+    #    base.instance_variable_set(:@lib,::HTTParty)
+    #    base.extend(SmartLib)
+    #  end
+    #end
 
     module NetHTTP
       DEPENDENCIES = ['net/http','uri']

data/lib/huemote/version.rb

@@ -1,3 +1,3 @@
 module Huemote
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huemote
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin Gisi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Huemote is a Ruby gem for managing Philips Hue lights
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -35,27 +35,27 @@ homepage: https://github.com/gisikw/huemote
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Huemote is a Ruby gem for managing Philips Hue lights
 test_files:
 - spec/huemote/bridge_spec.rb
 - spec/spec_helper.rb
-has_rdoc:
+has_rdoc: