home_assistant-ble 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5032787cdddda273cb5b45a51d3d9f6c247f9077
-  data.tar.gz: 8f9da019ee04dda8dc59d5a2c30043887d84c8ae
+  metadata.gz: a23b76747cc7c5e4722adbbf6fe881e5ff2b18d1
+  data.tar.gz: 2113ebdd0d8b275ac9d7340718b80291bc4b191b
 SHA512:
-  metadata.gz: 209c4a747d75889eef7f78729214223f2b7049cf70b5a59ffc80f21889ff5b418dc9ce39c27a0e4540e1f0ff08e3f39f6cf69872187e7cee8e686d736ae385fd
-  data.tar.gz: 3ae70f258edbf1f31c70da3e5978f9b1f4b7f0f1a9f84bf779cf902c43aa1f8802e912ba64bd712de3c43388531f2a2a303cdf56cf97932fc62265cf89ef9c88
+  metadata.gz: aa42612f3d48e2e2f9cbfccb221c25904f34163bdd78b087594357e7536c5f5cab92e0b5438c7f950f60f6174b46887fae010ff8399dbba8ca1c95816ad9fe5c
+  data.tar.gz: f59361122fa9aea39451dd38aabff74c0bb222f0929a7dcee4aca97fd24b41472d85ad6ac8ba80e374d2f6c36ee153000c16e9a7ea821b9e97ed6e615806a9fb

data/README.md

@@ -9,8 +9,11 @@ Since HA does not cope well with bluetooth device tracking (https://home-assista
 
 ## Installation
 
+For raspbian install required packages:
 
-$ `gem install home_assistant-ble`
+    $ sudo apt-get install ruby-dev libcap-dev
+
+    $ gem install home_assistant-ble
 
 ## Usage
 

data/lib/home_assistant/ble.rb

@@ -5,6 +5,7 @@ require 'net/http'
 require 'uri'
 require 'json'
 require 'cap2'
+require 'digest/md5'
 
 module HomeAssistant
   module Ble
@@ -44,12 +45,19 @@ module HomeAssistant
           YAML.load_file(config['home_assistant_devices_file']).each do |name, conf|
             next unless conf['mac'] =~ /^(ble_|bt_)/i
             next unless conf['track']
-            mac = conf['mac'].gsub(/^(ble_|bt_)/i, '').upcase
-            devices[mac] = name
+            mac = conf.delete('mac').gsub(/^(ble_|bt_)/i, '').upcase
+            conf['name'] = name # erase name with HA id
+            devices[mac] = conf
             debug "Adding #{mac} (#{name}) found in known_devices.yaml"
           end
         end
-        devices.merge!(config['home_assistant_devices']) if config['home_assistant_devices']
+        if config['home_assistant_devices']
+          config['home_assistant_devices'].each do |mac, name|
+            devices[mac] = Mash.new(name: name)
+          end
+        end
+
+        devices
       end
 
       def run
@@ -98,12 +106,23 @@ module HomeAssistant
         end
       end
 
-      def update_home_assistant(ha_name, state)
+      def state_update(ha_conf, state)
+        attributes = {}
+        attributes['entity_picture'] = ha_conf['picture']
+        if ha_conf['gravatar']
+          hash = Digest::MD5.hexdigest(ha_conf['gravatar'].downcase)
+          attributes['entity_picture'] = "https://www.gravatar.com/avatar/#{hash}"
+        end
+        JSON.dump('state' => state, 'attributes' => attributes)
+      end
+
+      def update_home_assistant(ha_conf, state)
+        ha_name = ha_conf['name']
         uri = URI.join(home_assistant_url, "api/states/device_tracker.#{ha_name}")
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
         request['X-Ha-Access'] = home_assistant_password if home_assistant_password
-        request.body = JSON.dump('state' => state)
+        request.body = state_update(ha_conf, state)
         req_options = { use_ssl: uri.scheme == 'https' }
 
         response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|

data/lib/home_assistant/ble/version.rb

@@ -1,5 +1,5 @@
 module HomeAssistant
   module Ble
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: home_assistant-ble
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler