hue-lib 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 888f312d7fd5cbc97e0420cdfd93c81ce2384dfc
-  data.tar.gz: b4925347b45be059603fda074dcdbed11311942f
+  metadata.gz: cc8c952537596ce90a96a55c442452834e18fe1f
+  data.tar.gz: 4de815463960e79adbbc32c898ab9b626dad3788
 SHA512:
-  metadata.gz: 565dcd5268b7948a36bd1bb70f0527015a82609cf02b13d3cc5a323ba912a732fe0dab58b35dc9543f1141a2d762f2c5ae40a69a3ef84358138c52f7e5d82bf2
-  data.tar.gz: 12675f32773730f522c984812f29ba118db9880bd45a9733702478c8d0b9277a5976c38afb6c42be8ed617b3e3ec74a7901beb8c1c6240c2927dbb865ffade1f
+  metadata.gz: 40e1127175b0a0d5717f0ec358674e5ea884632183c8e2f43583d68af68c943b23fc75b47fcd730f1f1bd05ea739f34c6893f181e49ed900d15b4c42237b6d58
+  data.tar.gz: f88ae6f675905547f30129ce716d8eb82543d69a522d5951cfb9e9a2d023b88765e33f291c530dc9513854419ff7617f855afcdf17c988da9e8cdcb4ef0fab9d

data/hue-lib.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "hue-lib"
-  s.version     = '0.7.3'
+  s.version     = '0.7.4'
   s.authors     = ["Birkir A. Barkarson", "Aaron Hurley"]
   s.email       = ["birkirb@stoicviking.net"]
   s.homepage    = "https://github.com/birkirb/hue-lib"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("json")
+  s.add_development_dependency("rake")
   s.add_development_dependency("rspec", '>= 2.6.0')
   s.add_development_dependency("mocha", '>= 0.9.0')
   s.add_development_dependency("webmock", '>= 1.8.0')

data/lib/hue.rb

@@ -5,7 +5,7 @@ require 'securerandom'
 module Hue
 
   DEVICE_TYPE = 'hue-lib'
-  DEFAULT_UDP_TIMEOUT = 2
+  DEFAULT_UDP_TIMEOUT = 5
   ERROR_DEFAULT_EXISTS = 'Default application already registered.'
   ERROR_NO_BRIDGE_FOUND = 'No bridge found.'
 
@@ -22,11 +22,9 @@ module Hue
       raise Hue::Error.new(ERROR_DEFAULT_EXISTS)
     else
       bridge_config = register_bridges.values.first # Assuming one bridge for now
-      secret = Hue.one_time_uuid
-      app_config = Hue::Config::Application.new(bridge_config.id, secret)
-      puts "Registering app...(#{secret})"
-      instance = Hue::Bridge.new(app_config.id, bridge_config.uri)
-      instance.register
+      puts "Registering new app..."
+      instance = Hue::Bridge.register(bridge_config.uri)
+      app_config = Hue::Config::Application.new(bridge_config.id, instance.application_id)
       app_config.write
       instance
     end
@@ -51,14 +49,21 @@ module Hue
     true
   end
 
-  def self.discover(timeout = DEFAULT_UDP_TIMEOUT)
+  def self.discover
     bridges = Hash.new
+    udp_discover(bridges)
+    nupnp_discover(bridges)
+    bridges
+  end
+
+  def self.udp_discover(bridges)
+    Hue.logger.info("Bridge UDP Discovery")
     payload = <<-PAYLOAD
 M-SEARCH * HTTP/1.1
-HOST: 239.255.255.250:1900
-MAN: ssdp:discover
-MX: 10
 ST: ssdp:all
+MX: 10
+MAN: ssdp:discover
+HOST: 239.255.255.250:1900
     PAYLOAD
     broadcast_address = '239.255.255.250'
     port_number = 1900
@@ -66,7 +71,7 @@ ST: ssdp:all
     socket = UDPSocket.new(Socket::AF_INET)
     socket.send(payload, 0, broadcast_address, port_number)
 
-    Timeout.timeout(timeout, Hue::Error) do
+    Timeout.timeout(DEFAULT_UDP_TIMEOUT, Hue::Error) do
       loop do
         message, (address_family, port, hostname, ip_add) = socket.recvfrom(1024)
         if message =~ /IpBridge/ && location = /LOCATION: (.*)$/.match(message)
@@ -83,10 +88,28 @@ ST: ssdp:all
         end
       end
     end
-
-  rescue Hue::Error
+  rescue Hue::Error => err
+    Hue.logger.warn(err)
     logger.info("UDPSocket timed out.")
-    bridges
+  end
+
+  def self.nupnp_discover(bridges)
+    if bridges.size > 0
+      return
+    end
+
+    Hue.logger.info("Bridge NUPNP Discovery")
+    response = Net::HTTP.get_response(URI("https://www.meethue.com/api/nupnp"))
+    json = JSON.parse(response.body) rescue nil
+    if !json.nil?
+      json.each do |bridge|
+        uuid = bridge['id']
+        ip_add = bridge['internalipaddress']
+        if !uuid.nil? && !ip_add.nil?
+          bridges[uuid] = "http://#{ip_add}/api"
+        end
+      end
+    end
   end
 
   def self.register_bridges

data/lib/hue/bridge.rb

@@ -53,9 +53,17 @@ module Hue
     #   ids.each{|x| remove_schedule x}
     # end
 
+    def self.register(bridge_uri)
+      instance = self.new("", bridge_uri)
+      instance.register
+      instance
+    end
+
     def register
-      create(URI.parse(bridge_uri),
-             {"username" => application_id, "devicetype" => Hue.device_type})
+      response = create(URI.parse(bridge_uri), {"devicetype" => "#{Hue.device_type}@#{Socket.gethostname}"})
+      if response.first.has_key?('success')
+        @application_id = response.first['success']['username']
+      end
     end
 
     def unregister

data/lib/hue/config/abstract.rb

@@ -6,7 +6,6 @@ module Hue
     class NotFound < Hue::Error; end;
 
     class Abstract
-
       public
 
       attr_reader :path, :name
@@ -64,7 +63,7 @@ module Hue
 
       def self.read_file(config_file)
         begin
-          yaml = YAML.load_file(config_file)
+          YAML.load_file(config_file)
         rescue => err
           raise Error.new("Failed to read configuration file", err)
         end

data/lib/hue/config/application.rb

@@ -15,7 +15,12 @@ module Hue
       end
 
       def self.named(name)
-        yaml = read_file(file_path)
+        begin
+          yaml = read_file(file_path)
+        rescue => err
+          Hue.logger.error(err)
+        end
+
         if yaml && named_yaml = yaml[name]
           new(named_yaml[STRING_BRIDGE_ID], named_yaml[STRING_ID], name)
         else

data/spec/hue/bridge_spec.rb

@@ -62,7 +62,8 @@ describe Hue::Bridge do
     bridge = described_class.new(new_id, TEST_BRIDGE_URI)
 
     it 'should allow registering the new config' do
-      with_fake_post(nil, {:username => new_id, :devicetype => Hue.device_type})
+      mock_socket_hostname
+      with_fake_post(nil, {:devicetype => "hue-lib@hostname"})
       bridge.register
     end
   end

data/spec/hue_spec.rb

@@ -38,6 +38,7 @@ describe Hue do
   context 'when attempting discover without a bridge on the network' do
     before(:each) do
       mock_udp_no_reply
+      mock_nupnp_empty_reply
     end
 
     it 'should return an empty list of bridges' do
@@ -73,7 +74,7 @@ describe Hue do
     it 'should allow a new default if one doesn\'t exist' do
       with_temp_config_path do
         with_fake_post(nil, {}, 'post_success', TEST_UDP_BRIDGE_URI)
-        with_stdout(/Registering app...(.*)$/) do
+        with_stdout(/Registering new app...$/) do
           described_class.register_default
         end
       end

data/spec/spec_helper.rb

@@ -92,7 +92,7 @@ def mock_bridge_config_path
   Hue::Config::Bridge.stubs(:file_path).returns(TEST_CONFIG_BRIDGE_PATH)
 end
 
-# HUE - UDP
+# HUE - DISCOVERY
 
 TEST_UDP_BRIDGE_UUID = '09230030-4c1e-0130-8d83-0018de9ecdd0'
 TEST_UDP_BRIDGE_HOSTNAME = 'upd-host'
@@ -120,6 +120,11 @@ def mock_udp_no_reply
   UDPSocket.stubs(:new).returns(socket)
 end
 
+def mock_nupnp_empty_reply
+  stub_request(:get, "https://www.meethue.com/api/nupnp").
+    with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Host'=>'www.meethue.com', 'User-Agent'=>'Ruby'}).
+    to_return(:status => 200, :body => "", :headers => {})
+end
 
 # BRIDGE - API CALLS
 
@@ -177,3 +182,7 @@ def with_fake_delete(named, delete_reply = 'delete_success')
     stub.should have_been_requested
   end
 end
+
+def mock_socket_hostname
+  Socket.stubs(:gethostname).returns("hostname")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hue-lib
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Birkir A. Barkarson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement