evok-to-mqtt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 785d9c7a80a6d0f3f6542cdcb31948d2b953d1af846c759a7b7eb63dd2010b36
-  data.tar.gz: 66b75d061bb64340a98c716adf2248195e56b7bb9f2ad5f21923122f261af01b
+SHA1:
+  metadata.gz: 4a2c194985e49019a2edeca6e39df69d39ac5b39
+  data.tar.gz: 1fb2efdc0b342f542a053678ea6bf2c3d6a3e2e3
 SHA512:
-  metadata.gz: 9533b2226a696eadde3e3332b80d393de5ddc0a3d8f0b29e7cd4585a4aa98f85655026981f1f8167a08c54be587093bc81e1c6368880342546e5c6dd4285e146
-  data.tar.gz: 20332590c4b7a427fb5ebedce3eb5ced30049175c0b7d3675a99a2e36ab114f798dec55bb2c4fa9c5686a258b40805e223bdff920e52e2a714917c5e2d6ef806
+  metadata.gz: ebb6455312ca89750aa4e2067300553f7b848e3eeee4d32b8fdfe7e5b831ac84bfea27d1aaf3e30bc308c6dff7df61688a873fbb0bdeb5c0dce478ca70be4223
+  data.tar.gz: 4f3f2246a42544a91bf10caa85c60b3ad7c233cc1323a4d981b231f7efe209a756741618fb73499c822ca9d98ffe69daf396bc290d3eb7e2066df6c7974d1528

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+evok-to-mqtt-mapping.yml

data/README.md

@@ -8,6 +8,8 @@ $ gem install evok-to-mqtt
 
 ## Usage
 
+Prepare mapping config file ```evok-to-mqtt-mapping.yml``` from [evok-to-mqtt-mapping.yml.example](https://raw.githubusercontent.com/aufi/evok-to-mqtt/master/evok-to-mqtt-mapping.yml.example).
+
 ```bash
 $ evok-to-mqtt <evok_hostname> <mqtt_host>
 ```

data/evok-to-mqtt-mapping.yml.example

@@ -0,0 +1,14 @@
+# EXAMPLE
+#
+# mistnosti:
+# obyvak, kuchyn, dolni_chodba, horni_chodba, pracovna, dolni_koupelna, tech_mistnost, loznice, horni_koupelna, zachod, detsky_pokoj_2, detsky_pokoj_honza
+#
+
+---
+  relay:
+    1_01: obyvak/svetlo
+  input:
+    1_01: obyvak/tlacitko_dvere_l
+    1_02: obyvak/tlacitko_dvere_p
+  ai:
+    1_01: dum/svetlo_venku

data/evok-to-mqtt.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Marek Aufart"]
   spec.email         = ["aufi.cz@gmail.com"]
 
-  spec.summary       = %q{A bridge between Unipi's EVOK and MQTT message bus}
-  spec.description   = %q{A bridge between Unipi's EVOK and MQTT message bus as Ruby gem}
+  spec.summary       = %q{A bridge between Unipi EVOK and MQTT message bus}
+  spec.description   = %q{A bridge between Unipi EVOK and MQTT message bus as Ruby gem}
   spec.homepage      = "https://github.com/aufi/evok-to-mqtt"
   spec.license       = "Apache-2.0"
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

data/lib/evok-to-mqtt.rb

@@ -1,10 +1,11 @@
 # load everything
 #Dir['./lib/**/*.rb'].each{ |f| require f }
-#require "pry"
+require 'yaml'
 
 module EvokToMqtt
-  def self.run(evok_host, mqtt_host)
-    app = EvokToMqtt::Worker.new(evok_host, mqtt_host, EvokToMqtt::Mappers::ToHaab.new)
+  def self.run(evok_host, mqtt_host, mapping_file_path = 'evok-to-mqtt-mapping.yml')
+    mapping_config = YAML.load(File.read(mapping_file_path))
+    app = EvokToMqtt::Worker.new(evok_host, mqtt_host, EvokToMqtt::Mappers::ToHaab.new(mapping_config))
     app.run
   end
 end

data/lib/evok-to-mqtt/mappers/to_haab.rb

@@ -1,14 +1,13 @@
 module EvokToMqtt
   module Mappers
     class ToHaab
-      def initialize
+      def initialize(mapping)
+        @mapping  = mapping
         @statuses = {}
       end
 
       def process(mqtt, evok_event)
-        # puts "Statuses"
-        # p @statuses
-        id      = "neuron/#{evok_event["dev"]}/#{evok_event["circuit"]}"
+        id      = get_topic(evok_event["dev"], evok_event["circuit"])
         now     = Time.now
         payload = evok_event
 
@@ -28,6 +27,17 @@ module EvokToMqtt
           mqtt.publish id, {action: 'down', data: payload}
         end
       end
+
+      private
+
+      def get_topic(dev, circuit)
+        begin
+          return @mapping[dev][circuit]
+        rescue KeyError => ex
+          puts "Warning: #{ex}, using raw topic"
+          return "neuron_raw/#{dev}/#{circuit}"
+        end
+      end
     end
   end
 end

data/lib/evok-to-mqtt/version.rb

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Marek Aufart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: A bridge between Unipi's EVOK and MQTT message bus as Ruby gem
+description: A bridge between Unipi EVOK and MQTT message bus as Ruby gem
 email:
 - aufi.cz@gmail.com
 executables: []
@@ -98,6 +98,7 @@ files:
 - bin/console
 - bin/evok-to-mqtt
 - bin/setup
+- evok-to-mqtt-mapping.yml.example
 - evok-to-mqtt.gemspec
 - lib/evok-to-mqtt.rb
 - lib/evok-to-mqtt/mappers/to_haab.rb
@@ -123,8 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: A bridge between Unipi's EVOK and MQTT message bus
+summary: A bridge between Unipi EVOK and MQTT message bus
 test_files: []