hiveline 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74826756263ed6a1cfe2f288bd0b2f4bce40f6e
-  data.tar.gz: 9cae527e6b04b298180bc4540a0bf0f7a32dc402
+  metadata.gz: c059e7ee5eddcd56423655cf5845b6bcc27c02a5
+  data.tar.gz: 325dbd20157ab085de429d24fe17ef49abca0db8
 SHA512:
-  metadata.gz: b0c61bc41413c44da0380cd8b86dc4ce0ad56afe3771b1c9d4949caa50bb1525c87caddff999fc50502b4bdc31367b5ffa0d07b25c2386c6e8cdadedc6279b71
-  data.tar.gz: c296db8126ca29c25f70bb74146f935073c26914f9b741d8bef475614a70dec4789d49320bb34e70d0393c11d494f4dff67d2a674be8371407d2e9176b6b97a3
+  metadata.gz: a7feb248a4d80217044dc2aaa86ff6e2fa817807b71dae85a48549f6f736f7a75eabaa96f5019cab4c98fddb7417a907d42be4c1d13234f19ff99b78f5e7ee15
+  data.tar.gz: 58bca2c3519cf2ead934391615126d29320922110d2ba02d8120152d15d7d27ff8fb98b5818c82a14baeaff816cbd952444d7c90e17be35ff0835e8c910379db

data/README.md

@@ -28,8 +28,20 @@ $ hiveline -u <email> -p <password>
 
 ## Use
 
-Set the temperature to 20C
+Get temperature
 
 ```bash
-$ hiveline 20
+$ hiveline
+
+Inside Temperature: 19.9°C
+Weather in London: Cloudy With Light Rain (2.8°C)
+```
+
+Set temperature
+
+```bash
+$ hiveline 19 # Set temperature to 19°C
+
+Setting temperature to 19°C
+Successfully updated temperature. Set to 19°C
 ```

data/bin/hiveline

@@ -31,19 +31,43 @@ if password.nil?
 	exit false
 end
 
-temp = ARGV.last
+client = Hiveline::Client.new(username, password)
+
+command = ARGV.last
+
+def unknown_error
+  print "Something went wrong. Not sure what though because the API is not documented... maybe get up and go check your thermostat?\n"
+end
 
 def numeric?(number)
   return true if number =~ /^\d+$/
   true if Float(number) rescue false
 end
 
-if temp.nil? or !numeric?(temp)
-	print "Please supply a temperature. E.g. hiveline 21\n"
-	exit false
-else
-	temp = temp.to_i
+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"
+  else
+    unknown_error
+  end
 end
 
-client = Hiveline::Client.new(username, password)
-client.set_temperature temp
+def lookup_temperature(client)
+  print "Retrieving temperature information\n"
+  environment = client.get_temperature
+  unless environment.nil?
+    print "Inside Temperature: #{environment["inside"]}°C\n"
+    print "Weather in #{environment["city"]}: #{environment['weather'].split('_').map{|e| e.capitalize}.join(" ")} (#{environment["outside"]}°C)\n"
+  else
+    unknown_error
+  end
+end
+
+if numeric?(command)
+  set_temperature(client, command)
+  exit
+end
+
+lookup_temperature(client)

data/lib/hiveline.rb

@@ -1,54 +1,64 @@
+require 'hiveline/version'
 require 'httparty'
 require 'json'
-require 'hiveline/version'
 
 module Hiveline
 	class Client
-		attr_accessor :username, :password, :hive_id
+		include HTTParty
+		attr_accessor :username, :password, :session
 
 		def initialize(username, password)
 			@username = username
 			@password = password
-			@id = retrieve_session
+		end
+
+		def session
+			@session ||= retrieve_session
 		end
 
 		def set_temperature(temp)
-			print "Setting temperature to #{temp}C...\n"
 			heating_url = "https://my.hivehome.com/heating/target"
-			response = HTTParty.put(heating_url, {
+			id = self.session
+			response = self.class.put(heating_url, {
 				body: {
 					id:1,
 					target:temp
 				},
 				headers: {
-					"Cookie" => "hsid=#{@id}"
+					"Cookie" => "hsid=#{id}"
 				},
 				follow_redirects: false
 			})
 
 			if response.code == 200
-				target = JSON.parse(response.body)["target"]
-				print "Successfully updated temperature. Set to #{target}C\n"
+				JSON.parse(response.body)["target"]
 			else
-				print "Something went wrong. Not sure what, maybe get up and go check your thermostat?\n"
+				nil
 			end
-			response
 		end
 
-		private
-
-		def login
-			print "Authenticating credentials...\n"
-			login_url = "https://my.hivehome.com/login"
-			HTTParty.post(login_url, {
-				body: {
-					username: @username,
-					password: @password
-				}, 
+		def get_temperature
+			weather_url = "https://my.hivehome.com/weather"
+			response = self.class.get(weather_url, {
+				headers: {
+					"Cookie" => "hsid=#{self.session}",
+					"Content-Type" => "application/json"
+				},
 				follow_redirects: false
 			})
+			if response.code == 200
+				JSON.parse(response.body)
+			else
+				nil
+			end
 		end
 
+		private
+
+		def retrieve_session
+			extract_session_id login
+		end
+		
 		def extract_session_id(response)
 			id_attribute_regex = /^hsid=/
 			set_cookie_header = response.headers["set-cookie"]
@@ -60,8 +70,15 @@ module Hiveline
 				.gsub(id_attribute_regex, "")
 		end
 
-		def retrieve_session
-			extract_session_id login
+		def login
+			login_url = "https://my.hivehome.com/login"
+			self.class.post(login_url, {
+				body: {
+					username: @username,
+					password: @password
+				}, 
+				follow_redirects: false
+			})
 		end
 	end
 end

data/lib/hiveline/version.rb

@@ -1,3 +1,3 @@
 module Hiveline
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hiveline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Blanchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: The Hive API was reversed engineered via the Hive thermostat website
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A small Ruby script to change your Hive thermostat temperature through your