omf_common 6.0.3 → 6.0.4.pre.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTRlZWFhMDI4MWE0NDQ2ZDIxM2U3ZWVlZWM0NmIzN2QzMTNjZGUwNA==
+  data.tar.gz: !binary |-
+    OTBhNDQ5NWZiOGRmNWRhZWYwOTJjMGQwYWNmNDBlZjJjMjhkZTRlYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDk2NDE0N2JjMmE0YzMwYTk3NzFiNTJiM2I2MWVhNjNlZTEwYmY2MjUwOGI4
+    ZDQ5NmFiZTU3NmE2NzNjZThiNDIyYTVmOWYxYjJiM2I2NzFjMTEzOGQzM2Mz
+    ZDg2YWM0Y2YyY2MxZDM1ZDUyYjU5YTZlMDk4NjE3NjExZWE0MjU=
+  data.tar.gz: !binary |-
+    NTkwNWZiZmZlZWI2N2NjMWYzODhhMzE5YzBiYzdkZjk5ZDM2ZmNmZDM2NmUy
+    ZDQ0M2MzNDczYmZjZjM4NGQ1ZGNlNDY1M2U5NDkzN2Q2MWRhMWRmNjRiNGE2
+    ZmIzZGQyMTdiZWY2MTVkNjlmNTM3NGQyYjkwOGU1M2IxMTNhYWQ=

data/bin/omf_monitor_topic

@@ -75,8 +75,7 @@ def observe(tname, comm)
       end
       puts "------"
 
-      if $follow_children && msg.itype == 'creation_ok'
-        #puts ">>>>>> #{msg}"
+      if $follow_children && msg.itype =~ /creation.ok/i
         observe(msg[:res_id], comm)
       end
     end

data/lib/omf_common.rb

@@ -188,6 +188,10 @@ module OmfCommon
     Eventloop.instance
   end
 
+  class << self
+    alias_method :el, :eventloop
+  end
+
   # Load a YAML file and return it as hash.
   #
   # options:
@@ -305,4 +309,20 @@ module OmfCommon
     h
   end
 
+  # Load a config file compatible with Logging gem
+  #
+  # @param [String] file_path of the logging config file
+  def self.load_logging_config(file_path)
+    unless file_path.nil?
+      l_cfg_mime_type = `file --mime-type -b #{file_path}`.strip rescue nil
+      case l_cfg_mime_type
+      when /ruby/
+        load file_path
+      when /plain/
+        Logging::Config::YamlConfigurator.load(file_path)
+      else
+        warn "Invalid config file format for logging, please use Ruby or Yaml."
+      end
+    end
+  end
 end

data/lib/omf_common/auth/certificate_store.rb

@@ -19,7 +19,7 @@ module OmfCommon::Auth
 
     def self.init(opts = {})
       if @@instance
-        raise "CertificateStore already iniitalised"
+        raise "CertificateStore already initialized"
       end
       @@instance = self.new(opts)
     end

data/lib/omf_common/comm/xmpp/communicator.rb

@@ -121,8 +121,8 @@ class Comm
       # Delete a pubsub topic
       #
       # @param [String] topic Pubsub topic name
-      def delete_topic(topic, &block)
-        pubsub.delete(topic, default_host, &callback_logging(__method__, topic, &block))
+      def delete_topic(topic, pubsub_host = default_host, &block)
+        pubsub.delete(topic, pubsub_host, &callback_logging(__method__, topic, &block))
       end
 
       # Subscribe to a pubsub topic
@@ -136,33 +136,33 @@ class Comm
         MPSubscription.inject(Time.now.to_f, jid, 'join', topic) if OmfCommon::Measure.enabled?
       end
 
-      def _subscribe(topic, &block)
-        pubsub.subscribe(topic, nil, default_host, &callback_logging(__method__, topic, &block))
+      def _subscribe(topic, pubsub_host = default_host, &block)
+        pubsub.subscribe(topic, nil, pubsub_host, &callback_logging(__method__, topic, &block))
       end
 
-      def _create(topic, &block)
-        pubsub.create(topic, default_host, PUBSUB_CONFIGURE, &callback_logging(__method__, topic, &block))
+      def _create(topic, pubsub_host = default_host, &block)
+        pubsub.create(topic, pubsub_host, PUBSUB_CONFIGURE, &callback_logging(__method__, topic, &block))
       end
 
       # Un-subscribe all existing subscriptions from all pubsub topics.
-      def unsubscribe
-        pubsub.subscriptions(default_host) do |m|
+      def unsubscribe(pubsub_host = default_host)
+        pubsub.subscriptions(pubsub_host) do |m|
           m[:subscribed] && m[:subscribed].each do |s|
-            pubsub.unsubscribe(s[:node], nil, s[:subid], default_host, &callback_logging(__method__, s[:node], s[:subid]))
+            pubsub.unsubscribe(s[:node], nil, s[:subid], pubsub_host, &callback_logging(__method__, s[:node], s[:subid]))
             MPSubscription.inject(Time.now.to_f, jid, 'leave', s[:node]) if OmfCommon::Measure.enabled?
           end
         end
       end
 
-      def affiliations(&block)
-        pubsub.affiliations(default_host, &callback_logging(__method__, &block))
+      def affiliations(pubsub_host = default_host, &block)
+        pubsub.affiliations(pubsub_host, &callback_logging(__method__, &block))
       end
 
       # Publish to a pubsub topic
       #
       # @param [String] topic Pubsub topic name
       # @param [OmfCommon::Message] message Any XML fragment to be sent as payload
-      def publish(topic, message, &block)
+      def publish(topic, message, pubsub_host = default_host, &block)
         raise StandardError, "Invalid message" unless message.valid?
 
         message = message.marshall[1] unless message.kind_of? String
@@ -176,7 +176,7 @@ class Comm
           block.call(stanza) if block
         end
 
-        pubsub.publish(topic, message, default_host, &callback_logging(__method__, topic, &new_block))
+        pubsub.publish(topic, message, pubsub_host, &callback_logging(__method__, topic, &new_block))
         MPPublished.inject(Time.now.to_f, jid, topic, message.to_s.gsub("\n",'')) if OmfCommon::Measure.enabled?
       end
 

data/lib/omf_common/comm/xmpp/topic.rb

@@ -14,7 +14,8 @@ class XMPP
 #    end
 
     def address
-      "xmpp://#{id.to_s}@#{OmfCommon.comm.jid.domain}"
+      #"xmpp://#{id.to_s}@#{OmfCommon.comm.jid.domain}"
+      "xmpp://#{id.to_s}@#{@pubsub_domain}"
     end
 
     def on_subscribed(&block)
@@ -27,8 +28,16 @@ class XMPP
 
     private
 
+    def pubsub_domain_addr
+      "pubsub.#{@pubsub_domain}"
+    end
+
     def initialize(id, opts = {}, &block)
-      id = $1 if id =~ /^xmpp:\/\/(.+)@.+$/
+      id, @pubsub_domain = id.to_s.split("@")
+      if id =~ /^xmpp:\/\/(.+)$/
+        id = $1
+      end
+      @pubsub_domain ||= OmfCommon.comm.jid.domain
 
       super
 
@@ -50,17 +59,17 @@ class XMPP
 
       # Create xmpp pubsub topic, then subscribe to it
       #
-      OmfCommon.comm._create(id.to_s) do |stanza|
+      OmfCommon.comm._create(id.to_s, pubsub_domain_addr) do |stanza|
         if stanza.error?
           e_stanza = Blather::StanzaError.import(stanza)
           if e_stanza.name == :conflict
             # Topic exists, just subscribe to it.
-            OmfCommon.comm._subscribe(id.to_s, &topic_block)
+            OmfCommon.comm._subscribe(id.to_s, pubsub_domain_addr, &topic_block)
           else
             block.call(stanza) if block
           end
         else
-          OmfCommon.comm._subscribe(id.to_s, &topic_block)
+          OmfCommon.comm._subscribe(id.to_s, pubsub_domain_addr, &topic_block)
         end
       end
 
@@ -75,7 +84,7 @@ class XMPP
 
     def _send_message(msg, block)
       super
-      OmfCommon.comm.publish(self.id, msg)
+      OmfCommon.comm.publish(self.id, msg, pubsub_domain_addr)
     end
 
     def valid_guard?(guard_proc)

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.3"
+  VERSION = "6.0.4.pre.1"
   PROTOCOL_VERSION = "6.0"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.3
-  prerelease: 
+  version: 6.0.4.pre.1
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-minitest-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oml4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -274,51 +251,25 @@ files:
 homepage: http://omf.mytestbed.net
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2941832345659960024
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Common library of OMF
-test_files:
-- test/fixture/1st_level.pem
-- test/fixture/2nd_level.pem
-- test/fixture/3rd_level.pem
-- test/fixture/omf_test.cert.pem
-- test/fixture/omf_test.pem
-- test/fixture/omf_test.pub
-- test/fixture/omf_test.pub.pem
-- test/fixture/pubsub.rb
-- test/fixture/rc.pem
-- test/fixture/root.pem
-- test/omf_common/auth/certificate_spec.rb
-- test/omf_common/auth/certificate_store_spec.rb
-- test/omf_common/auth/ssh_pub_key_convert_spec.rb
-- test/omf_common/comm/topic_spec.rb
-- test/omf_common/comm/xmpp/communicator_spec.rb
-- test/omf_common/comm/xmpp/topic_spec.rb
-- test/omf_common/comm_spec.rb
-- test/omf_common/command_spec.rb
-- test/omf_common/core_ext/string_spec.rb
-- test/omf_common/message/xml/message_spec.rb
-- test/omf_common/message_spec.rb
-- test/test_helper.rb
+test_files: []