ledenet_api 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87668efdb9907a70ca5403fcc5e775b49cca8281
-  data.tar.gz: c28f029d20bd5db8a8ed7b082543a2e3c2084acc
+  metadata.gz: 4d5893787aba1976347d33316a6d873779732c6b
+  data.tar.gz: 8f2a3d6d7572646fd0fdbef5d8e36897ffdac4b7
 SHA512:
-  metadata.gz: d3f3a4daf29ed9ff6f3e15aeb79e77b4359be4de13c3e574880ec9667ba58eabbd7eaea198ceb213441365aa32de14135c4456aebc9def39b89701ff355b6d05
-  data.tar.gz: 91405ab30ed0358a49348f88252c9f2ab73641562db985b6050c87998111dd1529d9e585af84e892a8d7ccbe1d73a54cbf03f63b124847fef1f19fd38967f6da
+  metadata.gz: 28b67ca59bcfa3a42fef42f3b10d55cdd075c745d743b65fc251c24dc5c92aea9e15f3b4ea774f72cb70fa56ffa9e019f2471b59d001e4fd0516b80e589d033c
+  data.tar.gz: 879814ec02173f453df70b69bd3262609b45c04f4e3d3cfbcbb25ca83095774c923302068403721ef7d3f7c9266bde95093552c6e295cd80b50eb5465be89dfe

data/README.md

@@ -34,6 +34,13 @@ devices.first.ip
 => "10.133.8.113"
 ```
 
+By deafult, `discover_devices` waits for up to 5 seconds for a single device to respond, and returns immediately after finding one. To change this behavior:
+
+```ruby
+irb(main):005:0> LEDENET.discover_devices(expected_devices: 2, timeout: 1)
+=> [#<LEDENET::Device:0x007fff328f4330 @ip="10.133.8.113", @hw_addr="XXXXXXXXXXXX", @model="HF-LPB100-ZJ200">]
+```
+
 ### API
 
 To construct an API class, use the following:
@@ -56,7 +63,7 @@ api = LEDENET::Api.new('10.133.8.113', reuse_connection: true, max_retries: 0)
 
 ### Status
 
-To check if the controller is current on:
+To check if the controller is currently on:
 
 ```ruby
 api.on?
@@ -84,7 +91,7 @@ api.current_color
 To set the color:
 
 ```ruby
-irb(main):016:0> api.update_color(255, 0, 255)
+api.update_color(255, 0, 255)
 => true
 ```
 

data/lib/ledenet/device_discovery.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'timeout'
+require 'set'
 
 module LEDENET
   class Device
@@ -16,7 +17,8 @@ module LEDENET
 
   DEFAULT_OPTIONS = {
       expected_devices: 1,
-      timeout: 5
+      timeout: 5,
+      expected_models: []
   }
 
   # The WiFi controllers these things appear to use support a discovery protocol
@@ -35,14 +37,18 @@ module LEDENET
     send_socket.send('HF-A11ASSISTHREAD', 0, send_addr[0], send_addr[1])
 
     discovered_devices = []
+    discovered_models = Set.new
+    expected_models = Set.new(options[:expected_models])
 
     begin
       Timeout::timeout(options[:timeout]) do
-        while true
+        while discovered_devices.count < options[:expected_devices] or
+              !expected_models.subset?(discovered_models)
           data = send_socket.recv(1024)
-          discovered_devices.push(LEDENET::Device.new(data))
 
-          raise Timeout::Error if discovered_devices.count >= options[:expected_devices]
+          device = LEDENET::Device.new(data)
+          discovered_devices.push(device)
+          discovered_models.add(device.model)
         end
       end
     rescue Timeout::Error
@@ -53,4 +59,4 @@ module LEDENET
 
     discovered_devices
   end
-end
+end

data/lib/ledenet/version.rb

@@ -1,3 +1,3 @@
 module LEDENET
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ledenet_api
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 description: 
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -80,17 +80,17 @@ 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: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An API for the LEDENET Magic UFO LED WiFi Controller