renstar 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 617260529f9b3d241c8b6f0a4489d9eac7f871a998b9f2e0b42c0ee54e322491
-  data.tar.gz: 3a7560d9559b8c40272a991449bf6d06916fccd4dbc7914e98a5c58d0c84bdd9
+  metadata.gz: 0af30640855c7d5568a2a8fbd16ac0f554f5bdf20415c5085974354120aedfd0
+  data.tar.gz: 04ddf28ef495cb77a1bfebe74d2ae508c9bac487f4eeb86bceddab6cbd2dd228
 SHA512:
-  metadata.gz: 83fd7c65c7162f8c6c9582a6c8525aa49f14c4c578b56e866581fff21fcfa554afe387396ef399d800993787ec378a1066f3da5cb39ee086a5675e9cc188c119
-  data.tar.gz: 1bcf749dad62edddb0d6be3b4c8e081eb08bdef1ad4389bc86b372ad7fb6e3bef6d3369764f8c157d19c6b76f1de21b10bd1444c0098edd2e211f30cfb4b9b7b
+  metadata.gz: 2b8c6e5eb3c7e8e31481d9689c29f01e26f945f89a95342460d2f0864b74c51f9b2003116af4644c5e7f796213db8d016db4706b513b630c70f4a005b41c84ec
+  data.tar.gz: 6afab4dc745a6a18da67f1ecfff3e5047aed24930c23a7d5208864947a780f758ee0fab0f733e5824262b62ae0e198e4663b0b200b835df580ed6ccfcc39e5c2

data/README.md

@@ -4,6 +4,8 @@ Renstar is a Ruby SDK for interacting with the Venstar Thermostat Local API.
 
 You can control your thermostat programmatically!
 
+[![Maintainability](https://api.codeclimate.com/v1/badges/bf690d0fd84e34b70080/maintainability)](https://codeclimate.com/github/mikerodrigues/renstar/maintainability)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/renstar.rb

@@ -83,7 +83,13 @@ command = if ARGV.nil? || ARGV.empty?
             ARGV
           end
 
-response = thermo.send(*command)
+begin
+  response = thermo.send(*command)
+rescue NoMethodError
+  puts "'#{command.join(' ')}' is not a valid command"
+  exit 1
+end
+
 case response
 when String
   puts response

data/lib/renstar/api_client.rb

@@ -13,16 +13,26 @@ module Renstar
   # The actual client that handles getting, posting, and parsing API responses
   #
   module APIClient
+    class APIError < StandardError; end
+    class APIUnknownResponseError < StandardError; end
+
     def get(endpoint)
       uri = URI(location + endpoint)
-      response = Net::HTTP.get(uri)
-      JSON.parse(response)
+      response = Net::HTTP.get_response(uri)
+      JSON.parse(response.body)
     end
 
     def post(endpoint, options = {})
       uri = URI(location + endpoint)
       response = Net::HTTP.post_form(uri, options)
-      JSON.parse(response.body)
+      json = JSON.parse(response.body)
+      if json['error']
+        raise APIError, json['reason']
+      elsif json['success']
+        json
+      else
+        raise APIUnknownResponseError, response.body
+      end
     end
 
     include Query

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
+      ssdp.search(service: SERVICE, timeout: timeout)
     end
   end
 end

data/lib/renstar/thermostat.rb

@@ -30,6 +30,16 @@ 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|
+        Renstar::Thermostat.new(thermo[:params]['Location'], thermo[:params]['USN'])
+      end
+    end
+
     def update
       @cache_timestamp = Time.now
       @cached_info = info
@@ -42,27 +52,14 @@ module Renstar
     end
 
     def heat(heattemp = nil)
-      update
-      if heattemp
-        cooltemp = heattemp.to_i + 1
-      else
-        cooltemp = @cached_info.cooltemp
-        heattemp = @cached_info.heattemp
-      end
+      cooltemp, heattemp = set_temps(heattemp, 1)
       response = control("mode": 1, "cooltemp": cooltemp, "heattemp": heattemp)
       update
       response
     end
 
     def cool(cooltemp = nil)
-      update
-      if cooltemp
-        heattemp = cooltemp.to_i - 1
-        # heattemp = cooltemp - @cached_info.setpointdelta
-      else
-        cooltemp = @cached_info.cooltemp
-        heattemp = @cached_info.heattemp
-      end
+      cooltemp, heattemp = set_temps(cooltemp, 2)
       response = control("mode": 2, "cooltemp": cooltemp, "heattemp": heattemp)
       update
       response
@@ -122,5 +119,24 @@ module Renstar
       update
       response
     end
+
+    private
+
+    def set_temps(temp, mode)
+      update
+      if temp
+        if mode == 1
+          cooltemp = temp.to_i + 1
+          heattemp = temp.to_i
+        else
+          cooltemp = temp.to_i
+          heattemp = temp.to_i - 1
+        end
+      else
+        cooltemp = @cached_info.cooltemp
+        heattemp = @cached_info.heattemp
+      end
+      [cooltemp, heattemp]
+    end
   end
 end

data/lib/renstar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renstar
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Michael Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json