sps_mqtt_bridge 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a94c2b205cc2de5aeb21ce453f3164a62b7683
-  data.tar.gz: 4df147d00472834605ca4ceda6dbbece3c4ae5be
+  metadata.gz: 7a5e033bc6dc64b982da206085d84ddfbf3f53fc
+  data.tar.gz: 319be0bb9b097e53a5a166a9cdaf85007e58f40b
 SHA512:
-  metadata.gz: 6460f2892f13889bead3edb6680eb5930fd507e6792e1d09afb71165194e6de867f9887654062b79339d2fab65f6e536a0698ee7afada940e53a92e3fa2e82d8
-  data.tar.gz: 5a3924953e9c978723e3e066b18347b8f43d1c08ae5af2d72e6c53931985e6c827872abf41eab8ee8fb88ce23caee7edbf8115ebceadbfe7d6bd5aefe34f52f8
+  metadata.gz: acaae8c1ee4a4d535ae293e0d2ee5388a36d9e68c5e9d3e1d17c066116ff692c4be528cb86ea89fd8e85425a30a7c51bcdf10b733218805f8330696b475ee73e
+  data.tar.gz: 36c6414576c4f35f2b63d8b8c47211c5d7d9396704762a8afcc44f228b1fa6b13d8825d4eb39e4236271e31959cda7792ce00c882d79fe8b57e5ddce7382b9af

data/lib/sps_mqtt_bridge.rb

@@ -13,7 +13,8 @@ require 'timeout'  # used sps_to_http
 class SpsMqttBridge
 
   def initialize(mqtt: {address: 'mqtt', port: '1883'}, 
-     sps:{address: 'sps', port: '59000'}, sps2:{address: 'sps', port: '59000'})
+     sps:{host: 'sps', address: host, port: '59000'}, 
+                 sps2:{address: 'sps', port: '59000'})
     @mqtt, @sps, @sps2 = mqtt, sps, sps2
   end
 
@@ -53,9 +54,10 @@ class SpsMqttBridge
   def sps_to_http(topic: '#', url: '', timeout: 5, \
                                              http_auth: ["user", "password"])
 
-    SPSSub.new(host: @sps[:address], port: @sps[:port]).\
-                                         subscribe(topic: topic) do |message,t|
-      
+    sps = SPSSub.new(host: @sps[:address], port: @sps[:port])
+
+    sps.subscribe(topic: topic) do |message,t|
+   
       begin
         
         Timeout::timeout(timeout){
@@ -63,8 +65,8 @@ class SpsMqttBridge
           ipaddr = url[/https?:\/\/([^\/]+)/,1]
           ip_address = block_given? ? yield(ipaddr) || ipaddr : ipaddr
           full_url = url.sub(/(https?:\/\/)([^\/]+)/,'\1' + ip_address).\
-                                      sub('$topic', topic).sub('$msg', message)
-          puts 'full_url : ' + full_url.inspect
+                                      sub('$topic', t).sub('$msg', message)
+
           buffer = open(full_url, read_timeout: timeout,\
                       http_basic_authentication: http_auth).read
 
@@ -87,4 +89,4 @@ if __FILE__ == $0 then
 
   bridge = SpsMqttBridge.new
   bridge.mqtt_to_sps
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sps_mqtt_bridge
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MTEwODIwMzcxNloXDTE2MTEwNzIwMzcxNlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MTEyMjIxNDUzOFoXDTE3MTEyMjIxNDUzOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANXH8uOlQ7MVlFZtsnkOCQH45SfatU1XByLwr/WQuQv8H6eSNJoI/r0boiAw
-  h1UPJpDhQjl4yjPe1hZEBYnpVPBIMK701Hs5Jqvmw7U0Z1zxjjXk/SPaizEEkoxn
-  YzlD91pdeqqzsV5C6yauag0jYNniMpO106C2xZY0DJWAa7VSpT1sBhfrn8nByhZf
-  ftSf84kHZozGFqqIMMTZTusaR6/glnNE9vBon8tCJP9tB8isJ8j6/QZITm5OYxUn
-  SERReV45s/1HRs/vEsJupYzPsM1ckU35rBxW91j/l34LVu+HfqfLRgqI/IaSoUCK
-  +dvNmLJTQzwUsOzjrImkElcGTuECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUv86CF0AF6nQ+GNUHYrqevJz/H5QwJgYDVR0RBB8w
+  ggEBALUm9nJ/CpGR0BBhSn85Rk/tiXgQKstQ3BuICShhRDvYg5Z1NV/vbY05D/Ra
+  q9RuOQpLZ0EKs5x9L3R2f3Cxh62/+B5zyTALNkYRSbWeWUVaVAub8VbFx26WnV/D
+  NeuP6ILy33Yr0SjJFwwSr5gHOJ/ebqUAiVsSQfQcSpTpoasWgGvWB1R3fD466EIZ
+  QOGDNvh1yIJwovpwqz9sDlRpqDwetDObtC1aliWdS2vHer1fN8Q1GjtuedN34YxQ
+  5SymG9ACe7ubnYPb3+wQ99RJMekuc4ATywZgPBTTDiuAa14gkaORHwbiOIyWqlTC
+  tDu81OnQrCE+mNrCmvHI/JHp/xUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUDFcbt9qrC0Mv4mmi4nEa4F/waTQwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAemFkZvRO
-  6OZxqs9LDYFflbani5VBHT+dlr3WzKgdAUsHOEFc5TntJ+h5Ik+5lFH64wWiqRrP
-  RZ4FYPGO3ujpsr7Ee7lMxu41Mkcdy4UTMhJ9NpEypIDwPXIJtPV5Omqc5TVp2zXv
-  PkDiD5KRLkQAblMVJbae3iOuyQKFONCj1gJw18aOpK65xPfp+r5x5p3OwGF+z0+H
-  Hww7izrMXoqXPjz5yUE52HBB8oTXYzJTYbCBaN5NzsUrdZs0cVlSSdHrqz+4jhsr
-  AgrIPDOyOTSzQQ+z204wORRCtLV+F0eTmo6yNE0WtkpHIuS9zMiAqSEsbBGETFyZ
-  of2zKQ1rRIp6Zw==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAc2Xt0rgI
+  Kf0XNvZHfwo1vJQSLmsSS+DgGlYyiuLk1TuRL2/6TeTFTWQS29cugipOUNtRcuNt
+  vxFYRq3VtzGo+zYDNEzpl13pBk78/ey7qKxTxnvoVF0Jy7mtyIR9jGo1BbHsdg/V
+  hPXKjZGScFS0MJsl1Y79eiqtJRON6mdBAs6Pi+Ch3e4gvAVO69oyBPZK3R0RvsA4
+  Np1AbLkw2Kn4lQKDLEuhrMhZXZ53dwjsOmx9EoeG9US+CMyS44psTU1z3OmXb1MV
+  trTSr27oqU1llXUyTNR5FS7j2l5LiPV2bOPgDjJ0c33BHPqp1UEUE9S0vrDAtcMJ
+  SHx7HKijT7Yt5A==
   -----END CERTIFICATE-----
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sps-pub
@@ -42,7 +42,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: sps-sub
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,27 +72,27 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Subscribes and re-publishes messages automatically from MQTT to SPS or to