light_me_up 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df08d345a1f2f4591c8b6b7584434d3a8db369297bc0b5ede94908a66238a300
-  data.tar.gz: 5e894436da15580b8e6e93a8065442fe3c555b269205453957e3ae0fa336b0c2
+  metadata.gz: e961aef3afa051d666e6d6058ebd148d78195424ee3651c61a415193dd792dc3
+  data.tar.gz: 26d18eea5934f3c9dfdfc2e2be189dc67d2ab63b60c2aaa73bba1d74a8b8fc6e
 SHA512:
-  metadata.gz: 6af5bd3f911e5a204d9801a31240ee2d71367e025f9ae9989ff61917dee31168c14059cf3eb59578eb9f8a35306d918e72659d8a291134face9b4666dcf43e19
-  data.tar.gz: d3ce9b5f7ff669835356bf6dca49702200d34ec7f50e8023aee2ba411e2d1bd5aaf34a563a518ee3e7c3b6d7291f1657248220ee526c9b46d79909b82162d949
+  metadata.gz: 9dfdd4bde34dd55362e68f8c7f7b4399d0142040a47667c72e68b79396c1d3125e451fa06329b1e4aed01fc6ab182b647c13ef636fce79caa78e27e61eb70a08
+  data.tar.gz: cbe15d94b545f50e41d72abd443e161472586a5f712db1ff338d03b9ca4bcc60ead4141b72702b904b67980d0bc35ded658f7301310145fb2d2e21d123f92750

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    light_me_up (0.2.3)
-      optimist (~> 3.0)
+    light_me_up (0.2.6)
+      optimist
 
 GEM
   remote: https://rubygems.org/
@@ -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

@@ -21,7 +21,7 @@ options = Optimist.options do
   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
@@ -32,7 +32,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
 
@@ -42,7 +42,8 @@ begin
   LightMeUp::SettingsUpdate.new(api_client, options).perform
 rescue LightMeUp::SettingsUpdate::ToggleIncompatible => e
   Optimist.die :toggle, e.message
-rescue LightMeUp::SettingsUpdate::NoOptionsGiven
+rescue LightMeUp::SettingsUpdate::InvalidOptions => e
+  warn e.message
   Optimist.educate
 rescue LightMeUp::Error => e
   warn e.message

data/lib/light_me_up/api_client.rb

@@ -9,12 +9,16 @@ module LightMeUp
     LIGHTS_PATH = "/elgato/lights"
     OPEN_TIMEOUT = 2 # seconds
     READ_TIMEOUT = 2 # seconds
+    MAX_RETRIES = 2
 
-    def initialize(ip_address:, port: DEFAULT_PORT)
+    TEMPERATURE_RANGE = (143..344).freeze
+
+    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
@@ -22,14 +26,14 @@ module LightMeUp
       LightSerializer.deserialize(response).first
     end
 
-    def toggle
+    def toggle(brightness: nil, temperature: nil)
       with_connection do |_http|
         current_status = status
 
         if current_status.on
-          turn_light_off
+          update(on: false, brightness: brightness, temperature: temperature)
         else
-          turn_light_on
+          update(on: true, brightness: brightness, temperature: temperature)
         end
       end
     end
@@ -56,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)
@@ -88,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.rb

@@ -5,7 +5,7 @@ module LightMeUp
     attr_reader :on, :brightness, :temperature
 
     BRIGHTNESS_RANGE = (0..100).freeze
-    TEMPERATURE_RANGE = (143..344).freeze
+    TEMPERATURE_RANGE = (0..100).freeze
 
     class << self
       def max_brightness

data/lib/light_me_up/light_serializer.rb

@@ -13,7 +13,7 @@ module LightMeUp
         {
           on: on_as_int,
           brightness: light.brightness,
-          temperature: light.temperature,
+          temperature: to_api_temperature(light.temperature),
         }.compact
       end
 
@@ -22,10 +22,27 @@ module LightMeUp
           Light.new(
             on: light["on"] == 1,
             brightness: light["brightness"],
-            temperature: light["temperature"]
+            temperature: to_readable_temperature(light["temperature"])
           )
         end
       end
+
+      private
+
+      def to_readable_temperature(api_temperature)
+        scale_value(api_temperature, ApiClient::TEMPERATURE_RANGE, Light::TEMPERATURE_RANGE)
+      end
+
+      def to_api_temperature(readable_temperature)
+        scale_value(readable_temperature, Light::TEMPERATURE_RANGE, ApiClient::TEMPERATURE_RANGE)
+      end
+
+      def scale_value(value, src_range, dest_range)
+        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
 end

data/lib/light_me_up/settings_update.rb

@@ -5,7 +5,7 @@ module LightMeUp
     attr_reader :api_client, :options
 
     class ToggleIncompatible < Error; end
-    class NoOptionsGiven < Error; end
+    class InvalidOptions < Error; end
 
     def initialize(api_client, options)
       @api_client = api_client
@@ -13,21 +13,16 @@ module LightMeUp
     end
 
     def perform
-      if options[:toggle]
-        raise ToggleIncompatible, "is not compatible with setting other options" if settings_options.any?
+      settings_options = options.slice(:toggle, :on, :brightness, :temperature)
+      if settings_options.delete(:toggle)
+        raise ToggleIncompatible, "is not compatible with on or off" if settings_options.key?(:on)
 
-        api_client.toggle
+        api_client.toggle(**settings_options)
       elsif settings_options.any?
         api_client.update(**settings_options)
       else
-        raise NoOptionsGiven, "provide at least one option"
+        raise InvalidOptions, "At least one option must be provided"
       end
     end
-
-    private
-
-    def settings_options
-      @settings_options ||= options.slice(:on, :brightness, :temperature)
-    end
   end
 end

data/lib/light_me_up/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: light_me_up
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.7
 platform: ruby
 authors:
 - Peter McCracken
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Provides the ability to turn on and off, and adjust brightness and temperature,
   on a key light.
 email:
@@ -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.