omf_common 6.0.2 → 6.0.3

data/bin/omf_monitor_topic

@@ -20,8 +20,7 @@ OP_MODE = :development
 opts = {
   communication: {
     #url: 'xmpp://srv.mytestbed.net',
-    auth: {}
-
+    #auth: {}
   },
   eventloop: { type: :em},
   logging: {
@@ -66,8 +65,8 @@ def observe(tname, comm)
       ts = Time.now.strftime('%H:%M:%S')
       puts "#{ts}  #{msg.type}(#{msg.itype})  #{$debug ? msg.inspect : ''}"
       #puts "  #{topic.id}"
-      if (src_topic = msg.src.id) == topic.id
-        puts "  #{topic.id}"        
+      if (src_topic = (msg.src.is_a?(OmfCommon::Comm::Topic) ? msg.src.id : msg.src)) == topic.id
+        puts "  #{topic.id}"
       else
         puts "  #{src_topic} via #{topic.id}"
       end

data/bin/omf_send_configure

@@ -24,7 +24,7 @@ opts = {
   eventloop: { type: :em},
   logging: {
     level: 'info'
-  }  
+  }
 }
 
 resource_url = nil
@@ -64,7 +64,7 @@ opts[:communication][:url] = r.join('/')
 key = nil
 def err_exit
   $stderr.puts("Options need to be of the 'key: value' type")
-  exit(-1)  
+  exit(-1)
 end
 rest.each do |s|
   sa = s.split(':')
@@ -89,7 +89,7 @@ def print_prop(name, value, level = 0)
   if value.is_a? Hash
     puts ''
     value.each {|k, v| print_prop(k, v, level + 1)}
-  else 
+  else
     puts " #{value}"
   end
 end
@@ -98,8 +98,8 @@ OmfCommon.init(OP_MODE, opts) do |el|
   OmfCommon.comm.on_connected do |comm|
     comm.subscribe(resource) do |topic|
       topic.configure(resource_properties) do |msg|
-        if (src_topic = msg.src.id) == topic.id
-          puts "#{topic.id}"        
+        if (src_topic = (msg.src.is_a?(OmfCommon::Comm::Topic) ? msg.src.id : msg.src)) == topic.id
+          puts "#{topic.id}"
         else
           puts "#{src_topic} via #{topic.id}"
         end

data/bin/omf_send_request

@@ -22,7 +22,7 @@ opts = {
   eventloop: { type: :em},
   logging: {
     level: 'info'
-  }  
+  }
 }
 
 resource_url = nil
@@ -53,7 +53,7 @@ def print_prop(name, value, level = 0)
   if value.is_a? Hash
     puts ''
     value.each {|k, v| print_prop(k, v, level + 1)}
-  else 
+  else
     puts " #{value}"
   end
 end
@@ -62,8 +62,8 @@ OmfCommon.init(OP_MODE, opts) do |el|
   OmfCommon.comm.on_connected do |comm|
     comm.subscribe(resource) do |topic|
       topic.request(req_properties) do |msg|
-        if (src_topic = msg.src.id) == topic.id
-          puts "#{topic.id}"        
+        if (src_topic = (msg.src.is_a?(OmfCommon::Comm::Topic) ? msg.src.id : msg.src)) == topic.id
+          puts "#{topic.id}"
         else
           puts "#{src_topic} via #{topic.id}"
         end
@@ -75,4 +75,4 @@ OmfCommon.init(OP_MODE, opts) do |el|
       el.after($timeout) { el.stop } if $timeout > 0
     end
   end
-end
+end

data/lib/omf_common/comm/amqp/amqp_communicator.rb

@@ -22,11 +22,11 @@ module OmfCommon
         #
         def init(opts = {})
           @opts = {
-            #:ssl (Hash) � TLS (SSL) parameters to use.
-            heartbeat: 20, # (Fixnum) � default: 0 � Connection heartbeat, in seconds. 0 means no heartbeat. Can also be configured server-side starting with RabbitMQ 3.0.
-            #:on_tcp_connection_failure (#call) � A callable object that will be run if connection to server fails
-            #:on_possible_authentication_failure (#call) � A callable object that will be run if authentication fails (see Authentication failure section)
-            reconnect_delay: 20 # (Fixnum) Delay in seconds before attempting reconnect on detected failure
+            #:ssl (Hash) TLS (SSL) parameters to use.
+            heartbeat: 20, # (Fixnum) - default: 0 Connection heartbeat, in seconds. 0 means no heartbeat. Can also be configured server-side starting with RabbitMQ 3.0.
+            #:on_tcp_connection_failure (#call) - A callable object that will be run if connection to server fails
+            #:on_possible_authentication_failure (#call) - A callable object that will be run if authentication fails (see Authentication failure section)
+            reconnect_delay: 20 # (Fixnum) - Delay in seconds before attempting reconnect on detected failure
           }.merge(opts)
 
           unless (@url = @opts.delete(:url))

data/lib/omf_common/version.rb

@@ -4,6 +4,6 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 module OmfCommon
-  VERSION = "6.0.2"
+  VERSION = "6.0.3"
   PROTOCOL_VERSION = "6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 475954182867685216
+      hash: 2941832345659960024
 requirements: []
 rubyforge_project: omf_common
 rubygems_version: 1.8.25