ecobee 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48dab0a8186e1abe5f05115a744bf06a6167b718
-  data.tar.gz: d76e8de7fbf97ae44095436197f1d7085a324d9d
+  metadata.gz: b62f3e7da3fde7ec3f2b62407f1f4f656179ff29
+  data.tar.gz: 39a2c7d8f683b4094052ce433bc94d97064e6026
 SHA512:
-  metadata.gz: 7e5ca066357160e4f43a67d90f6186437cf98f7a1105f1dba652eac447c588cec03c43f8c2e44f3caf791a0eabca9fc4b64f213f4a588e32c0ad9411cade0c05
-  data.tar.gz: 0bbc4eb430f37858787f915b10ab4af799fac335651344357e41becf7a883e3dd090d9359438e04ab0b9de50671df6cd4ab084b051b8ed244be8b777142c157a
+  metadata.gz: bc42968dec571366c148e4c6ebaf365be8c587bfeaf31355aa833302b474776bd95e8c8fc04c61ea207a3a26d81e49dcd540154994e615fe67e2097fe0778236
+  data.tar.gz: a1d941292c3b5be46861e8020f03c515d85f3810009ad4eb7efbaea2dab1bd613a96b733aec772324ab8553a6982ea1309aceb240d142b094acf2037b5084592

data/lib/ecobee/http.rb

@@ -1,6 +1,5 @@
 module Ecobee
-
-  class HTTPError < StandardError ; end
+class HTTPError < StandardError ; end
   class AuthError < HTTPError ; end
 
   class HTTP
@@ -127,6 +126,8 @@ module Ecobee
       elsif !response['status'].key? 'code'
         raise Ecobee::HTTPError.new('Validate Error: Missing Status Code')
       elsif response['status']['code'] == 14
+        log "validate_status: token expired access_token_expire: #{@token.access_token_expire}"
+        log "validate_status:                               now: #{Time.now.to_i}"
         :retry
       elsif response['status']['code'] != 0
         raise Ecobee::HTTPError.new(

data/lib/ecobee/thermostat.rb

@@ -240,7 +240,7 @@ module Ecobee
       body = my_selection
       body.merge!({ 'functions' => functions }) if functions
       body.merge!({ 'thermostat' => thermostat }) if thermostat
-      @http.post(:thermostat, body: body)
+      @http.post(arg: :thermostat, body: body)
     end
 
   end

data/lib/ecobee/token.rb

@@ -26,6 +26,7 @@ module Ecobee
       access_token_expire: nil,
       app_key: nil,
       callbacks: {},
+      log_file: nil,
       refresh_token: nil,
       scope: SCOPES[0],
       token_file: DEFAULT_FILES
@@ -40,7 +41,8 @@ module Ecobee
 
       @authorization_thread, @pin, @status, @token_type = nil
       @poll_interval = DEFAULT_POLL_INTERVAL
-      @http = Ecobee::HTTP.new(log_file: "/tmp/token.log", token: self)
+
+      @http = Ecobee::HTTP.new(log_file: log_file, token: self)
 
       @refresh_pad = REFRESH_PAD + rand(REFRESH_PAD)
 
@@ -52,8 +54,10 @@ module Ecobee
      if @access_token
        if access_token_expired?
          if @refresh_token
+           @http.log "access_token: refreshing #{@access_token}, #{@access_token_expire}, #{Time.now.to_i}"
            refresh_access_token
          else
+           @http.log "access_token: token_register"
            token_register 
          end
        else
@@ -63,8 +67,10 @@ module Ecobee
              puts "Status: MISMATCH: #{@status} vs #{desired_status}" if @status
              @status = desired_status
            end
+           @http.log "access_token: good #{@access_token}, #{@access_token_expire}, #{Time.now.to_i}"
            @access_token
          else
+           @http.log "access_token: check_for_authorization #{@access_token}, #{@access_token_expire}"
            check_for_authorization
          end
        end
@@ -162,23 +168,21 @@ module Ecobee
 
     # arrives here, expired
     def check_for_authorization
-      check_for_authorization_single
+      do_check_for_authorization
       if @status == :authorization_pending
         unless @authorization_thread && @authorization_thread.alive?
           @authorization_thread = Thread.new {
             loop do
-              puts "Sleeping for #{@poll_interval}"
               sleep @poll_interval
               break if @status == :ready
-              puts "check_for_authorization_single"
-              check_for_authorization_single
+              do_check_for_authorization
             end
           }
         end
       end
     end
 
-    def check_for_authorization_single
+    def do_check_for_authorization
       arg = sprintf("?grant_type=ecobeePin&code=%s&client_id=%s",
                     @access_token,
                     @app_key)

data/lib/ecobee/version.rb

@@ -1,3 +1,3 @@
 module Ecobee
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecobee
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rob Zwissler