hiveline 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe530f7a8271b82f9ea3931ac6c09c648f5990b
-  data.tar.gz: 73d5b882c0957023eb2b0d3c2d49226bc1115a53
+  metadata.gz: c3d9806ec2d28bb69b9618c42c926cbf7d8eb78a
+  data.tar.gz: 9180f209cfbffd935973a68300855ce7c9e717e0
 SHA512:
-  metadata.gz: a88ceae109b7436354fc433ad70177e4accded4b887266903bb2b656f53c2765ea9c5103778c165141d3cb1bf7547c90ffbbbde375fc946ee10dbcdd92ce2190
-  data.tar.gz: 9048d8a64e64966e538403cce56f7a6ed296188adc11887c874a5db7f024b07f20d0f53dd2723ce3ceb2ff539d3bfe7e2bff1c157a5eb79fc0e66c4bed611abb
+  metadata.gz: 3c0561b0b060cbab1811037cd96da4802218eeb81df2771ceeb674bb6d723ce4e2c13160b7be92fd64a9a0f87c399337e47ee183482f0acf8e12c0f979df1b46
+  data.tar.gz: 85d58deca29ef22806e3d52292a600d0dc4305c024d934a4f0d2eea1064cde44d74458d96fd369893471363e63d540b2a078a7e8f5006de7d0eb6a496d7f5ea9

data/README.md

@@ -33,8 +33,8 @@ Get temperature
 ```bash
 $ hiveline
 
-Inside Temperature: 19.9°C
-Weather in London: Cloudy With Light Rain (2.8°C)
+Inside Temperature: 16.8°C (17°C todays average)
+Outide Temperature: 7.2°C (Partly Cloudy)
 ```
 
 Set temperature

data/bin/hiveline

@@ -51,9 +51,9 @@ end
 
 def set_temperature(client, temp)
   print "Setting temperature to #{temp}°C\n"
-  temperature = client.set_temperature(temp)
-  unless temperature.nil?
-    print "Successfully updated temperature. Set to #{temperature}°C\n"
+  response_success = client.set_temperature(temp)
+  if response_success
+    print "Successfully updated temperature. Set to #{temp}°C\n"
   else
     unknown_error
   end
@@ -62,11 +62,11 @@ end
 def lookup_temperature(client)
   print "Retrieving temperature information\n"
   environment = client.get_temperature
+  inside = environment["inside"]
+  outside = environment["outside"]
   unless environment.nil?
-    print "Inside Temperature: #{environment["inside"]}°C\n"
-    if environment['weather'] && environment['outside']
-      print "Weather in #{environment["city"]}: #{environment['weather'].split('_').map{|e| e.capitalize}.join(" ")} (#{environment["outside"]}°C)\n"
-    end
+    print "Inside Temperature: #{inside["now"]}°C (#{inside["averages"]["today"]}°C todays average)\n"
+    print "Outide Temperature: #{outside["now"]}°C (#{outside["weather"]["description"]})\n"
   else
     unknown_error
   end
@@ -92,6 +92,10 @@ def pretty_print_temp(p, max)
   d = DateTime.parse(p["date"])
   print d.strftime("%H %p ")
   temp = p["temperature"]
+  if temp.instance_of? String
+    print "\n"
+    return
+  end
   bar_length = ((temp / max) * max_width).round
   bar_length.times { print '=' }
   (max_width - bar_length).times { print ' ' }
@@ -101,7 +105,14 @@ end
 
 if options[:history]
   history = lookup_history client
-  max = history["data"].map { |p| p["temperature"] }.max
+  max = history["data"].map do |p| 
+    temp = p["temperature"]
+    if temp.instance_of? String 
+      0
+    else
+      temp
+    end
+  end.max
   history["data"]
     .reject { |p| DateTime.parse(p["date"]).strftime("%M") != "00" }
     .each { |p| pretty_print_temp p, max }

data/lib/hiveline.rb

@@ -5,43 +5,45 @@ require 'json'
 module Hiveline
 	class Client
 		include HTTParty
-		attr_accessor :username, :password, :session
+		attr_accessor :username, :password, :session_cache
 
 		def initialize(username, password)
 			@username = username
 			@password = password
 		end
 
+		def api_session
+			session[:ApiSession]
+		end
+
+		def hub_ids
+			session[:hubIds]
+		end
+
 		def session
-			@session ||= retrieve_session
+			@session_cache ||= get_session
 		end
 
 		def set_temperature(temp)
-			heating_url = "https://my.hivehome.com/heating/target"
-			id = self.session
+			heating_url = "https://api.hivehome.com/v5/users/#{self.username}/widgets/climate/targetTemperature"
 			response = self.class.put(heating_url, {
 				body: {
-					id:1,
-					target:temp
+					temperature: temp,
+					temperatureUnit: "C"
 				},
 				headers: {
-					"Cookie" => "hsid=#{id}"
+					"Cookie" => "ApiSession=#{self.api_session}",
 				},
 				follow_redirects: false
 			})
-
-			if response.code == 200
-				JSON.parse(response.body)["target"]
-			else
-				nil
-			end
+			response.code == 204
 		end
 
 		def get_temperature
-			weather_url = "https://my.hivehome.com/weather"
+			weather_url = "https://api.hivehome.com/v5/users/#{self.username}/widgets/temperature"
 			response = self.class.get(weather_url, {
 				headers: {
-					"Cookie" => "hsid=#{self.session}",
+					"Cookie" => "ApiSession=#{self.api_session}",
 					"Content-Type" => "application/json"
 				},
 				follow_redirects: false
@@ -54,10 +56,14 @@ module Hiveline
 		end
 
 		def get_history
-			history_url = "https://my.hivehome.com/history/today"
+			# Just get the first device, ignore others
+			hub_id = hub_ids[0]
+			thermostat = get_thermostat hub_id
+			thermostat_id = thermostat["id"]
+			history_url = "https://api.hivehome.com/v5/users/#{self.username}/widgets/temperature/#{thermostat_id}/history?period=today"
 			response = self.class.get(history_url, {
 				headers: {
-					"Cookie" => "hsid=#{self.session}",
+					"Cookie" => "ApiSession=#{self.api_session}",
 					"Content-Type" => "application/json"
 					},
 				follow_redirects: false
@@ -69,32 +75,37 @@ module Hiveline
 			end
 		end
 
-		private
-
-		def retrieve_session
-			extract_session_id login
+		def get_devices(hub_id)
+			devices_url = "https://api.hivehome.com/v5/users/#{self.username}/hubs/#{hub_id}/devices"
+			response = self.class.get(devices_url, {
+				headers: {
+					"Cookie" => "ApiSession=#{self.api_session}"	
+				},
+				follow_redirects: false
+			})
+			if response.code == 200
+				JSON.parse(response.body)
+			else
+				nil
+			end
 		end
-		
-		def extract_session_id(response)
-			id_attribute_regex = /^hsid=/
-			set_cookie_header = response.headers["set-cookie"]
-			set_cookie_header
-				.split(";")
-				.each(&:strip!)
-				.grep(id_attribute_regex)
-				.first
-				.gsub(id_attribute_regex, "")
+
+		def get_thermostat(hub_id)
+			get_devices(hub_id).select { |device| device["type"] == "HAHVACThermostat" }.pop
 		end
 
-		def login
-			login_url = "https://my.hivehome.com/login"
-			self.class.post(login_url, {
+		private
+
+		def get_session
+			login_url = "https://api.hivehome.com/v5/login"
+			response = self.class.post(login_url, {
 				body: {
 					username: @username,
 					password: @password
 				}, 
 				follow_redirects: false
 			})
+			JSON.parse(response.body, symbolize_names: true)
 		end
 	end
 end

data/lib/hiveline/version.rb

@@ -1,3 +1,3 @@
 module Hiveline
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiveline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chris Blanchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty