lifx 0.4.6.1 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d7ac636c1a3c658b1859dbf7074fd845cd41e1
-  data.tar.gz: 112e36f614f01183d57d322d83d07807b58fe398
+  metadata.gz: e74701d68bb9de49cf00008a94e46f8721c5d3e6
+  data.tar.gz: 8dd72e9b4f78d2bc70d042142879b3c98df2b172
 SHA512:
-  metadata.gz: 3693b61a7c84222e379dd535e6ccdb80f5e5381f4ac4f0893c0821f8c5ef4a269b19e0f76837158e1a4b5b42bff4b22c988e4b0d0ddf62f749b770a15eaacd90
-  data.tar.gz: 48a3b388801194eccccf878097c8f60ae83bab085e2e6dfa3d291baa6fb31780dcc6dacfd1b9f86214d7cda0e7a7e71e25ac66cae89af088e291a8718e727da2
+  metadata.gz: 8c620c92cf6dd96dac5b2abac78563e3e7276fa7a3a08b17f010eb7fd123320a3cce52d807c6c6eb7cd46d595800e8fba539625cf287cb858888ef812566e148
+  data.tar.gz: 98187dcc6c15b1d53c48ae6cd7ed95dc86c781b3218e2ab79a51d8bf4c56570b1b3152b97091b56f3e41ee3455cde8449c1eed5b408cad1d75b88dc48df227f8

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 0.4.7
+
+- Only create Light devices when a Light::State is received
+- Message rate checker only checks lights considered alive
+
 ### 0.4.6.1
 
 - Fix `Time.parse` issue

data/lib/lifx/client.rb

@@ -14,7 +14,7 @@ module LIFX
       #
       # @return [Client] A LAN LIFX::Client
       def lan
-        @lan ||= new
+        @lan ||= new(transport_manager: TransportManager::LAN.new)
       end
     end
 
@@ -25,9 +25,9 @@ module LIFX
     # @return [NetworkContext] Enclosed network context
     attr_reader :context
 
-    # @param transport: [:lan] Specify which transport to use
-    def initialize(transport: :lan)
-      @context = NetworkContext.new(transport: transport)
+    # @param transport_manager: [TransportManager] Specify the {TransportManager}
+    def initialize(transport_manager: required!('transport_manager'))
+      @context = NetworkContext.new(transport_manager: transport_manager)
     end
 
     # Default timeout in seconds for discovery
@@ -133,5 +133,10 @@ module LIFX
     def flush(timeout: nil)
       context.flush(timeout: timeout)
     end
+
+    # Stops everything and cleans up.
+    def stop
+      context.stop
+    end
   end
 end

data/lib/lifx/message.rb

@@ -10,7 +10,6 @@ module LIFX
     class MessageError < StandardError; end
     class UnpackError < MessageError; end
     class PackError < MessageError; end
-    class NoPath < MessageError; end
 
     class InvalidFrame < UnpackError; end
     class UnsupportedProtocolVersion < UnpackError; end
@@ -88,13 +87,13 @@ module LIFX
     alias_method :addressable?, :addressable
 
     def_delegators :path, :device_id, :site_id, :tagged
-    
+
     attr_accessor :path, :payload
     def initialize(*args)
-      if args.count == 3 
+      if args.count == 3
         @path, @message, @payload = args
       elsif (hash = args.first).is_a?(Hash)
-        path = hash.delete(:path)
+        path = hash.delete(:path) || ProtocolPath.new
         payload = hash.delete(:payload)
 
         check_valid_fields!(hash)
@@ -124,7 +123,6 @@ module LIFX
 
     def pack
       raise NoPayload if !payload
-      raise NoPath if !path
       @message.raw_site = path.raw_site
       @message.raw_target = path.raw_target
       @message.tagged = path.tagged?
@@ -150,7 +148,7 @@ module LIFX
       %Q{#<LIFX::Message #{attrs}>}
     end
     alias_method :inspect, :to_s
-    
+
     protected
 
     def check_valid_fields!(hash)

data/lib/lifx/network_context.rb

@@ -7,7 +7,6 @@ require 'lifx/protocol_path'
 
 module LIFX
   class NetworkContext
-    include Timers
     include Logging
     include Utilities
     include RequiredKeywordArguments
@@ -15,16 +14,12 @@ module LIFX
 
     # NetworkContext stores lights and ties together TransportManager, TagManager and RoutingManager
     attr_reader :transport_manager, :tag_manager, :routing_manager
-    
-    def initialize(transport: :lan)
+
+    def initialize(transport_manager: required!('transport_manager'))
       @devices = {}
 
-      @transport_manager = case transport
-      when :lan
-        TransportManager::LAN.new
-      else
-        raise ArgumentError.new("Unknown transport method: #{transport}")
-      end
+      @transport_manager = transport_manager
+      @transport_manager.context = self
       @transport_manager.add_observer(self) do |message: nil, ip: nil, transport: nil|
         handle_message(message, ip, transport)
       end
@@ -32,9 +27,6 @@ module LIFX
       reset!
 
       @threads = []
-      @threads << initialize_timer_thread
-      initialize_periodic_refresh
-      initialize_message_rate_updater
     end
 
     def discover
@@ -106,7 +98,7 @@ module LIFX
         time = light && light.time
       end
 
-      delay = (messages.count + 1) * (1.0 / message_rate) 
+      delay = (messages.count + 1) * (1.0 / message_rate)
       at_time = ((time.to_f + delay) * 1_000_000_000).to_i
       messages.each do |m|
         m.at_time = at_time
@@ -146,16 +138,8 @@ module LIFX
       @routing_manager.tags_for_device_id(device.id)
     end
 
-    def gateways
-      transport_manager.gateways.map(&:keys).flatten.map { |id| lights.with_id(id) }
-    end
-
-    def gateway_connections
-      transport_manager.gateways.map(&:values).flatten
-    end
-
     def to_s
-      %Q{#<LIFX::NetworkContext connections=#{gateway_connections}>}
+      %Q{#<LIFX::NetworkContext transport_manager=#{transport_manager}>}
     end
     alias_method :inspect, :to_s
 
@@ -166,44 +150,13 @@ module LIFX
 
       @routing_manager.update_from_message(message)
       if !message.tagged?
-        if @devices[message.device_id].nil?
+        if @devices[message.device_id].nil? && message.payload.is_a?(Protocol::Light::State)
           device = Light.new(context: self, id: message.device_id, site_id: message.site_id)
-          register_device(device)
         end
         device = @devices[message.device_id]
         return if !device # Virgin bulb
         device.handle_message(message, ip, transport)
       end
     end
-
-    def initialize_periodic_refresh
-      timers.every(10) do
-        refresh
-      end
-    end
-
-    def initialize_message_rate_updater
-      timers.every(5) do
-        missing_mesh_firmware = lights.select { |l| l.mesh_firmware(fetch: false).nil? }
-        if missing_mesh_firmware.count > 10
-          send_message(target: Target.new(broadcast: true), payload: Protocol::Device::GetMeshFirmware.new)
-        elsif missing_mesh_firmware.count > 0
-          missing_mesh_firmware.each { |l| l.send_message(Protocol::Device::GetMeshFirmware.new) }
-        else
-          @message_rate = lights.all? do |light|
-            m = light.mesh_firmware(fetch: false)
-            m && m >= '1.2'
-          end ? 20 : 5
-          gateway_connections.each do |connection|
-            connection.set_message_rate(@message_rate)
-          end
-        end
-      end
-    end
-
-    DEFAULT_MESSAGING_RATE = 5 # per second
-    def message_rate
-      @message_rate || 5
-    end
   end
 end

data/lib/lifx/transport_manager.rb

@@ -6,6 +6,7 @@ module LIFX
     class Base
       include Logging
       include Observable
+      attr_accessor :context
 
       def initialize(**args)
       end

data/lib/lifx/transport_manager/lan.rb

@@ -3,15 +3,20 @@ require 'lifx/site'
 module LIFX
   module TransportManager
     class LAN < Base
+      include Timers
       def initialize(bind_ip: '0.0.0.0', send_ip: Config.broadcast_ip, port: 56700, peer_port: 56750)
         super
         @bind_ip   = bind_ip
         @send_ip   = send_ip
         @port      = port
         @peer_port = peer_port
-        
+
         @sites = {}
+        @threads = []
+        @threads << initialize_timer_thread
         initialize_transports
+        initialize_periodic_refresh
+        initialize_message_rate_updater
       end
 
       def flush(**options)
@@ -49,6 +54,7 @@ module LIFX
 
       def stop
         stop_discovery
+        @threads.each(&:kill)
         @transport.close
         @sites.values.each do |site|
           site.stop
@@ -103,8 +109,42 @@ module LIFX
         @sites.values.map(&:gateways)
       end
 
+      def gateway_connections
+        gateways.map(&:values).flatten
+      end
+
       protected
 
+      def initialize_periodic_refresh
+        timers.every(10) do
+          context.refresh
+        end
+      end
+
+      def initialize_message_rate_updater
+        timers.every(5) do
+          missing_mesh_firmware = context.lights.alive.select { |l| l.mesh_firmware(fetch: false).nil? }
+          if missing_mesh_firmware.count > 10
+            context.send_message(target: Target.new(broadcast: true), payload: Protocol::Device::GetMeshFirmware.new)
+          elsif missing_mesh_firmware.count > 0
+            missing_mesh_firmware.each { |l| l.send_message(Protocol::Device::GetMeshFirmware.new) }
+          else
+            @message_rate = context.lights.alive.all? do |light|
+              m = light.mesh_firmware(fetch: false)
+              m && m >= '1.2'
+            end ? 20 : 5
+            gateway_connections.each do |connection|
+              connection.set_message_rate(@message_rate)
+            end
+          end
+        end
+      end
+
+      DEFAULT_MESSAGING_RATE = 5 # per second
+      def message_rate
+        @message_rate || 5
+      end
+
       def initialize_transports
         create_broadcast_transport
         create_peer_transport

data/lib/lifx/version.rb

@@ -1,3 +1,3 @@
 module LIFX
-  VERSION = "0.4.6.1"
+  VERSION = "0.4.7"
 end

data/spec/message_spec.rb

@@ -69,8 +69,10 @@ describe LIFX::Message do
     context 'no path' do
       let(:msg) { LIFX::Message.new(payload: LIFX::Protocol::Device::SetPower.new) }
 
-      it 'throws an exception' do
-        expect { msg.pack }.to raise_error(LIFX::Message::NoPath)
+      it 'defaults to null site and target' do
+        unpacked = LIFX::Message.unpack(msg.pack)
+        expect(unpacked.path.site_id).to eq('000000000000')
+        expect(unpacked.path.device_id).to eq('000000000000')
       end
     end
 

data/spec/spec_helper.rb

@@ -14,10 +14,10 @@ shared_context 'integration', integration: true do
       c = LIFX::Client.lan
       begin
         c.discover! do
-          c.tags.include?('Test') && c.lights.with_tag('Test').count > 0
+          c.tags.include?('_Test') && c.lights.with_tag('_Test').count > 0
         end
       rescue Timeout::Error
-        raise "Could not find any lights with tag Test in #{c.lights.inspect}"
+        raise "Could not find any lights with tag _Test in #{c.lights.inspect}"
       end
       c
     end
@@ -27,7 +27,7 @@ shared_context 'integration', integration: true do
     lifx.flush
   end
 
-  let(:lights) { lifx.lights.with_tag('Test') }
+  let(:lights) { lifx.lights.with_tag('_Test') }
   let(:light) { lights.first }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifx
 version: !ruby/object:Gem::Version
-  version: 0.4.6.1
+  version: 0.4.7
 platform: ruby
 authors:
 - Jack Chen (chendo)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata