evok-to-mqtt 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 711e36e73ee487eecfab89bca07163da30c65f3876247b24a911ec8b576f9c92
-  data.tar.gz: edccae5716f33bdd8a3d4fbd69ab8a93a2a966933398fedc40099f7098e3f736
+  metadata.gz: c6b0d14ff9b9c13c51d369f471067a9a55e527e3bec8232cc75389d3c8408570
+  data.tar.gz: e756161929840a194f62c5de8c9da7bbaf9a1df14073275e6b30a6e20c8c018d
 SHA512:
-  metadata.gz: b3f7e1e6ef366f4a4821e627a6b87ee0d8538f8cfb500f237c9d8037bfb2a6bff2582e073c089a1dbc6c7ed165068b2c2bb455345d05679bf330a5ffe5e69d8a
-  data.tar.gz: 11962e6c65f44144fd04e07aa026f67e7a2f77d4ce252da7e51e9e84336ba6ebf40aef4a3e89b8b556e854f53ce4ef578228b1344668ee09787857b1ebf73574
+  metadata.gz: 4ba5caff437265b5f7c63c36c5566be7bf573778403afd4f9abd7dbd1f60eafb0194e1f381eab9f4f24516e5576b5c89868be791cca606c75c297fba82816b48
+  data.tar.gz: 7f8dc6fae6d6c6448aada3182709d674962f020ec4216decb887ba446af211d053ca592b1086de2c7fe3429f2ea72873986e85d84c30e245b09af063766f7259

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    evok-to-mqtt (0.3.3)
+    evok-to-mqtt (0.3.4)
       em-mqtt (~> 0.0.5)
       jsonrpc-client (~> 0.1.3)
+      slop (~> 4.7.0)
       websocket-eventmachine-client (~> 1.2)
 
 GEM
@@ -14,14 +15,14 @@ GEM
       eventmachine
       mqtt (>= 0.3.0)
     eventmachine (1.2.7)
-    faraday (0.15.4)
+    faraday (0.16.2)
       multipart-post (>= 1.2, < 3)
     jsonrpc-client (0.1.3)
       faraday
       multi_json (>= 1.1.0)
     mqtt (0.5.0)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -36,12 +37,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    slop (4.7.0)
     websocket (1.2.8)
     websocket-eventmachine-base (1.2.0)
       eventmachine (~> 1.0)
       websocket (~> 1.0)
       websocket-native (~> 1.0)
-    websocket-eventmachine-client (1.2.0)
+    websocket-eventmachine-client (1.3.0)
       websocket-eventmachine-base (~> 1.0)
     websocket-native (1.0.0)
 
@@ -55,4 +57,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.3
+   1.17.2

data/README.md

@@ -13,7 +13,7 @@ $ gem install evok-to-mqtt
 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) and run following:
 
 ```bash
-$ evok-to-mqtt <evok_hostname> <mqtt_host>
+$ evok-to-mqtt --config evok-to-mqtt-mapping.yml --evok-host localhost --mqtt-host localhost
 ```
 
 ## Development

data/bin/evok-to-mqtt

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 
 require "evok-to-mqtt"
+require "slop"
 
-unless ARGV[0] || ARGV[1]
-  raise "Usage: evok-to-mqtt <evok_host> <mqtt_host>"
+opts = Slop.parse do |opt|
+  opt.string "-c", "--config", "Config/mapping file path", default: "./evok-to-mqtt-mapping.yml"
+  opt.string "--evok-host", "Hostname or IP where Evok API is running", default: "localhost"
+  opt.string "--mqtt-host", "Hostname or IP where MQTT server is running", default: "localhost"
+  opt.on "-h", "--help", "Show help" do
+    puts "Usage: evok-to-mqtt --config evok-to-mqtt-mapping.yml --evok-host localhost --mqtt-host localhost"
+    exit 0
+  end
 end
 
-EvokToMqtt.run(ARGV[0], ARGV[1])
+puts "Starting evok-to-mqtt with options:"
+p opts.to_hash
+
+EvokToMqtt.run(opts)

data/evok-to-mqtt.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "em-mqtt", "~> 0.0.5"
   spec.add_dependency "jsonrpc-client", "~> 0.1.3"
   spec.add_dependency "websocket-eventmachine-client", "~> 1.2"
+  spec.add_dependency "slop", "~> 4.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/evok-to-mqtt.rb

@@ -4,9 +4,10 @@ require 'evok-to-mqtt/worker'
 require 'yaml'
 
 module EvokToMqtt
-  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))
+  def self.run(opts)
+    mapping_config = YAML.load(File.read(opts[:config]))
+    # TODO: add mapper switch raw/haab/..
+    app = EvokToMqtt::Worker.new(opts[:evok_host], opts[:mqtt_host], EvokToMqtt::Mappers::ToHaab.new(mapping_config))
     app.run
   end
 end

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

@@ -0,0 +1,28 @@
+module EvokToMqtt
+  module Mappers
+    class Raw
+      def initialize(mapping)
+        @mapping_config  = mapping
+      end
+
+      def process(mqtt, evok_event)
+        id = get_topic(evok_event["dev"], evok_event["circuit"])
+        
+        puts "Target topic: #{id}"
+        mqtt.publish id, evok_event
+
+        puts
+      end
+
+      def circuit_reverse_lookup(full_topic)
+        return full_topic.split("/").last
+      end
+
+      private
+
+      def get_topic(dev, circuit)
+        return "evok/#{dev}/#{circuit}"
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Marek Aufart
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-mqtt
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ files:
 - evok-to-mqtt-mapping.yml.example
 - evok-to-mqtt.gemspec
 - lib/evok-to-mqtt.rb
+- lib/evok-to-mqtt/mappers/raw.rb
 - lib/evok-to-mqtt/mappers/to_haab.rb
 - lib/evok-to-mqtt/version.rb
 - lib/evok-to-mqtt/worker.rb
@@ -139,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A bridge between Unipi EVOK and MQTT message bus