omf_ec 6.0.2.pre.2 → 6.0.2

data/lib/omf_ec/experiment_property.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'hashie'
 require 'singleton'
 
@@ -11,7 +16,7 @@ module OmfEc
 
     # Contains all the experiment properties
     @@properties = Hashie::Mash.new
-    
+
     # Holds all observers on any Experiment Property creation
     @@creation_observers = []
 
@@ -24,10 +29,10 @@ module OmfEc
     def self.[](name)
       p = @@properties[name.to_s.to_sym]
       if p.nil?
-        raise OEDLCommandException.new(name, 
+        raise OEDLCommandException.new(name,
           "Unknown experiment property '#{name}'\n\tKnown properties are "+
           "'#{ExperimentProperty.names.join(', ')}'")
-      end  
+      end
       return p
     end
 
@@ -60,7 +65,7 @@ module OmfEc
         return p
       end
     end
-  
+
     # Iterate over all Experiment Properties. The block
     # will be called with the respective property as single
     # argument
@@ -86,7 +91,7 @@ module OmfEc
       name = name.to_s
       # http://stackoverflow.com/questions/4378670/what-is-a-ruby-regex-to-match-a-function-name
       if /[@$"]/ =~ name.to_sym.inspect
-        raise OEDLCommandException.new("ExperimentProperty.create", 
+        raise OEDLCommandException.new("ExperimentProperty.create",
           "Cannot create property '#{name}', its name is not a valid Ruby name")
       end
       p = nil
@@ -135,14 +140,14 @@ module OmfEc
       set(value)
     end
 
-    # 
-    # Add a block of command to the list of actions to do 
+    #
+    # Add a block of command to the list of actions to do
     # when this property is being changed
     #
     # - &block =  the block of command to add
     #
     def on_change (&block)
-      debug "Somebody bound to me" 
+      debug "Somebody bound to me"
       @change_observers << block
     end
 
@@ -198,7 +203,7 @@ module OmfEc
 
     # Addition operator for Integer, Float, and String properties
     def +(right)
-      if @value.kind_of?(Integer) || @value.kind_of?(Float) || @value.kind_of?(String) 
+      if @value.kind_of?(Integer) || @value.kind_of?(Float) || @value.kind_of?(String)
         return (@value + right)
       else
         raise OEDLCommandException.new("+", "Illegal operation, "+
@@ -210,13 +215,13 @@ module OmfEc
     # Explicit Coercion for Integer, Float, and String properties
     # (allow property to be on the right-hand of an operator such as +)
     def coerce(other)
-      if @value.kind_of?(Integer) || @value.kind_of?(Float) || @value.kind_of?(String) 
+      if @value.kind_of?(Integer) || @value.kind_of?(Float) || @value.kind_of?(String)
         return other, @value
       else
         raise OEDLCommandException.new("coercion", "Illegal operation, "+
           "The value of Experiment Property '#{@name}' cannot be coerced to allow "+
           " the requested operation (current value is of type #{value.class})")
       end
-    end    
+    end
   end
 end

data/lib/omf_ec/group.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'securerandom'
 require 'monitor'
 
@@ -12,13 +17,14 @@ module OmfEc
   class Group
     include MonitorMixin
 
-    attr_accessor :name, :id, :net_ifs, :members, :app_contexts
+    attr_accessor :name, :id, :net_ifs, :members, :app_contexts, :execs
     attr_reader :topic
 
     # @param [String] name name of the group
     # @param [Hash] opts
     # @option opts [Boolean] :unique Should the group be unique or not, default is true
     def initialize(name, opts = {}, &block)
+      super()
       @opts = {unique: true}.merge!(opts)
       self.name = name
       self.id = @opts[:unique] ? SecureRandom.uuid : self.name
@@ -26,11 +32,11 @@ module OmfEc
       self.net_ifs = []
       self.members = []
       self.app_contexts = []
+      self.execs = []
 
       @resource_topics = {}
 
       OmfEc.subscribe_and_monitor(id, self, &block)
-      super()
     end
 
     def associate_topic(topic)

data/lib/omf_ec/version.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 module OmfEc
-  VERSION = "6.0.2.pre.2"
+  VERSION = "6.0.2"
 end

data/lib/omf_ec.rb

@@ -1,4 +1,10 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require "omf_common"
+require 'omf_ec/core_ext/hash'
 require 'omf_ec/backward/dsl'
 require 'omf_ec/backward/group'
 require 'omf_ec/backward/app_definition'

data/omf_ec.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "pry"
-  s.add_runtime_dependency "omf_common", "~> 6.0.2.pre.2"
+  s.add_development_dependency "mocha"
+
+  s.add_runtime_dependency "omf_common", "~> 6.0.2"
   s.add_runtime_dependency "gli", "~> 2.5.3"
 end

data/test/omf_ec/context_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_ec/context'
 

data/test/omf_ec/dsl_spec.rb

@@ -1,53 +1,116 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_ec/dsl'
 
 describe OmfEc::DSL do
-  describe "when included" do
+  before do
+    OmfCommon::Eventloop.init(type: :em)
+    @dsl = Class.new { include OmfEc::DSL }.new
+    OmfEc.stubs(:subscribe_and_monitor)
+  end
+
+  after do
+    OmfCommon::Eventloop.reset
+    OmfEc::Experiment.reset
+    OmfEc::ExperimentProperty.reset
+    OmfEc.unstub(:subscribe_and_monitor)
+  end
 
-    include OmfEc::DSL
 
+  describe "when included" do
     it "must respond to after and every" do
-      respond_to?(:after).must_equal true
-      respond_to?(:every).must_equal true
+      EM.run { @dsl.after(0.01) { EM.stop } }
+      EM.run { @dsl.every(0.01) { EM.stop } }
     end
 
-    it "must respond to def_property" do
-      @exp = MiniTest::Mock.new
-      @exp.expect(:add_property, true, [String, Object, String])
-
-      OmfEc.stub :experiment, @exp do
-        def_property('name', 'default', 'testing')
-      end
+    it "must define property correctly" do
+      @dsl.def_property('name', 'default', 'testing')
+      @dsl.property.must_equal OmfEc::ExperimentProperty
+      OmfEc::ExperimentProperty.reset
     end
 
     it "must respond to def_application" do
       block = proc { 1 }
-      def_application('bob', &block).must_equal 1
+      @dsl.def_application('bob', &block).must_equal 1
       OmfEc.experiment.app_definitions.key?('bob').must_equal true
     end
 
+    it "must respond to group" do
+      lambda { @dsl.group('bob') }.must_raise RuntimeError
+      g = mock
+      OmfEc.experiment.stubs(:group).returns(g)
+      @dsl.group('bob').must_equal g
+    end
+
     it "must respond to def_group" do
       block = proc { 1 }
-      OmfEc.stub :subscribe_and_monitor, true do
-        def_group('bob', &block).must_be_kind_of OmfEc::Group
-      end
+      @dsl.def_group('bob', &block).must_be_kind_of OmfEc::Group
     end
 
     it "must respond to all_groups iterator" do
       block = proc { 1 }
-      all_groups(&block)
+      @dsl.all_groups(&block)
     end
 
     it "must respond to all_groups?" do
-      OmfEc.stub :subscribe_and_monitor, true do
-        OmfEc.experiment.stub :groups, [] do
-          all_groups? { true }.must_equal false
-        end
-        def_group('bob')
-        all_groups? { |g| g.name == 'bob' }.must_equal true
+      OmfEc.experiment.stub :groups, [] do
+        @dsl.all_groups? { true }.must_equal false
       end
+      @dsl.def_group('bob')
+      @dsl.all_groups? { |g| g.name == 'bob' }.must_equal true
     end
-  end
 
-end
+    it "must respond to all_equal" do
+      @dsl.all_equal([]).must_equal false
+      @dsl.all_equal([1, 1], 1).must_equal true
+      @dsl.all_equal([1, 1]) do |v|
+        v == 1
+      end.must_equal true
+    end
+
+    it "must respond to one_equal" do
+      @dsl.one_equal([1, 0], 1).must_equal true
+      @dsl.one_equal([0, 0], 1).must_equal false
+    end
 
+    it "must init OEDL exceptions" do
+      lambda { raise OEDLArgumentException.new("ls", "bob") }.must_raise OEDLArgumentException
+      lambda { raise OEDLCommandException.new("bob") }.must_raise OEDLCommandException
+      lambda { raise OEDLUnknownProperty.new("bob") }.must_raise OEDLUnknownProperty
+    end
+
+    it "must respond to done!" do
+      done!
+    end
+
+    it "must respond to define an event" do
+      lambda { def_event :bob }.must_raise ArgumentError
+
+      def_event(:bob) { nil }
+    end
+
+    it "must respond to event callback" do
+      lambda { on_event(:bob) }.must_raise RuntimeError
+      def_event(:bob) { nil }
+      on_event(:bob) { nil }
+    end
+
+    describe "when using OEDL 5 syntax" do
+      it "must respond to wait" do
+        @dsl.wait(0.01)
+      end
+
+      it "must respond to defApplication" do
+        @dsl.defApplication('some_uri')
+      end
+
+      it "must respond to defGroup" do
+        @dsl.defGroup('bob', 'a', 'b') { nil }
+      end
+    end
+  end
+end

data/test/omf_ec/experiment_property_spec.rb

@@ -1,10 +1,14 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_ec/experiment_property'
 require 'omf_ec/dsl'
 include OmfEc::DSL
 
 describe OmfEc::ExperimentProperty do
-
   describe "when a new ExperimentProperty is created" do
     it "must raise an error if it is given an invalid name" do
       created_properties = 0
@@ -41,7 +45,7 @@ describe OmfEc::ExperimentProperty do
     it "must inform all of its observers when its value changes" do
       value = 2
       foobar = OmfEc::ExperimentProperty.create('foobar',1)
-      foobar.on_change { |v| v.must_equal value } 
+      foobar.on_change { |v| v.must_equal value }
       foobar.on_change { |v| (v*2).must_equal value*2 }
       OmfEc::ExperimentProperty[:foobar] = value
       OmfEc::ExperimentProperty[:foobar].value.must_equal value
@@ -50,8 +54,11 @@ describe OmfEc::ExperimentProperty do
 
   describe "when a the Class ExperimentProperty is creating a new property" do
     it "must inform all of its observers" do
+      OmfEc::ExperimentProperty.reset
+
       size_before = OmfEc::ExperimentProperty.length
       OmfEc::ExperimentProperty.add_observer do |c,p|
+        c.must_equal :create
         p.name.must_equal 'barfoo'
         p.value.must_equal 123
         p.description.must_equal 'abc'
@@ -63,18 +70,23 @@ describe OmfEc::ExperimentProperty do
 
   describe "when an operation involves an ExperimentProperty" do
     it "must return the expected result" do
+      OmfEc::ExperimentProperty.reset
+
+      OmfEc::ExperimentProperty.create('foo', 1, 'abc')
+      OmfEc::ExperimentProperty.create('bar','b')
+
       OmfEc::ExperimentProperty[:foo] = 2
       (OmfEc::ExperimentProperty[:foo] + 1).must_equal 3
       (1 + OmfEc::ExperimentProperty[:foo]).must_equal 3
       (OmfEc::ExperimentProperty[:foo] - 1).must_equal 1
       (1 - OmfEc::ExperimentProperty[:foo]).must_equal -1
-      (OmfEc::ExperimentProperty[:foo] * 2).must_equal 4      
+      (OmfEc::ExperimentProperty[:foo] * 2).must_equal 4
       (2 * OmfEc::ExperimentProperty[:foo]).must_equal 4
-      (OmfEc::ExperimentProperty[:foo] / 1).must_equal 2      
+      (OmfEc::ExperimentProperty[:foo] / 1).must_equal 2
       (2 / OmfEc::ExperimentProperty[:foo]).must_equal 1
       OmfEc::ExperimentProperty[:bar] = 'a'
-      (OmfEc::ExperimentProperty[:bar] + "b").must_equal 'ab'     
-      ('b' + OmfEc::ExperimentProperty[:bar]).must_equal 'ba'    
+      (OmfEc::ExperimentProperty[:bar] + "b").must_equal 'ab'
+      ('b' + OmfEc::ExperimentProperty[:bar]).must_equal 'ba'
     end
   end
 

data/test/omf_ec/experiment_spec.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_ec/experiment'
 
@@ -21,6 +26,7 @@ describe OmfEc::Experiment do
   end
 
   it "must be able to add sub group" do
+    skip
     @experiment.add_sub_group('bob')
     @experiment.sub_group('bob').must_equal "bob"
   end

data/test/omf_ec/group_spec.rb

@@ -1,27 +1,34 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'test_helper'
 require 'omf_ec/group'
 
 describe OmfEc::Group do
+  before do
+    OmfEc.stubs(:subscribe_and_monitor)
+  end
+
+  after do
+    OmfEc.unstub(:subscribe_and_monitor)
+  end
+
   describe "when initialised" do
     it "must be generate unique id if :unique option is on" do
-      OmfEc.stub :subscribe_and_monitor, true do
-        OmfEc::Group.new('bob').id.wont_equal 'bob'
-      end
+      OmfEc::Group.new('bob').id.wont_equal 'bob'
     end
 
     it "must use name as id if :unique option is off" do
-      OmfEc.stub :subscribe_and_monitor, true do
-        OmfEc::Group.new('bob', unique: false).id.must_equal 'bob'
-      end
+      OmfEc::Group.new('bob', unique: false).id.must_equal 'bob'
     end
   end
 
   describe "when used to represent group resource" do
     before do
-      @comm = MiniTest::Mock.new
-      OmfEc.stub :subscribe_and_monitor, true do
-        @group = OmfEc::Group.new('bob', unique: false)
-      end
+      @group = OmfEc::Group.new('bob', unique: false)
+      @g_b = OmfEc::Group.new('g_b', unique: false)
     end
 
     it "must init default context related arrasy" do
@@ -31,27 +38,29 @@ describe OmfEc::Group do
     end
 
     it "must be capable of adding existing resources to group" do
-      skip
-      OmfCommon.stub :comm, @comm do
-        @comm.expect(:subscribe, true, [Array])
-        @group.add_resource(['r1', 'r2'])
-        @comm.verify
-      end
+      @group.add_resource(['r1', 'r2'])
+
+      OmfEc.experiment.stubs(:groups).returns([@g_b])
+
+      @group.add_resource('g_b')
     end
 
     it "must be capable of creating new resources and add them to group" do
-      skip
-      OmfCommon.stub :comm, @comm do
-        @comm.expect(:subscribe, true, [String])
-        @comm.expect(:create_topic, true, [String])
-        @group.create_resource('r1', { type: :test, p1: 'bob' })
-        @comm.verify
-      end
+      @group.create_resource('r1', { type: :test, p1: 'bob' })
     end
 
     it "must create new group context when calling resources" do
       @group.resources.must_be_kind_of OmfEc::Context::GroupContext
     end
+
+    it "must be capable of associating pubsub topic instances" do
+      t = mock
+      @group.associate_topic(t)
+      @group.topic.must_equal t
+
+      @group.associate_resource_topic('bob', t)
+      @group.resource_topic('bob').must_equal t
+    end
   end
 end
 

data/test/test_helper.rb

@@ -1,9 +1,15 @@
+# Copyright (c) 2012 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+
 require 'simplecov'
 SimpleCov.start { add_filter "/test" }
 
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
+require 'mocha/setup'
 
 require 'omf_ec'
 
@@ -17,3 +23,30 @@ Logging.logger.root.clear_appenders
 def fixture(name)
   File.read("#{FIXTURE_DIR}/#{name.to_s}")
 end
+
+class OmfCommon::Eventloop
+  def self.reset
+    @@instance = nil
+  end
+end
+
+class OmfEc::Experiment
+  def self.reset
+    instance.instance_eval do
+      @groups = []
+      @events = []
+      @app_definitions = Hashie::Mash.new
+      @sub_groups = Hashie::Mash.new
+      @cmdline_properties = Hashie::Mash.new
+    end
+  end
+end
+
+class OmfEc::ExperimentProperty
+  def self.reset
+    @@properties = Hashie::Mash.new
+    @@creation_observers = []
+  end
+end
+
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.0.2.pre.2
-  prerelease: 6
+  version: 6.0.2
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2.pre.2
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.2.pre.2
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +136,6 @@ files:
 - Gemfile
 - Rakefile
 - bin/omf_ec
-- config/ec.yml
 - example/engine_oedl.rb
 - example/engine_test.rb
 - example/test_exp/test00.rb
@@ -142,6 +157,7 @@ files:
 - lib/omf_ec/context/def_app_context.rb
 - lib/omf_ec/context/group_context.rb
 - lib/omf_ec/context/net_context.rb
+- lib/omf_ec/core_ext/hash.rb
 - lib/omf_ec/dsl.rb
 - lib/omf_ec/experiment.rb
 - lib/omf_ec/experiment_property.rb
@@ -170,9 +186,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1252066370023531099
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 1.8.25