xilight 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44464a51e814edd4efc2df5a1fbf336f8081faa936cc1a3a1e228bcdc6777ae7
-  data.tar.gz: fd04dddea590e4f0fb860b57e5334bacf017f151245eb839e425fd1727d6ebe0
+  metadata.gz: 17fc14ee43f5badbb28219ee22a5cc54981034f74b63ecba76215fbba9d14158
+  data.tar.gz: a0237242c81acbe5d0c045c826193f4d1e22faf1c6e0d93e4ba234378dbc89b9
 SHA512:
-  metadata.gz: d065ccb4e6aa4ff99984778525dd69f1b6fda9cf2d7f25e1de176d241b53fbcd846e8735588cb11634f8a9efb320d5374f280803a9c72ebdab27ca0928dfa07b
-  data.tar.gz: 538d5da718744d16bd2690728a496cfd799fbee712ed97ec1166be6bde5deabf4a7b00e40b91cfeff47d3141e96f90038894d4450ee936e490903c8c0fba94b3
+  metadata.gz: f76ca3da153d8491281e68a1f0dcd3d67459a126bbfdfa92ef4b8439453273ac2c0a7cd4c8b58860796d0ca37c3dc014db941fb5067a9f563082662fc77f3996
+  data.tar.gz: 00597cf9aa48c2374e240d9563f996e1096931d05a9c4beb2b29e83842a6114c78717233ee9fbac25efbdfad86b35e737e8fce04c3e1af7fe419ac02b43efa2b

data/exe/yee

@@ -20,14 +20,20 @@ module Xilight
       {}
     end
 
-    def self.get_light(index, name=nil)
+    def self.get_light(index, name=nil, attempt: 0)
       lights = ::Xilight::CLI.config['yeelights']
       light_attribs = if name && name != ''
         lights.find{|l| l['name'].downcase.strip == name.downcase.strip }
       else
         lights[index.to_i]
       end
-      ::Xilight::Yeelight.new(light_attribs.map{|k,v| [k.to_sym, v]}.to_h)
+      light = ::Xilight::Yeelight.new(light_attribs.map{|k,v| [k.to_sym, v]}.to_h)
+      unless light.available?
+        self.discover
+        get_light(index, name, attempt: 1) if attempt.zero?
+      else
+        light
+      end
     rescue
       puts "Couldn't find light with " + ((name && name != '') ? "name #{name}" : "ID #{index}")
       puts "Known lights:"
@@ -35,6 +41,14 @@ module Xilight
       exit(1)
     end
 
+    def self.discover
+      ::Xilight::CLI.config = {
+        'yeelights' => ::Xilight::Yeelight.discover.each do |light|
+          light.instance_variables.map{|v| [v.to_s[1..-1], light.instance_variable_get(v)] }.to_h
+        end
+      }
+    end
+
     module Commands
       extend Dry::CLI::Registry
 
@@ -58,11 +72,7 @@ module Xilight
         ]
 
         def call(**)
-          ::Xilight::CLI.config = {
-            'yeelights' => ::Xilight::Yeelight.discover.each do |light|
-              light.instance_variables.map{|v| [v.to_s[1..-1], light.instance_variable_get(v)] }.to_h
-            end
-          }
+          ::Xilight::CLI.discover
         end
       end
 
@@ -135,6 +145,7 @@ module Xilight
         ]
 
         def call(brightness:, light: 0, name: nil, **)
+          binding.pry
           light =::Xilight::CLI.get_light(light, name)
           light.bright = brightness.to_i
         end

data/lib/xilight.rb

@@ -24,6 +24,22 @@ module Xilight
       @port       = location[/(?!<:)\d+$/]
     end
 
+    def available?()
+      begin
+        Timeout::timeout(1) do
+          begin
+            s = TCPSocket.new(@host, @port)
+            s.close
+            return true
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return false
+          end
+        end
+      rescue Timeout::Error
+      end
+      return false
+    end
+
     def request(cmd)
       begin
         Timeout.timeout(0.5) do

data/lib/xilight/version.rb

@@ -1,3 +1,3 @@
 module Xilight
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xilight
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli