renstar 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 617260529f9b3d241c8b6f0a4489d9eac7f871a998b9f2e0b42c0ee54e322491
-  data.tar.gz: 3a7560d9559b8c40272a991449bf6d06916fccd4dbc7914e98a5c58d0c84bdd9
+  metadata.gz: e5990b28a9195f211562ebc90e3164440e0a8e401272fa87c7d9a3f0bf8636a4
+  data.tar.gz: de3c2bc468511bbc4ce4e57030883996384a83572a70fa649fb882980318a78f
 SHA512:
-  metadata.gz: 83fd7c65c7162f8c6c9582a6c8525aa49f14c4c578b56e866581fff21fcfa554afe387396ef399d800993787ec378a1066f3da5cb39ee086a5675e9cc188c119
-  data.tar.gz: 1bcf749dad62edddb0d6be3b4c8e081eb08bdef1ad4389bc86b372ad7fb6e3bef6d3369764f8c157d19c6b76f1de21b10bd1444c0098edd2e211f30cfb4b9b7b
+  metadata.gz: '08cb4e79d6675044dad081a517a5efd9c683b80e593f566459202084c35962f7c37c7f92448cad5d1a957a1753d972de8cbb7ca96e08db0d86716701af1aec6c'
+  data.tar.gz: 70a6044088c34b6a0c56d410cc63a1bfee460b6a4c2290846d09f03ed9263504f33c2b1706228e459a2be233de1e0a55439aa6a824b7047d2cc7721950ceb51d

data/lib/renstar/discovery.rb

@@ -8,17 +8,8 @@ module Renstar
   # the network
   module Discovery
     # Discovery timeout when searching for thermostats
-    DEFAULT_TIMEOUT = 3
     SERVICE = 'venstar:thermostat:ecp'
 
-    def search(timeout = DEFAULT_TIMEOUT)
-      all_thermos = []
-      ips.each do |ip|
-        all_thermos << ssdp_search(ip, timeout)
-      end
-      all_thermos.flatten
-    end
-
     private
 
     def ips
@@ -28,15 +19,10 @@ module Renstar
     end
 
     # do an SSDP search using the given IP from a found local interface
-    def ssdp_search(ip, timeout = DEFAULT_TIMEOUT)
+    def ssdp_search(ip, timeout = 5)
       puts "Searching subnet associated with #{ip.ip_address}"
       ssdp = SSDP::Consumer.new({ bind: ip.ip_address })
       thermos = ssdp.search(service: SERVICE, timeout: timeout)
-      thermos.map do |thermo|
-        location = thermo[:params]['Location']
-        usn = thermo[:params]['USN']
-        Renstar::Thermostat.new(location, usn)
-      end
     end
   end
 end

data/lib/renstar/thermostat.rb

@@ -30,6 +30,18 @@ module Renstar
       @cached_info = info
     end
 
+    def self.search(timeout = 3)
+      all_thermos = []
+      ips.each do |ip|
+        all_thermos << ssdp_search(ip, timeout)
+      end
+      all_thermos.flatten.map do |thermo|
+        location = thermo[:params]['Location']
+        usn = thermo[:params]['USN']
+        Renstar::Thermostat.new(location, usn)
+      end
+    end
+
     def update
       @cache_timestamp = Time.now
       @cached_info = info

data/lib/renstar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renstar
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renstar
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Michael Rodrigues