omf_common 6.0.0.pre.10 → 6.0.0.pre.11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.10
+  version: 6.0.0.pre.11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -143,43 +143,61 @@ description: Common library of OMF, a generic framework for controlling and mana
   networking testbeds.
 email:
 - omf-user@lists.nicta.com.au
-executables: []
+executables:
+- monitor_topic.rb
+- send_create.rb
+- send_request.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Rakefile
+- bin/monitor_topic.rb
+- bin/send_create.rb
+- bin/send_request.rb
+- example/engine_alt.rb
+- example/vm_alt.rb
 - lib/omf_common.rb
 - lib/omf_common/comm.rb
+- lib/omf_common/comm/amqp/amqp_communicator.rb
+- lib/omf_common/comm/amqp/amqp_topic.rb
+- lib/omf_common/comm/local/local_communicator.rb
+- lib/omf_common/comm/local/local_topic.rb
+- lib/omf_common/comm/topic.rb
+- lib/omf_common/comm/xmpp/communicator.rb
+- lib/omf_common/comm/xmpp/topic.rb
+- lib/omf_common/comm/xmpp/xmpp_mp.rb
 - lib/omf_common/command.rb
-- lib/omf_common/core_ext/object.rb
 - lib/omf_common/core_ext/string.rb
 - lib/omf_common/default_logging.rb
-- lib/omf_common/dsl/xmpp.rb
-- lib/omf_common/dsl/xmpp_mp.rb
+- lib/omf_common/eventloop.rb
+- lib/omf_common/eventloop/em.rb
+- lib/omf_common/eventloop/local_evl.rb
 - lib/omf_common/exec_app.rb
 - lib/omf_common/key.rb
 - lib/omf_common/measure.rb
 - lib/omf_common/message.rb
+- lib/omf_common/message/json/json_message.rb
+- lib/omf_common/message/xml/message.rb
+- lib/omf_common/message/xml/relaxng_schema.rb
+- lib/omf_common/message/xml/topic_message.rb
 - lib/omf_common/protocol/6.0.rnc
 - lib/omf_common/protocol/6.0.rng
-- lib/omf_common/relaxng_schema.rb
-- lib/omf_common/topic.rb
-- lib/omf_common/topic_message.rb
 - lib/omf_common/version.rb
 - omf_common.gemspec
 - test/fixture/pubsub.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/dsl/xmpp_spec.rb
+- test/omf_common/message/xml/message_spec.rb
 - test/omf_common/message_spec.rb
-- test/omf_common/topic_message_spec.rb
-- test/omf_common/topic_spec.rb
 - test/test_helper.rb
-homepage: https://www.mytestbed.net
-licenses: []
+homepage: http://omf.mytestbed.net
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -189,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,17 +216,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Common library of OMF
-test_files:
-- test/fixture/pubsub.rb
-- test/omf_common/comm_spec.rb
-- test/omf_common/command_spec.rb
-- test/omf_common/core_ext/string_spec.rb
-- test/omf_common/dsl/xmpp_spec.rb
-- test/omf_common/message_spec.rb
-- test/omf_common/topic_message_spec.rb
-- test/omf_common/topic_spec.rb
-- test/test_helper.rb
+test_files: []
+has_rdoc: 

data/lib/omf_common/core_ext/object.rb

@@ -1,21 +0,0 @@
-class Object
-  def stub name, val_or_callable, &block
-    new_name = "__minitest_stub__#{name}"
-    metaclass = class << self; self; end
-    metaclass.send :alias_method, new_name, name
-    metaclass.send :define_method, name do |*args, &stub_block|
-      if val_or_callable.respond_to? :call then
-        val_or_callable.call(*args, &stub_block)
-      else
-        val_or_callable
-      end
-    end
-    yield self
-  ensure
-    metaclass.send :undef_method, name
-    metaclass.send :alias_method, name, new_name
-    metaclass.send :undef_method, new_name
-  end
-end
-
-

data/lib/omf_common/relaxng_schema.rb

@@ -1,17 +0,0 @@
-require 'singleton'
-
-module OmfCommon
-  class RelaxNGSchema
-    include Singleton
-
-    SCHEMA_FILE = "#{File.dirname(__FILE__)}/protocol/#{OmfCommon::PROTOCOL_VERSION}.rng"
-
-    attr_accessor :schema
-
-    def initialize
-      File.open(SCHEMA_FILE) do |f|
-        self.schema = Nokogiri::XML::RelaxNG(f.read)
-      end
-    end
-  end
-end

data/lib/omf_common/topic.rb

@@ -1,34 +0,0 @@
-module OmfCommon
-  class Topic
-    attr_accessor :id, :comm
-
-    def initialize(id, comm)
-      self.id ||= id
-      self.comm ||= comm
-    end
-
-    def subscribe(&block)
-      comm.subscribe(id, &block)
-    end
-
-    def on_message(message_guard_proc = nil, &message_block)
-      event_block = proc do |event|
-        message_block.call(Message.parse(event.items.first.payload))
-      end
-      guard_block = proc do |event|
-        (event.items?) && (!event.delayed?) &&
-          event.items.first.payload &&
-          (omf_message = Message.parse(event.items.first.payload)) &&
-          event.node == self.id &&
-          (valid_guard?(message_guard_proc) ? message_guard_proc.call(omf_message) : true)
-      end
-      comm.topic_event(guard_block, &event_block)
-    end
-
-    private
-
-    def valid_guard?(guard_proc)
-      guard_proc && guard_proc.class == Proc
-    end
-  end
-end

data/lib/omf_common/topic_message.rb

@@ -1,20 +0,0 @@
-module OmfCommon
-  class TopicMessage
-    attr_accessor :body, :comm
-
-    def initialize(body, comm)
-      self.body ||= body
-      self.comm ||= comm
-    end
-
-    def publish(topic_id, &block)
-      comm.publish(topic_id, body.dup, &block)
-    end
-
-    %w(created status failed released).each do |inform_type|
-      define_method("on_inform_#{inform_type}") do |*args, &message_block|
-        comm.send("on_#{inform_type}_message", body, &message_block)
-      end
-    end
-  end
-end

data/test/omf_common/topic_message_spec.rb

@@ -1,114 +0,0 @@
-require 'test_helper'
-require 'fixture/pubsub'
-require 'em/minitest/spec'
-
-include OmfCommon
-
-describe OmfCommon::Topic do
-  before do
-    @client = Blather::Client.new
-    @stream = MiniTest::Mock.new
-    @stream.expect(:send, true, [Blather::Stanza])
-    @client.post_init @stream, Blather::JID.new('n@d/r')
-    @comm = Comm.new(:xmpp)
-    @topic = @comm.get_topic('mclaren')
-    @message = @comm.request_message([:bob])
-  end
-
-  describe "when topic message object initialised" do
-    include EM::MiniTest::Spec
-
-    it "must be able to publish to a topic" do
-      Blather::Client.stub :new, @client do
-        published = Blather::XMPPNode.parse(published_xml)
-        write_callback = proc do |event|
-          event.must_be_kind_of Blather::Stanza::PubSub::Publish
-          event.node.must_equal @topic.id
-          published.id = event.id
-          @client.receive_data published
-        end
-        @client.stub :write, write_callback do
-          @message.publish(@topic.id) do |event|
-            event.must_equal published
-          end
-
-          # Can publish again
-          @message.publish(@topic.id) do |event|
-            event.must_equal published
-            done!
-          end
-        end
-      end
-      wait!
-    end
-
-  end
-
-  describe "when message with same context id arrived " do
-    include EM::MiniTest::Spec
-
-    it "must react to omf created message" do
-      Blather::Client.stub :new, @client do
-        omf_create = @comm.create_message { |v| v.property('type', 'engine') }
-        omf_create.body.stub :msg_id, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-          omf_created = Blather::XMPPNode.parse(omf_created_xml)
-          @client.receive_data omf_created
-          omf_create.on_inform_created do |n|
-            n.context_id.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-            n.must_equal Message.parse(omf_created.items.first.payload)
-            done!
-          end
-        end
-      end
-      wait!
-    end
-
-    it "must react to omf status message" do
-      Blather::Client.stub :new, @client do
-        omf_request = @comm.request_message { |v| v.property('bob') }
-        omf_request.body.stub :msg_id, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-          omf_status = Blather::XMPPNode.parse(omf_status_xml)
-          @client.receive_data omf_status
-          omf_request.on_inform_status do |n|
-            n.context_id.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-            n.must_equal Message.parse(omf_status.items.first.payload)
-            done!
-          end
-        end
-      end
-      wait!
-    end
-
-    it "must react to omf release message" do
-      Blather::Client.stub :new, @client do
-        omf_release = @comm.release_message { |v| v.property('resource_id', '100') }
-        omf_release.body.stub :msg_id, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-          omf_released = Blather::XMPPNode.parse(omf_released_xml)
-          @client.receive_data omf_released
-          omf_release.on_inform_released do |n|
-            n.context_id.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-            n.must_equal Message.parse(omf_released.items.first.payload)
-            done!
-          end
-        end
-      end
-      wait!
-    end
-
-    it "must react to omf failed message" do
-      Blather::Client.stub :new, @client do
-        omf_create = @comm.create_message { |v| v.property('type', 'engine') }
-        omf_create.body.stub :msg_id, "bf840fe9-c176-4fae-b7de-6fc27f183f76" do
-          omf_failed = Blather::XMPPNode.parse(omf_failed_xml)
-          @client.receive_data omf_failed
-          omf_create.on_inform_failed do |n|
-            n.context_id.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-            n.must_equal Message.parse(omf_failed.items.first.payload)
-            done!
-          end
-        end
-      end
-      wait!
-    end
-  end
-end

data/test/omf_common/topic_spec.rb

@@ -1,75 +0,0 @@
-require 'test_helper'
-require 'fixture/pubsub'
-require 'em/minitest/spec'
-
-include OmfCommon
-
-describe OmfCommon::Topic do
-  before do
-    @client = Blather::Client.new
-    @stream = MiniTest::Mock.new
-    @stream.expect(:send, true, [Blather::Stanza])
-    @client.post_init @stream, Blather::JID.new('n@d/r')
-    @comm = Comm.new(:xmpp)
-    @topic = @comm.get_topic('mclaren')
-  end
-
-  describe "when topic object initialised" do
-    include EM::MiniTest::Spec
-
-    it "must be able to subscribe" do
-      Blather::Client.stub :new, @client do
-        subscription = Blather::XMPPNode.parse(subscription_xml)
-        write_callback = proc do |event|
-          event.must_be_kind_of Blather::Stanza::PubSub::Subscribe
-          event.node.must_equal 'mclaren'
-          subscription.id = event.id
-          subscription.node = event.node
-          @client.receive_data subscription
-        end
-        @client.stub :write, write_callback do
-          @topic.subscribe do |e|
-            e.must_equal subscription
-            e.node.must_equal 'mclaren'
-            done!
-          end
-        end
-      end
-      wait!
-    end
-
-    it "must react when message arrived" do
-      Blather::Client.stub :new, @client do
-        omf_status = Blather::XMPPNode.parse(omf_status_xml)
-        @client.receive_data omf_status
-        @topic.on_message do |n|
-          n.must_equal Message.parse(omf_status.items.first.payload)
-          done!
-        end
-
-        invalid_topic = @comm.get_topic('bob')
-        invalid_topic.on_message do |n|
-          raise 'Wont come here'
-        end
-      end
-      wait!
-    end
-
-    it "must react when certain messages arrived, specified by guards" do
-      Blather::Client.stub :new, @client do
-        omf_status = Blather::XMPPNode.parse(omf_status_xml)
-        @client.receive_data omf_status
-        @topic.on_message proc { |message| message.context_id == 'bob' } do |n|
-          raise 'Wont come here'
-        end
-
-        @topic.on_message proc { |message| message.context_id == "bf840fe9-c176-4fae-b7de-6fc27f183f76" } do |n|
-          n.must_equal Message.parse(omf_status.items.first.payload)
-          n.context_id.must_equal "bf840fe9-c176-4fae-b7de-6fc27f183f76"
-          done!
-        end
-      end
-      wait!
-    end
-  end
-end