home_assistant-ble 1.4.0.pre.alpha.pre.50 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622bc1ec8d5545186dae5bf39994e74d9cbd5777
-  data.tar.gz: ab020ca5c8832f2a67b06682af3a9e6a229c43ac
+  metadata.gz: df137ae166f962112cbaf769795065e6ef454c78
+  data.tar.gz: e5837bc320fd2bb0bab1514440d2279025c10d5e
 SHA512:
-  metadata.gz: ead1203b97722a6cb71cad66062590230b8446e0bdc5bef0ebe62904cc379c050d5bc5a9988880dc2a73eb3904a9783e14be1b1d2be63b9ed5d94ea464ce3fa9
-  data.tar.gz: d929dee60d3a1d7303c82c1a6fbbc941a91ff1ac6b0ee90828cb35ec66ac96a27e2d3e5168cc5f3ec361415b4dd7bf0bf8b8ea3c2140975027e241a0d641fa83
+  metadata.gz: 7c86d06ff34769b00c7d2c27c8b5f4462e3b11f11a4454a956a955ff6c899a122b7baa9fd130cc070a937a80e8174dce1618c9a1d38e1debd27ef8f7e1b0d4c0
+  data.tar.gz: e2cc1991f47d847c9da8090ea84487dbbb4ca6833289a68c91167bcb532b9a85dcc8dc8ff56044d0234b27e42ea773223a5b88eba8516437b713f7c17448d378

data/README.md

@@ -41,7 +41,8 @@ sudo setcap 'cap_net_raw,cap_net_admin+eip' `readlink -f \`which ruby\``
 interval: 30                              # in seconds, interval between device scan. Defaults to 30
 grace_period: 60                          # in seconds, delay before considering a device has disappeared. Defaults to 60
 home_assistant_url: http://localhost:8123 # url to contact home-assistant. Defaults to http://localhost:8123
-home_assistant_password: xxxxx            # non mandatory password to authenticate to home-assistant api. Default is nil
+home_assistant_token: token               # Long lived access token if you're using the `homeassistant` http auth type.
+home_assistant_password: xxxxx            # non mandatory password to authenticate to home-assistant api. Default is nil. If `home_assistant_token` is provided this setting has no effect
 home_assistant_devices:                   # devices whose activity will be sent to home-assistant. Default is empty (no tracked devices)
   F0:5C:F4:EA:BF:C8: nut1                 # [macaddress]: [identifier for home-assistant]
 

data/bin/home_assistant-ble

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby2.3
 
 require 'home_assistant/ble'
 require 'yaml'
@@ -11,17 +11,15 @@ $stderr.sync = true
 
 def shut_down
   @detector.clean_all_devices
-  $stdout.puts 'Quitting...'
+  $stdout.puts 'Quitting'
 end
 
 Signal.trap('INT') do
-  $stdout.puts 'Received SIGINT.'
   shut_down
   exit
 end
 
 Signal.trap('TERM') do
-  $stdout.puts 'Received SIGTERM.'
   shut_down
   exit
 end
@@ -36,10 +34,4 @@ end
 
 @detector = HomeAssistant::Ble::Detector.new(config)
 
-begin
-  @detector.run
-rescue ScriptError
-  # If no BLE interface is available clean up and exit
-  $stdout.puts 'No Bluetooth interfaces available.'
-  shut_down
-end
+@detector.run

data/example_config.yml

@@ -2,6 +2,7 @@ interval: 30 # in seconds
 grace_period: 60 # in seconds
 home_assistant_url: http://localhost:8123
 # home_assistant_password: xxxxx
+# home_assistant_token: xxxxx
 home_assistant_devices:
   F0:5C:F4:EA:BE:C1: a_device
 home_assistant_devices_file: /var/lib/hass/known_devices.yaml

data/lib/home_assistant/ble.rb

@@ -39,6 +39,10 @@ module HomeAssistant
         config['home_assistant_password']
       end
 
+      def home_assistant_token
+        config['home_assistant_token']
+      end
+
       def home_assistant_devices
         devices = {}
         if  config['home_assistant_devices_file']
@@ -47,7 +51,7 @@ module HomeAssistant
             next unless conf['track']
             mac = conf['mac'].gsub(/^(ble_|bt_)/i, '').upcase
             conf['dev_id'] = name
-            devices[mac] = conf.select { |k, _v| %w(dev_id mac name).include? k }
+            devices[mac] = conf.select { |k, _v| %w(dev_id mac).include? k }
             debug "Adding #{mac} (#{conf['name']}) found in known_devices.yaml"
           end
         end
@@ -120,7 +124,14 @@ module HomeAssistant
         uri = URI.join(home_assistant_url, '/api/services/device_tracker/see')
         request = Net::HTTP::Post.new(uri)
         request.content_type = 'application/json'
-        request['X-Ha-Access'] = home_assistant_password if home_assistant_password
+        request['Accept-Encoding'] = 'plain'
+
+        if home_assistant_token
+          request['Authorization'] = "Bearer #{home_assistant_token}"
+        elsif home_assistant_password
+          request['X-Ha-Access'] = home_assistant_password
+        end
+
         request.body = ha_conf.to_json
         req_options = { use_ssl: uri.scheme == 'https' }
 

data/lib/home_assistant/ble/version.rb

@@ -1,5 +1,5 @@
 module HomeAssistant
   module Ble
-    VERSION = '1.4.0'.freeze
+    VERSION = '1.4.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: home_assistant-ble
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.alpha.pre.50
+  version: 1.4.2
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,12 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Companion app for home-assistant sending event about BLE devices