light_me_up 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d795fa88a021f974ba2ef80b74326b1222f1f41a20ba71dbd4ea3be643f468
-  data.tar.gz: 92aec84e39354826ec8bc195e8286bd073b414f96bfe4c51ad437f3406f0972f
+  metadata.gz: 4706c4eb47c5cb6f0745812c3d71fa6705eb0b89983f81ff5920e1ae8278ea3c
+  data.tar.gz: ea36d55e8640514bfced3e4cb19ec15c262c9947cd24c7ebbce638295136e22a
 SHA512:
-  metadata.gz: 2f7a7b3c45989710a289136eb7ef2f2bc6b2999bfa8951679bad760b7c7d3bae01e713ac57e57a365b113439f7cf783c201283c4f210e4917710b9b024518dda
-  data.tar.gz: 956f1e24553299defa116ff3107eab99d285ce02c44378d0f1ed436fefd334d4a39cec8e7c34da0c0846a5a36f7b039f55c3de8dcea6b5fdb4c7150da1487c19
+  metadata.gz: 8a850ec31386fb7c9b08b25c0f7ccaf483303d03080fabfa63a5b33da7b472f6743b1a03b7817d0da4e0d1a3379f122e3218fe796260234e6812a2b824f3577f
+  data.tar.gz: 929a547cf62f6865e02b4de1b865739f8d42bdb95f19a12930b5135feb39bdec9ca59d4ad24dd1eb1ebe022fe20d554bd27eed3d1df95dd996a71b4f732f2a28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    light_me_up (0.2.5)
+    light_me_up (0.2.8)
       optimist (~> 3.0)
 
 GEM
@@ -10,25 +10,25 @@ GEM
     ast (2.4.2)
     minitest (5.15.0)
     optimist (3.0.1)
-    parallel (1.21.0)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.4.0)
     rexml (3.2.5)
-    rubocop (1.24.0)
+    rubocop (1.29.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.17.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.19.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)

data/bin/light-me-up

@@ -17,14 +17,16 @@ temperature_help = format(
 
 options = Optimist.options do
   banner "Usage: #{$PROGRAM_NAME} [options]"
+  version "light-me-up #{LightMeUp::VERSION}"
 
   opt :toggle, "Toggle whether the lights are on or off", short: "T"
   opt :on, "Turn the light on"
   opt :off, "Turn the light off", short: "O"
-  opt :ip_address, "Specify the IP address", type: :string, default: ENV["ELGATO_IP_ADDRESS"]
+  opt :ip_address, "Specify the IP address", type: :string, default: ENV.fetch("ELGATO_IP_ADDRESS", nil)
   opt :defaults, "Set to default values"
   opt :brightness, brightness_help, type: :integer
   opt :temperature, temperature_help, type: :integer
+  opt :version, "Print version number and exit"
 end
 
 options = options.select { |_k, v| v }
@@ -32,7 +34,7 @@ options[:on] = false if options.delete(:off)
 if options.delete(:defaults)
   options = {
     brightness: ENV["ELGATO_DEFAULT_BRIGHTNESS"].to_i,
-    temperature: ENV["ELGATO_DEFAULT_TEMPERATURE"].to_i
+    temperature: ENV["ELGATO_DEFAULT_TEMPERATURE"].to_i,
   }.merge(options)
 end
 

data/lib/light_me_up/api_client.rb

@@ -9,14 +9,16 @@ module LightMeUp
     LIGHTS_PATH = "/elgato/lights"
     OPEN_TIMEOUT = 2 # seconds
     READ_TIMEOUT = 2 # seconds
+    MAX_RETRIES = 2
 
     TEMPERATURE_RANGE = (143..344).freeze
 
-    def initialize(ip_address:, port: DEFAULT_PORT)
+    def initialize(ip_address:, retries: MAX_RETRIES, port: DEFAULT_PORT)
       raise Error, "No ip_address specified." unless ip_address && ip_address != ""
 
       @ip_address = ip_address
       @port = port
+      @max_retries = retries
     end
 
     def status
@@ -58,7 +60,7 @@ module LightMeUp
 
     private
 
-    attr_reader :ip_address, :port, :connection
+    attr_reader :ip_address, :port, :connection, :max_retries
 
     def lights_uri
       URI::HTTP.build(host: ip_address, port: port, path: LIGHTS_PATH)
@@ -90,13 +92,25 @@ module LightMeUp
       !!@connection
     end
 
-    def with_connection
+    def with_connection(&block)
+      retries = 0
+      begin
+        start_connection(&block)
+      rescue Errno::EHOSTDOWN
+        raise Error, "Couldn't connect to lights."
+      rescue Net::OpenTimeout
+        raise Error, "Timeout connecting to lights." if retries >= max_retries
+
+        retries += 1
+        retry
+      end
+    end
+
+    def start_connection
       Net::HTTP.start(ip_address, port, open_timeout: OPEN_TIMEOUT, read_timeout: READ_TIMEOUT) do |connection|
         @connection = connection
         yield
       end
-    rescue Errno::EHOSTDOWN, Net::OpenTimeout
-      raise Error, "Couldn't connect to lights."
     ensure
       @connection = nil
     end

data/lib/light_me_up/light_serializer.rb

@@ -38,8 +38,10 @@ module LightMeUp
       end
 
       def scale_value(value, src_range, dest_range)
-        scale_ratio = dest_range.size.to_f / src_range.size.to_f
-        (dest_range.min + scale_ratio * (value - src_range.min)).round
+        return nil unless value
+
+        scale_ratio = dest_range.size.to_f / src_range.size
+        (dest_range.min + (scale_ratio * (value - src_range.min))).round
       end
     end
   end

data/lib/light_me_up/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LightMeUp
-  VERSION = "0.2.5"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light_me_up
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - Peter McCracken
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Command line control for a brand name key light.