humble_rpi 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7cdf168cfe069f81a5905ed688855dd1357b8c
-  data.tar.gz: 1a62569750a6aa71097ccb3187199a554c5496de
+  metadata.gz: 5ffdfa5b1856d9b677acaa738dc04e241b65f5fc
+  data.tar.gz: b288e9256b2ad0772acabe3a1ab2755ababf2024
 SHA512:
-  metadata.gz: 58c9a4645888c7102748d9e8ab6fbcd105f43e1f0147339bde3b4ad3a92055e2666bcae87f397fbe20febd3a771b50af4a5cb9cd0bc4a43c733721e3bf41f20b
-  data.tar.gz: f57d6ce257df9fef5380f321c415760bdaa7fa94a9b0176472282c0123e5df77e8de1b3cf9597082d776b0f6e24cd0f49801f45f4b9cca1e57b667a1b5060945
+  metadata.gz: 0529c2c23c93ad08118d894f75afd8e0fcc1a7bb27daa00d4cf5f187ab90aa03caa7f53e895daa15a5fec4ee8dd1c92d4dc1094a9e8bf46cef20bed7b8d4475b
+  data.tar.gz: a44c927c22c111d1b5208ac3d0c73e35527dffbcb8f5d60a52ada5cbe5fa664e269bf8ff8ba9992b5ead31bae3e5c349888fadbf636fab5830f0338c9d166efb

data/lib/humble_rpi.rb

@@ -15,36 +15,37 @@ class DummyNotifier
   
 end
 
-class HumbleRPi  
+class HumbleRPi
 
   def initialize(device_name: 'rpi', sps_address: nil, sps_port: 59000, \
-                                                                plugins: {})
+                                              plugins: {}, group_id: 'root')
 
     @device_name, @sps_address, @sps_port = device_name, sps_address, sps_port
+    @group_id = group_id
     
     @publisher, @subscriber = sps_address ?  initialize_sps() \
                                                 :  [DummyNotifier.new, nil]    
 
     @plugins = initialize_plugins(plugins || [])    
-    
+
   end
 
   # triggered from a sps-sub callback
   #
   def ontopic(topic, msg)
-    
+
     component = topic[/\w+$/]
-    
+
     method_name = "on_#{component}_message".to_sym
-    
+
     @plugins.each do |x|
-      
-      if x.respond_to? method_name then          
-        x.method(method_name).call(msg)          
+
+      if x.respond_to? method_name then
+        x.method(method_name).call(msg)
       end
-      
+
     end
-  end      
+  end
 
   def start()
 
@@ -56,15 +57,18 @@ class HumbleRPi
     end
         
     if @subscriber then
-      
-      Thread.new do  
+            
+      Thread.new do
         sp = SPSSubPing.new host: @sps_address, port: @sps_port, \
-                                      identifier: 'HumbleRPi/' + @device_name
+                   identifier: "HumbleRPi/%s/%s" % [@group_id, @device_name]
         sp.start
       end      
-      
-      topic =  "#{@device_name}/output/#"
-      @subscriber.subscribe topic: topic            
+
+      subtopics = %w(output do)
+      topics = subtopics\
+          .map {|x| "HumbleRPi/%s/%s/%s/#" % [@group_id, @device_name, x]}\
+                                                                   .join(' | ')
+      @subscriber.subscribe topic: topics
       
     else
       loop while true
@@ -72,15 +76,16 @@ class HumbleRPi
     
   end
 
-  
+
   private
-  
+
   def initialize_sps()
-    
+
     publisher = SPSPub.new address: @sps_address, port: @sps_port
-    publisher.notice @device_name + '/info: humble_rpi initialized'    
-    subscriber = SPSSub.new address: @sps_address, port: @sps_port, callback: self
-        
+    publisher.notice  "HumbleRPi/%s/%s/info: initialized" \
+                                              % [@group_id, @device_name]
+    subscriber = SPSSub.new address: @sps_address, port: @sps_port,\
+                                                               callback: self
     [publisher, subscriber]
     
   end
@@ -93,10 +98,12 @@ class HumbleRPi
       return r if settings[:active] == false and !settings[:active]
       
       klass_name = 'HumbleRPiPlugin' + name.to_s
-                                
-      vars = {device_id: @device_name, notifier: @publisher}
 
-      r << Kernel.const_get(klass_name).new(settings: settings, variables: vars)
+      device_id = "HumbleRPi/%s/%s" % [@group_id, @device_name]
+      vars = {device_id: device_id, notifier: @publisher}
+
+      r << Kernel.const_get(klass_name)\
+                                    .new(settings: settings, variables: vars)
 
     end
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   999CZL08Zqxa+1DKwhW/XqeiQ9eIZ+1fLAK+XbAKgv6ghNYEPtZLUFiD73uUbsKd
   sBqeV1LF1yKYmA==
   -----END CERTIFICATE-----
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sps-pub