ecobee 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e1f09ccaf034288f69027fbdee27dcda1ec37e
-  data.tar.gz: dc85e92a4b63632526b5f842af407f79c815f3d9
+  metadata.gz: 50df9ac248431f92cafec6438d42aa0bb04d964f
+  data.tar.gz: 1928432f79c576e9d6f88a04a00a5a8a8ca1d511
 SHA512:
-  metadata.gz: 8be36180162e8eaccbd9b55988d63fef4c2f838f2d20dde0ecbe46abcfa28966e103fa5011538e53f0812a22c3a6543548fba2df01664f7ec7da8ae0955cc2e0
-  data.tar.gz: 86e228b3a77ab77b45f4dee223e8e488d37bb3e68cd187217afc844ab5a9fa7795960faceb0cfec9b9648002208097d974b1e70e59c583528630aa71f9ae6009
+  metadata.gz: dd700da725bca1f2b2cd79e371cbc14e9b8a85b2852c2433852d473fc561ec39b67a6dc90d454ef8235fc55a5fdb1945044535a14257a4ce5a6cdd627a2f13bb
+  data.tar.gz: d06a3c81087115ef8d741c749bcc99ea52efd0cc668c2543f10c4b524bfec85ac65c4dfb715a62b327136e4c536f834133207e120aee6246f24ba4cefac05a63

data/README.md

@@ -3,34 +3,42 @@
 Ecobee API Ruby Gem.  Implements: 
 - OAuth PIN-based token registration & renewal
 - Persistent HTTP connection
-- Methods for get & push requests
+- Methods for GET & POST requests
 - Persistent storage for API key & refresh tokens
 - Example usage scripts (see /examples/\*)
 
-TODO:
-- Implement throttling / blocking (?)
-- Convert storage to generic hook
+Status:
+- Working, but is very basic. Contact me with feature requests.
 
+TODO:
+- Document API
+- Convert token storage to optional block/proc
+- Add timeout to Ecobee::Token#wait
+- Add redirect based registration
+- Implement throttling / blocking
+- Helper methods/classes for building/reading requests
 
 ## Installation
 
-Add this line to your application's Gemfile:
+The latest ecobee Ruby Gem is [available from Rubygems.org](https://rubygems.org/gems/ecobee).
 
-```ruby
-gem 'ecobee'
+To install from the command line, run:
+```
+gem install ecobee
 ```
 
-And then execute:
-
-    $ bundle
+## Usage
 
-Or install it yourself as:
+1. Obtain an Application Key from Ecobee by [registering your project](https://www.ecobee.com/developers).
 
-    $ gem install ecobee
+2. Using Ecobee::Token, obtain an OAuth Access Token.
+  - Instantiate Ecobee::Token with the api_key and desired scope.
+  - Give user Ecobee::Token#pin and instructions to register your Application via the [Ecobee My Apps Portal](https://www.ecobee.com/consumerportal/index.html#/my-apps).
+  - You can call Ecobee::Token#wait to block until the user confirms the PIN code.
 
-## Usage
+3. Instantiate Ecobee::Client with the token object.
 
-TODO: Write usage instructions here
+4. Call Ecobee::Client#get or Ecobee::Client#post to interact with [Ecobee's API](https://www.ecobee.com/home/developer/api/introduction/index.shtml).
 
 ## Development
 

data/examples/bitbar_plugin.rb

@@ -0,0 +1,252 @@
+#!/usr/bin/env ruby
+#
+# Allows for display and control of your Ecobee in the Mac OS X 
+# menubar, using BitBar (http://getbitbar.com).   -- @robzr
+#
+# <bitbar.title>EcobeeStat</bitbar.title>
+# <bitbar.version>v1.0</bitbar.version>
+# <bitbar.author>Rob Zwissler</bitbar.author>
+# <bitbar.author.github>robzr</bitbar.author.github>
+# <bitbar.desc>Ecobee Thermostat Control</bitbar.desc>
+# <bitbar.image>http://github.com/robzr/ecobee</bitbar.image>
+# <bitbar.dependencies>ruby</bitbar.dependencies>
+# <bitbar.abouturl>http://github.com/robzr/ecobee</bitbar.abouturl>
+
+require 'pp'
+require 'ecobee'
+#require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee.rb'
+#require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee/client.rb'
+#require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee/token.rb'
+#require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee/register.rb'
+
+API_KEY = 'u2Krw0OumeliB0OnwiaogySvgExhy2K4'
+HVAC_MODES = ['auto', 'auxHeatOnly', 'cool', 'heat', 'off', 'quit']
+DEG = '°'
+
+module Ecobee
+  class ResponseError < StandardError ; end
+
+  class BitBar
+    def initialize(client)
+      @client = client
+    end
+
+    def get_thermostat(args = {})
+      index = args.delete(:index) || 0
+      http_response = @client.get('thermostat', 
+                                  Ecobee::Selection(args))
+      response = JSON.parse(http_response.body)
+      get_thermostat_list_index(index: index,
+                                response: validate_status(response))
+    rescue JSON::ParserError => msg
+      raise ResponseError.new("JSON::ParserError => #{msg}")
+    end
+
+    def get_thermostat_list_index(index: 0, response: nil)
+      if !response.key? 'thermostatList'
+        raise ResponseError.new('Missing thermostatList')
+      elsif index >= response['thermostatList'].length
+        raise ResponseError.new(
+          "Missing thermostatList Index #{index} (Max Found: " +
+          "#{response['thermostatList'].length - 1})"
+        )
+      else
+        response['thermostatList'][index]
+      end
+    end
+
+    def validate_status(response)
+      if !response.key? 'status'
+        raise ResponseError.new('Missing Status') 
+      elsif !response['status'].key? 'code'
+        raise ResponseError.new('Missing Status Code') 
+      elsif response['status']['code'] != 0
+        raise ResponseError.new(
+          "GET Error: #{response['status']['code']} " +
+          "Message: #{response['status']['message']}"
+        )
+      else
+        response
+      end
+    end
+
+#      puts "Heat: #{info['runtime']['desiredHeat'] / 10}#{DEG} | color=red"
+
+    def set_hold(cool_hold: nil, heat_hold: nil)
+      functions = [{
+        'type' => 'setHold',
+        'params' => {
+          'holdType' => 'nextTransition',
+        }
+      }]
+      functions[0]['params']['coolHoldTemp'] = cool_hold
+      functions[0]['params']['heatHoldTemp'] = heat_hold
+      http_response = @client.post(
+        'thermostat', 
+        body: { 
+          'selection' => {
+            'selectionType' => 'registered',
+            'selectionMatch' => '',
+          },
+          'functions' => functions
+        }
+      )
+      response = JSON.parse(http_response.body)
+    end
+
+    def update_mode(mode)
+      http_response = @client.post(
+        'thermostat', 
+        body: { 
+          'selection' => {
+            'selectionType' => 'registered',
+            'selectionMatch' => '',
+          },
+          'thermostat' => {
+            'settings' => {
+              'hvacMode' => mode
+            }
+          }
+        }
+      )
+      response = JSON.parse(http_response.body)
+    end
+  end
+end
+
+def header(info)
+  puts "#{info['runtime']['actualTemperature'] / 10.0}#{DEG}"
+  puts '---'
+end
+
+def cool_menu(info)
+  present_mode = info['settings']['hvacMode']
+  return unless ['auto', 'cool'].include? present_mode
+  puts "Cool: #{info['runtime']['desiredCool'] / 10}#{DEG} | color=blue"
+  cool_low = info['settings']['coolRangeLow'] / 10
+  cool_high = info['settings']['coolRangeHigh'] / 10
+  (cool_low..cool_high).reverse_each do |temp|
+    flag, color = ''
+    flag = ' :arrow_left:' if temp == info['runtime']['actualTemperature'] / 10
+    color = ' color=blue' if temp == info['runtime']['desiredCool'] / 10
+    puts("--#{temp}#{DEG}#{flag}|#{color} bash=\"#{$0}\" " +
+         "param1=\"set_cool=#{temp}\" refresh=true terminal=false")
+  end
+end
+
+def heat_menu(info)
+  present_mode = info['settings']['hvacMode']
+  return unless ['auto', 'auxHeatOnly', 'heat'].include? present_mode
+  puts "Heat: #{info['runtime']['desiredHeat'] / 10}#{DEG} | color=red"
+  heat_low = info['settings']['heatRangeLow'] / 10
+  heat_high = info['settings']['heatRangeHigh'] / 10
+  (heat_low..heat_high).reverse_each do |temp|
+    flag, color = ''
+    flag = ' :arrow_left:' if temp == info['runtime']['actualTemperature'] / 10
+    color = ' color=red' if temp == info['runtime']['desiredHeat'] / 10
+    puts("--#{temp}#{DEG}#{flag}|#{color} bash=\"#{$0}\" " +
+         "param1=\"set_heat=#{temp}\" refresh=true terminal=false")
+  end
+end
+
+def mode_menu(info)
+  puts "Mode: #{info['settings']['hvacMode']}"
+  Ecobee::HVAC_MODES.reject { |mode| mode == info['settings']['hvacMode'] }
+    .each do |mode|
+      puts("--#{mode} | bash=\"#{$0}\" param1=\"set_mode=#{mode}\" " +
+           "refresh=true terminal=false")
+  end
+end
+
+def separator
+  puts '---'
+end
+
+def stat_info(info)
+  puts info['name'] 
+  info['remoteSensors'].each do |sensor|
+    temp = sensor['capability'].select do |cap|
+      cap['type'] == 'temperature'
+    end
+    temp = temp[0]['value'].to_i / 10.0
+    puts "--#{sensor['name']}: #{temp}#{DEG}"
+  end
+  puts "#{info['brand']} #{Ecobee::Model(info['modelNumber'])}"
+  puts "Status: #{info['equipmentStatus']}"
+end
+
+def website
+  puts 'Ecobee Web Portal|href="https://www.ecobee.com/consumerportal/index.html"'
+end
+
+token = Ecobee::Token.new(
+  app_key: API_KEY, app_name: API_KEY,
+  scope: :smartWrite,
+  token_file: '~/.ecobee_token'
+)
+if token.pin
+  puts "Ecobee | color=red"
+  puts "---"
+  puts "Registration Needed | color=red"
+  puts "---"
+  puts 'Login to Ecobee | href=\'https://www.ecobee.com/consumerportal/index.html\''
+  puts 'Select \'My Apps\' from the drop-down menu'
+  puts 'Press the \'Add Application\' button'
+  puts "Enter authorization code: #{token.pin}"
+  exit
+end
+
+ecobar = Ecobee::BitBar.new Ecobee::Client.new(token: token)
+
+case arg = ARGV.shift 
+when /^dump/
+  pp ecobar.get_thermostat(
+    :includeRuntime => true,
+    :includeExtendedRuntime => true,
+    :includeElectricity => true,
+    :includeSettings => true,
+    :includeLocation => true,
+    :includeProgram => true,
+    :includeEvents => true,
+    :includeDevice => true,
+    :includeTechnician => true,
+    :includeUtility => true,
+    :includeAlerts => true,
+    :includeWeather => true,
+    :includeOemConfig => true,
+    :includeEquipmentStatus => true,
+    :includeNotificationSettings => true,
+    :includeVersion => true,
+    :includeSensors => true
+  )
+when /^set_mode=/
+  mode = arg.sub(/^.*=/, '')
+  ecobar.update_mode mode
+when /^set_cool=/
+  info = ecobar.get_thermostat(includeRuntime: true,
+                               includeSettings: true)
+  cool_hold = arg.sub(/^.*=/, '').to_i * 10
+  heat_hold = info['runtime']['desiredHeat']
+
+  ecobar.set_hold(cool_hold: cool_hold, heat_hold: heat_hold)
+when /^set_heat=/
+  info = ecobar.get_thermostat(includeRuntime: true,
+                               includeSettings: true)
+  cool_hold = info['runtime']['desiredCool']
+  heat_hold = arg.sub(/^.*=/, '').to_i * 10
+
+  ecobar.set_hold(cool_hold: cool_hold, heat_hold: heat_hold)
+else
+  info = ecobar.get_thermostat(includeRuntime: true,
+                               includeSettings: true,
+                               includeEquipmentStatus: true,
+                               includeSensors: true)
+  header info
+  cool_menu info
+  heat_menu info
+  separator
+  stat_info info
+  mode_menu info
+  separator
+  website
+end

data/examples/set_mode.rb

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby
+#
+# Loops through menu showing current thermostat mode, with option
+# to change the mode.       -- @robzr
 
 require 'pp'
 require 'ecobee'
 
-HVAC_MODES = ['auto', 'auxHeatOnly', 'cool', 'heat', 'off', 'quit']
+@hvac_modes = Ecobee::HVAC_MODES + ['quit']
 
 class TestFunctions
   def initialize(client)
@@ -55,37 +58,36 @@ class TestFunctions
     )
     response = JSON.parse(http_response.body)
   end
-
 end
 
-
 token = Ecobee::Token.new(
-  api_key: ENV['ECOBEE_API_KEY'],
+  app_key: ENV['ECOBEE_APP_KEY'],
+  app_name: 'set_mode',
   scope: :smartWrite,
   token_file: '~/.ecobee_token'
 )
 
-puts token.pin_message if token.pin
-token.wait
-
-test_functions = TestFunctions.new(Ecobee::Client.new(token: token))
+puts token.pin_message if token.pin token.wait 
+test_functions = TestFunctions.new(
+  Ecobee::Client.new(token: token)
+)
 
 loop do
   test_functions.print_summary
 
   answer = -1
-  while !answer.between?(0, HVAC_MODES.length)
+  until answer.between?(0, @hvac_modes.length - 1)
     puts
-    (1..HVAC_MODES.length).each do |num|
-      printf "%d) %s\n", num, HVAC_MODES[num - 1]
+    (1..@hvac_modes.length).each do |num|
+      printf "%d) %s\n", num, @hvac_modes[num - 1]
     end
     print "Enter mode: "
     answer = gets.to_i - 1
-    abort if answer == (HVAC_MODES.length - 1)
+    abort if answer == (@hvac_modes.length - 1)
   end
   puts
 
-  result = test_functions.update_mode(HVAC_MODES[answer])
+  result = test_functions.update_mode(@hvac_modes[answer])
 
   unless result.key?('status') && (result['status']['code'] == 0)
     puts "Unknown result: #{result.to_s}\n" 

data/examples/test_token.rb

@@ -1,10 +1,15 @@
 #!/usr/bin/env ruby
+#
+# Refreshes token; displays details on saved token.  -- @robzr
 
 require 'pp'
 require 'ecobee'
+require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee/token.rb'
+require_relative '/Users/robzr/GitHub/ecobee/lib/ecobee/register.rb'
 
 token = Ecobee::Token.new(
-  api_key: ENV['ECOBEE_API_KEY'],
+  app_key: ENV['ECOBEE_API_KEY'],
+  app_name: 'ecobee-gem',
   token_file: '~/.ecobee_token'
 )
 

data/lib/ecobee.rb

@@ -12,7 +12,7 @@ module Ecobee
   API_PORT = 443
   CONTENT_TYPE = ['application/json', { 'charset' => 'UTF-8' }]
 
-  DEFAULT_APP_NAME = 'ecobee-gem'
+  HVAC_MODES = ['auto', 'auxHeatOnly', 'cool', 'heat', 'off']
 
   REFRESH_INTERVAL_PAD = 60
   REFRESH_TOKEN_CHECK = 10 
@@ -22,9 +22,11 @@ module Ecobee
   URL_BASE= "https://#{API_HOST}:#{API_PORT}"
 
   URL_API = "#{URL_BASE}/1/"
-  URL_GET_PIN = "#{URL_BASE}/authorize?response_type=ecobeePin&client_id=%s&scope=%s"
+  URL_GET_PIN = URL_BASE + 
+    '/authorize?response_type=ecobeePin&client_id=%s&scope=%s'
   URL_TOKEN = "#{URL_BASE}/token"
 
+
   def self.Model(model)
     { 'idtSmart'    => 'ecobee Smart',
       'idtEms'      => 'ecobee Smart EMS',
@@ -55,8 +57,32 @@ module Ecobee
       15 => 'Duplicate data violation.',
       16 => 'Invalid token. Token has been deauthorized by user. You must ' +
             're-request authorization.'
-    }[core] || 'Unknown Error.'
+    }[code] || 'Unknown Error.'
   end
 
-end
+  def self.Selection(arg = {})
+    { 'selection' => {
+        'selectionType' => 'registered',
+        'selectionMatch' => '',
+        'includeRuntime' => 'false',
+        'includeExtendedRuntime' => 'false',
+        'includeElectricity' => 'false',
+        'includeSettings' => 'false',
+        'includeLocation' => 'false',
+        'includeProgram' => 'false',
+        'includeEvents' => 'false',
+        'includeDevice' => 'false',
+        'includeTechnician' => 'false',
+        'includeUtility' => 'false',
+        'includeAlerts' => 'false',
+        'includeWeather' => 'false',
+        'includeOemConfig' => 'false',
+        'includeEquipmentStatus' => 'false',
+        'includeNotificationSettings' => 'false',
+        'includeVersion' => 'false',
+        'includeSensors' => 'false',
+      }.merge(Hash[*arg.map { |k,v| [k.to_s, v.to_s] }.flatten])
+    }
+  end
 
+end

data/lib/ecobee/client.rb

@@ -10,7 +10,8 @@ module Ecobee
     def get(arg, options = nil)
       new_uri = URL_API + arg.sub(/^\//, '')
       new_uri += '?json=' + options.to_json if options
-      request = Net::HTTP::Get.new(URI new_uri)
+
+      request = Net::HTTP::Get.new(URI(URI.escape(new_uri)))
       request['Content-Type'] = *CONTENT_TYPE
       request['Authorization'] = @token.authorization
       http.request(request)
@@ -19,7 +20,7 @@ module Ecobee
     def post(arg, options: {}, body: nil)
       new_uri = URL_API + arg.sub(/^\//, '')
       request = Net::HTTP::Post.new(URI new_uri)
-      request.set_form_data({ 'format': 'json' }.merge(options))
+      request.set_form_data({ 'format' => 'json' }.merge(options))
       request.body = JSON.generate(body) if body
       request['Content-Type'] = *CONTENT_TYPE
       request['Authorization'] = @token.authorization

data/lib/ecobee/register.rb

@@ -1,12 +1,13 @@
 module Ecobee
+  require 'date'
 
   class Register
-    attr_reader :result
+    attr_reader :expires_at, :result
 
-    def initialize(api_key: nil, scope: SCOPES[0])
-      raise ArgumentError.new('Missing api_key') unless api_key
-
-      @result = get_pin(api_key: api_key, scope: scope)
+    def initialize(app_key: nil, scope: SCOPES[0])
+      raise ArgumentError.new('Missing app_key') unless app_key
+      @result = get_pin(app_key: app_key, scope: scope)
+      @expires_at = DateTime.now.strftime('%s').to_i + result['expires_in'] * 60
     end
 
     def code
@@ -21,27 +22,28 @@ module Ecobee
       @result['ecobeePin']
     end
 
+    def scope
+      @result['scope']
+    end
+
     private 
 
-    def get_pin(api_key: nil, scope: nil)
-      uri_pin = URI(URL_GET_PIN % [api_key, scope.to_s])
+    def get_pin(app_key: nil, scope: nil)
+      uri_pin = URI(URL_GET_PIN % [app_key, scope.to_s])
       result = JSON.parse Net::HTTP.get(uri_pin)
       if result.key? 'error'
-        raise Ecobee::RegisterError.new(
-          "Result Error: (%s) %s" % [result['error'], result['error_description']]
+        raise Ecobee::TokenError.new(
+          "Register Error: (%s) %s" % [result['error'], result['error_description']]
         )
       end
       result
     rescue SocketError => msg
-      raise Ecobee::RegisterError.new("GET failed: #{msg}")
+      raise Ecobee::TokenError.new("GET failed: #{msg}")
     rescue JSON::ParserError => msg
-      raise Ecobee::RegisterError.new("Result parsing: #{msg}")
+      raise Ecobee::TokenError.new("Parse Error: #{msg}")
     rescue Exception => msg
-      raise Ecobee::RegisterError.new("Unknown Error: #{msg}")
+      raise Ecobee::TokenError.new("Unknown Error: #{msg}")
     end
   end
 
-  class RegisterError < StandardError
-  end
-
 end

data/lib/ecobee/token.rb

@@ -1,4 +1,5 @@
 module Ecobee
+  require 'date' 
 
   class Token
     attr_reader :access_token, 
@@ -12,26 +13,26 @@ module Ecobee
                 :type
 
     def initialize(
-      api_key: nil, 
-      app_name: DEFAULT_APP_NAME,
+      app_key: nil, 
+      app_name: nil,
       code: nil,
       refresh_token: nil,
       scope: SCOPES[0],
       token_file: nil
     )
-      @api_key = api_key
+      @app_key = app_key
       @app_name = app_name
       @code = code
-      @access_token, @expires_at, @pin, @type = nil
+      @access_token, @code_expires_at, @expires_at, @pin, @type = nil
       @refresh_token = refresh_token
       @scope = scope
       @status = :authorization_pending
       @token_file = File.expand_path(token_file)
-      read_token_file unless @refresh_token
+      parse_token_file unless @refresh_token
       if @refresh_token
         refresh
       else
-        register unless code
+        register unless pin_is_valid
         check_for_token
         launch_monitor_thread unless @status == :ready
       end
@@ -46,6 +47,14 @@ module Ecobee
       "#{@type} #{@access_token}"
     end
 
+    def pin_is_valid
+      if @pin && @code && @code_expires_at
+        @code_expires_at.to_i >= DateTime.now.strftime('%s').to_i
+      else
+        false
+      end
+    end
+
     def pin_message
       "Log into Ecobee web portal, select My Apps widget, Add Application, " +
       "enter the PIN #{@pin || ''}"
@@ -56,7 +65,7 @@ module Ecobee
         URI(URL_TOKEN),
         'grant_type' => 'refresh_token',
         'refresh_token' => @refresh_token,
-        'client_id' => @api_key
+        'client_id' => @app_key
       )
       result = JSON.parse(response.body)
       if result.key? 'error'
@@ -69,6 +78,7 @@ module Ecobee
         @access_token = result['access_token']
         @expires_at = Time.now + result['expires_in']
         @refresh_token = result['refresh_token']
+        @pin, @code, @code_expires_at = nil
         @scope = result['scope']
         @type = result['token_type']
         @status = :ready
@@ -94,12 +104,13 @@ module Ecobee
         URI(URL_TOKEN),
         'grant_type' => 'ecobeePin',
         'code' => @code,
-        'client_id' => @api_key
+        'client_id' => @app_key
       )
       result = JSON.parse(response.body)
       if result.key? 'error'
         unless ['slow_down', 'authorization_pending'].include? result['error']
-pp result
+          # TODO: throttle or just ignore...?
+          pp result
           raise Ecobee::TokenError.new(
             "Result Error: (%s) %s" % [result['error'],
                                        result['error_description']]
@@ -112,6 +123,7 @@ pp result
         @expires_at = Time.now + result['expires_in']
         @refresh_token = result['refresh_token']
         @scope = result['scope']
+        @pin, @code, @code_expires_at = nil
         write_token_file
       end
     rescue SocketError => msg
@@ -132,32 +144,63 @@ pp result
       }
     end
 
-    def read_token_file
-      tf = File.open(@token_file, 'r').read(16 * 1024)
-      config = JSON.parse(tf)
-      if config.key? @app_name
-        @app_key ||= config[@app_name]['app_key']
-        @refresh_token = config[@app_name]['refresh_token']
+    def parse_token_file
+#puts "Before Parse: app_key:#{@app_key} refresh_token:#{@refresh_token} pin:#{pin}"
+      return unless (config = read_token_file).is_a? Hash
+      section = (@app_name && config.key?(@app_name)) ? @app_name : @app_key
+      if config.key?(section)
+        @app_key ||= if config[section].key?('app_key') 
+                       config[section]['app_key']
+                     else
+                       @app_name
+                     end
+        if config[section].key?('refresh_token')
+          @refresh_token ||= config[section]['refresh_token']
+        elsif config[section].key?('pin')
+          @pin ||= config[section]['pin']
+          @code ||= config[section]['code']
+          @code_expires_at ||= config[section]['code_expires_at'].to_i
+        end
       end
+#puts "After Parse: app_key:#{@app_key} refresh_token:#{@refresh_token} pin:#{pin}"
+    end
+
+    def read_token_file
+      JSON.parse(
+        File.open(@token_file, 'r').read(16 * 1024)
+      )
     rescue Errno::ENOENT
+      {}
     end
 
     def register
-      result = Register.new(api_key: @api_key, scope: @scope)
+      result = Register.new(app_key: @app_key, scope: @scope)
       @pin = result.pin
       @code = result.code
+      @code_expires_at = result.expires_at
+      @scope = result.scope
+      write_token_file
       result
     end
 
     def write_token_file
       return unless @token_file
+      if config = read_token_file
+        config.delete(@app_name)
+        config.delete(@app_key)
+      end
+      section = @app_name || @app_key
+      config[section] = {}
+      config[section]['app_key'] = @app_key if @app_key && section != @app_key
+      if @refresh_token
+        config[section]['refresh_token'] = @refresh_token 
+      elsif @pin
+        config[section]['pin'] = @pin
+        config[section]['code'] = @code
+        config[section]['code_expires_at'] = @code_expires_at
+      end
       File.open(@token_file, 'w') do |tf|
-        tf.puts JSON.pretty_generate({
-          @app_name => {
-            'app_key' => @app_key,
-            'refresh_token' => @refresh_token
-          }
-        })
+        tf.puts JSON.pretty_generate(config)
       end
     end
 

data/lib/ecobee/version.rb

@@ -1,3 +1,3 @@
 module Ecobee
-  VERSION = "0.1.1"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecobee
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Rob Zwissler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - bin/console
 - bin/setup
 - ecobee.gemspec
+- examples/bitbar_plugin.rb
 - examples/set_mode.rb
 - examples/test_token.rb
 - lib/ecobee.rb