omf_ec 6.1.4.pre.2 → 6.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 771993407e8b4d1cfb88ea8863d2d8693eb67dc4
+  data.tar.gz: 829d83eaa6c6d17df8c2ddab66ddea1ad42f028d
+SHA512:
+  metadata.gz: d412ccbfae115220d733f494845de3833e29d7444a9093ce2cf05c109cf234b4c5825f3347e88899eb6d9279948a2bd2ac9b4c774e3932630522a02fda4afc3d
+  data.tar.gz: f96fbb4334636616db143256a9acfa50f8eff2ed25fbd1071c4a4935bdf594996850229f62aba3c9517bb82d9e8882b009bbab64cd941c068664e2549f49d4e0

data/Gemfile

@@ -4,8 +4,11 @@ source "http://rubygems.org"
 gemspec
 
 gem 'omf_common', path: "../omf_common"
-gem 'blather'
 
 group :test do
   gem 'rake'
 end
+
+group :xmpp do
+  gem 'blather'
+end

data/example/config/logging_to_oml.yml

@@ -17,17 +17,17 @@ logging:
     rolling_file:
       level: all
       log_dir: /var/tmp
-      # max 50mb of each log file
-      size: 52428800
-      # keep a 5 logs in total
-      keep: 5
+      # max 10k of each log file
+      size: 10240
+      # keep 1 log in total
+      keep: 1
       date_pattern: "%F %T %z"
       pattern: "[%d] %-5l %c: %m\n"
     # To OML is enabled by default when oml_uri option is SET
     # Uncomment this if you need to change the default
     #
     # oml4r:
-    #   level: info
+    #   level: debug
     #   appName: 'omf_ec'
     #   domain: '<%= OmfEc.experiment.id %>'
     #   collect: tcp:some_other_oml_server:3003

data/example/config/with_custom_logging.yml

@@ -14,17 +14,17 @@ logging:
       date_pattern: "%H:%M:%S"
       pattern: "%d %5l %c{2}: %m\n"
       # To turn colour on use color_scheme: default
-      color_scheme: default
+      color_scheme: none
     # To Rolling log file, and log everything
     rolling_file:
       level: all
       log_dir: /var/tmp
-      # max 50mb of each log file
-      size: 52428800
-      # keep a 5 logs in total
-      keep: 5
+      # max 10k of each log file
+      size: 10240
+      # keep 1 log in total
+      keep: 1
       date_pattern: "%F %T %z"
       pattern: "[%d] %-5l %c: %m\n"
 
 # Use OML server located at localhost port 3003
-#oml_uri: tcp:localhost:3003
+oml_uri: tcp:localhost:3003

data/lib/omf_ec/backward/app_definition.rb

@@ -43,6 +43,8 @@ module OmfEc
                          when :string then 'String'
                          when :boolean then 'Boolean'
                          when :double then 'Float'
+                         # For type that we cannot understand, DON'T send it
+                         else nil
                          end
         opts = opts.merge(options)
         define_parameter(Hash[name,opts])

data/lib/omf_ec/backward/default_events.rb

@@ -39,7 +39,7 @@ module OmfEc
               results = []
               all_groups? do |g|
                 plan = g.app_contexts.size * g.members.values.uniq.size
-                actual = state.count { |v| v.joined?(g.address("application")) }
+                actual = state.count { |v| v.joined?(g.address("application")) && v[:state] == "stopped" }
                 results << (plan == actual) unless (plan == 0)
               end
               !results.include?(false)
@@ -89,10 +89,12 @@ module OmfEc
               all_nodes_up?(state) &&  all_interfaces_ready?(state)
             end
 
-            def_event :ALL_UP_AND_INSTALLED do |state|
+            def_event :ALL_APPS_UP do |state|
               all_nodes_up?(state) && all_apps_ready?(state)
             end
 
+            alias_event :ALL_UP_AND_INSTALLED, :ALL_APPS_UP
+
             def_event :ALL_APPS_DONE do |state|
               all_nodes_up?(state) &&
                 all_groups? do |g|

data/lib/omf_ec/context/app_context.rb

@@ -6,7 +6,7 @@
 module OmfEc::Context
   # Holds application configuration
   class AppContext
-    attr_accessor :name, :app_def, :param_values, :oml_collections
+    attr_accessor :name, :app_def, :param_values, :oml_collections, :proto_props
 
     # Keep track of contexts for each app, i.e. multiple contexts can share
     # the same app def. This happens for example when a group can have the
@@ -57,13 +57,18 @@ module OmfEc::Context
       self
     end
 
+    def bindProperty(prop_name, prop_ref = prop_name)
+      @proto_props ||= Hashie::Mash.new
+      @proto_props[prop_name] = prop_ref
+    end
+
     # For now this follows v5.4 syntax...
     # We have not yet finalised an OML syntax inside OEDL for v6
     # TODO: v6 currently does not support OML filters. Formerly in v5.x, these
     # filters were defined in an optional block.
     def measure(mp, opts, &block)
       collect_point = opts.delete(:collect)
-      collect_point ||= OmfEc.experiment.oml_uri 
+      collect_point ||= OmfEc.experiment.oml_uri
       if collect_point.nil?
         warn "No OML URI configured for measurement collection! "+
              "(see option 'oml_uri'). Disabling OML Collection for '#{mp}'."
@@ -83,7 +88,7 @@ module OmfEc::Context
       # - if this context's param_values has a property which also exists in
       #   the app def and if that property has an assigned value, then
       #   use that value for the properties of this context
-      p = original.merge({:type => 'application'})
+      p = original.merge({type: 'application', state: 'stopped'})
       @param_values.each do |k,v|
         if p[:parameters].key?(k)
           p[:parameters][k][:value] = v.kind_of?(OmfEc::ExperimentProperty) ? v.value : v

data/lib/omf_ec/dsl.rb

@@ -311,5 +311,14 @@ module OmfEc
       end
     end
 
+    # Define a new prototype. The supplied block is executed with the new Prototype instance as a single argument.
+    #
+    # @param refName reference name for this property
+    # @param name optional, short/easy to remember name for this property
+    def defPrototype(refName, name = nil, &block)
+      p = Prototype.create(refName)
+      p.name = name
+      block.call(p)
+    end
   end
 end

data/lib/omf_ec/experiment.rb

@@ -157,6 +157,11 @@ module OmfEc
       @name || @id
     end
 
+    # Unique experiment id (Class method)
+    def self.ID
+      instance.id
+    end
+
     # Parsing user defined events, checking conditions against internal state, and execute callbacks if triggered
     def process_events
       self.synchronize do

data/lib/omf_ec/experiment_property.rb

@@ -12,7 +12,7 @@ module OmfEc
   # Experiment Properties defined for a given experiment.
   # Most of this implementation is re-used from OMF 5.4
   #
-  class OmfEc::ExperimentProperty
+  class ExperimentProperty
 
     # Contains all the experiment properties
     @@properties = Hashie::Mash.new
@@ -166,7 +166,7 @@ module OmfEc
     # Implicit conversion to String (required for + operator)
     def to_str() @value.to_s end
 
-    # More convenient conversion 
+    # More convenient conversion
     def to_f() @value.to_f end
     def to_i() @value.to_i end
 

data/lib/omf_ec/group.rb

@@ -109,6 +109,24 @@ module OmfEc
       OmfEc::Context::GroupContext.new(group: self)
     end
 
+    # Add a new Prototype to the NodeSet associated with this Root Path
+    #
+    # - name = name of the Prototype to associate with the NodeSet of this Path
+    # - params = optional, a Hash with the bindings to be passed on to the
+    #
+    # Prototype instance (see Prototype.instantiate)
+    def addPrototype(name, params = nil)
+      debug "Use prototype #{name}."
+      p = OmfEc::Prototype[name]
+      if p.nil?
+        error "Unknown prototype '#{name}'"
+        return
+      end
+      p.instantiate(self, params)
+    end
+
+    alias_method :prototype, :addPrototype
+
     include OmfEc::Backward::Group
   end
 end

data/lib/omf_ec/parameter.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia
+# 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.
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+
+module OmfEc
+  # This class describes a Parameter
+  class Parameter
+
+    attr_reader :id, :name, :description, :defaultValue
+
+    #
+    # Create a new Parameter instance
+    #
+    # - id = parameter identifier
+    # - name = name for this parameter
+    # - description = short description of this parameter
+    # - defaultValue = optional, a defautl value for this parameter (default=nil)
+    #
+    def initialize(id, name, description, defaultValue = nil)
+      @id = id
+      @name = name != nil ? name : id
+      @description = description
+      @defaultValue = defaultValue
+    end
+
+    #
+    # Return the definition of this Parameter as an XML element
+    #
+    # [Return] an XML element with the definition of this Parameter
+    #
+    def to_xml
+      a = REXML::Element.new("parameter")
+      a.add_attribute("id", id)
+      a.add_attribute("name", name)
+      if (description != nil)
+        a.add_element("description").text = description
+      end
+      if (defaultValue != nil)
+        a.add_element("default").text = defaultValue
+      end
+      return a
+    end
+
+  end
+end

data/lib/omf_ec/property.rb

@@ -0,0 +1,172 @@
+#
+# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+#
+module OmfEc
+  # This class describes a Property, which is part of a Prototype
+  class Property
+
+    #
+    # Unmarshall a Property instance from an XML tree.
+    #
+    # - defRoot = the root of the XML tree describing the Property
+    #
+    # [Return] a new Property instance initialized with the information from the XML tree
+    #
+    def self.from_xml(defRoot)
+      if (defRoot.name != "property")
+        raise "Property definition needs to start with an 'property' element"
+      end
+      idref = defRoot.attributes['idref']
+      obj = unit = nil
+      isBinding = false
+      defRoot.elements.each { |el|
+        case el.name
+        when 'binding'
+          obj = el.attribute['idref']
+          isBinding = true
+        when 'value'
+          obj = el.text
+          unit = el.attribute['unit']
+        else
+          warn "Ignoring element '#{el.name}'"
+        end
+      }
+      if isBinding then warn "NOT IMPLEMENTED: Resolving bindings from XML streams" end
+      p = self.new(idred, obj, unit, isBinding)
+      return p
+    end
+
+    attr_reader :idref, :value, :unit, :bindingRef, :isBound
+
+    #
+    # Create a new Property instance
+    #
+    # - idref = Reference to property in {@link AppDefinition}
+    # - obj = Value or property binding to establish value of property
+    # - unit = Unit of value
+    # - isBinding = If true "obj" is a property reference, otherwise it's a value
+    #
+    def initialize(idref, obj = nil, unit = nil, isBinding = false)
+      @idref = idref
+      @unit = unit
+      if isBinding
+        @bindingRef = obj
+      else
+        @value = obj
+      end
+      @isBound = isBinding
+    end
+
+    #
+    # Return the definition of this Property as an XML element
+    #
+    # [Return] a XML element describing this Property
+    #
+    def to_xml
+      a = REXML::Element.new("property")
+      a.add_attribute("name", idref)
+      if isBound
+        a.add_element("binding", {"idref" => bindingRef})
+      elsif value != nil
+        v = a.add_element("value")
+        v.text = value
+        if (unit != nil)
+          v.add_attribute("unit", unit)
+        end
+      else
+        Log.warn("NOT IMPLEMENTED: check for default value in app definition")
+      end
+      return a
+    end
+
+  end
+
+  #
+  # This module defines the methods used to create new Properties when defining Prototypes/Applications in Experiments
+  #
+  module CreatePropertiesModule
+
+    #
+    # Set a property of the application to a specific value
+    #
+    # - propName = Name of the application property
+    # - value = Value of property
+    # - unit = optional, unit for this Property
+    #
+    def setProperty(propName, value, unit = nil)
+      prop = OmfEc::Property.new(propName, value, unit)
+      @properties += [prop]
+    end
+
+    #
+    # Bind the value of a property to another property in the context
+    #
+    # - propName = name of application property
+    # - propRef = Property to bind to (default = 'propName')
+    #
+    def bindProperty(propName, propRef = propName)
+      prop = OmfEc::Property.new(propName, propRef, nil, true)
+      @properties += [prop]
+    end
+
+    #
+    # Add a list of properties described in a hash table
+    # where key is the property name and the value its value.
+    # If value starts with "$", value is interpreted as
+    # the name of another property to bind to.
+    #
+    # - properties = a Hash describing a set of properties
+    #
+    def addProperties(properties)
+      if properties != nil
+        if properties.kind_of?(Hash)
+          properties.each {|k, v|
+            if v.kind_of?(Symbol)
+              v = v.to_s
+            end
+            if v.kind_of?(String) && v[0] == ?$
+              # is binding
+              bindProperty(k, v[1..-1])
+            else
+              setProperty(k, v)
+            end
+          }
+        elsif properties.kind_of? Array
+          properties.each {|p|
+            if ! p.kind_of? OmfEc::Property
+              raise "Propertie array needs to contain Property, but is '" \
+                + p.class.to_s + "'."
+            end
+            @properties += [p]
+          }
+        else
+          raise "Properties declarations needs to be a Hash or Array, but is '" \
+            + properties.class.to_s + "'."
+        end
+
+      end
+    end
+
+  end
+end

data/lib/omf_ec/prototype.rb

@@ -0,0 +1,232 @@
+# Copyright (c) 2006-2009 National ICT Australia (NICTA), Australia
+# 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.
+#
+# Copyright (c) 2004-2009 WINLAB, Rutgers University, USA
+
+require "omf_ec/parameter"
+
+module OmfEc
+  # This class describes a prototype which can be used to access applications within an Experiment.
+  class Prototype
+
+    @@prototypes = Hash.new
+    @@bindStruct = Struct.new(:name)
+
+    # Return a known Prototype instance.
+    #
+    # [Return] the uri 'URI' identifying the Prototype
+    #
+    def self.[](uri)
+      proto = @@prototypes[uri]
+      if proto == nil
+        debug "Loading prototype '#{uri}'"
+        str, type = OConfig.load(uri, true)
+        #MObject.debug('Prototype: ', 'str: "', str, '".')
+        if type == "text/xml"
+          # proto = Prototype.from_xml(str.to_xml???)
+        elsif type == "text/ruby"
+          # 'str' has already been evaluated
+          proto = @@prototypes[uri]
+        end
+        if proto == nil
+          raise "Unknown prototype '#{uri}'."
+        end
+      end
+
+      proto
+    end
+
+    # Create a new Prototype instance.
+    #
+    # - uri = an URI identifying the new Prototype
+    # - name = an optional name for this Prototype (default = 'uri')
+    #
+    def self.create(uri, name = uri)
+      return Prototype.new(uri, name)
+    end
+
+    # Reset all class state. Specifically forget all prototype declarations.
+    # This is primarily used by the test suite.
+    #
+    def self.reset()
+      @@prototypes = Hash.new
+      @@bindStruct = Struct.new(:name)
+    end
+
+    # Global reference
+    attr_writer :uri
+
+    # Name of prototype
+    attr_writer :name
+
+    # Version of prototype
+    attr_reader :version
+
+    # Description of the prototype
+    attr_writer :description
+
+    # Parameters of the prototype
+    attr_reader :parameters
+
+    # Applications used on the prototype
+    attr_reader :applications
+
+    # Create a new Prototype instance.
+    #
+    # - uri = an URI identifying the new Prototype
+    # - name = an optional name for this Prototype (default = 'uri')
+    #
+    def initialize(uri, name = uri)
+      if @@prototypes.has_key? uri
+        raise StandardError, "Prototype with name '#{uri}' already exists."
+      end
+      @@prototypes[uri] = self
+
+      @uri = uri
+      @name = name
+      @properties = Hashie::Mash.new
+      @incPrototypes = Hash.new
+      @applications = Array.new
+    end
+
+    # Instantiate this prototype for a particular node set.
+    #
+    # - group = Group to configure according to this prototype
+    # - bindings = a Hash with the bindings for local parameters
+    #
+    def instantiate(group, bindings)
+      bindings = Hashie::Mash.new(bindings)
+      # check if bindings contain unknown properties
+      if (diff = bindings.keys - @properties.keys) != []
+        raise "Unknown parameters '#{diff.join(', ')}'" \
+          + " not in '#{@properties.keys.join(', ')}'."
+      end
+      # merge bindings with properties declaration
+      context = Hash.new
+      @properties.each do |name, param|
+        #puts "A>> #{name}"
+        value = getBoundValue(name, bindings)
+        if value != nil
+          context[name] = getBoundValue(name, bindings)
+        else
+          warn "No specific or default value found for Property '#{name}'. Prototype '#{@name}' will not use it!"
+        end
+      end
+
+      @incPrototypes.each do |name, params|
+        proto = Prototype[name]
+        p = params.clone
+        p.each do |key, val|
+          if val.kind_of?(@@bindStruct)
+            #puts "B>> #{val.name}:#{key}"
+            value = getBoundValue(name, bindings)
+            if value != nil
+              p[key] = val = value
+            else
+              warn "No specific or default value found for Property '#{name}'. Prototype '#{@name}' will not use it!"
+            end
+          end
+          #debug "recursive bindings: #{key}=>#{val}"
+        end
+        proto.instantiate(group, p)
+      end
+
+      @applications.each do |app|
+        name, location, block = *app
+
+        if block
+          block_with_binding_props = proc do |app_ctx|
+            block.call(app_ctx)
+            app_ctx.proto_props.each do |p_name, p_ref|
+              app_ctx.setProperty(p_name, context[p_ref]) if context[p_ref]
+            end
+          end
+        end
+
+        if block_with_binding_props
+          group.addApplication(name, location, &block_with_binding_props)
+        else
+          group.addApplication(name, location)
+        end
+      end
+    end
+
+    # Return the value of a given property 'name' within the
+    # context of 'bindings'.
+    #
+    # - name = name of the property to get the value from
+    # - bindings = context for this property
+    #
+    # [Return] The value of the property
+    #
+    def getBoundValue(name, bindings)
+      if (bindings.has_key? name)
+        return bindings[name]
+      else
+        # use default
+        if (@properties[name] == nil)
+          raise "Unknown property #{name}"
+        end
+        return @properties[name].defaultValue
+      end
+    end
+    private :getBoundValue
+
+    # Define a property for this prototype
+    #
+    # - id = ID of parameter, also used as name
+    # - description = Description of parameter's purpose
+    # - default = Default value if not set, makes parameter optional
+    #
+    def defProperty(id, description, default = nil)
+      if @properties[id] != nil
+        raise "Property '" + id + "' already defined."
+      end
+      param = OmfEc::Parameter.new(id, id, description, default)
+      @properties[id] = param
+    end
+
+    # Returns an object which maintains the connection to a
+    # a local property of this Prototype.
+    #
+    # - name = name of the local property
+    #
+    # [Return] a structure with connection info to the local property
+    #
+    def bindProperty(name)
+      @@bindStruct.new(name)
+    end
+
+    # Set the version number for this Prototype
+    #
+    # - major = major version number
+    # - minor = minor version number
+    # - revision = revision version number
+    #
+    def setVersion(major = 0, minor = 0, revision = 0)
+      #TODO Needs new implementation
+      #@currentVersion = MutableVersion.new(major, minor, revision)
+    end
+
+    # Add a nested Prototype which should be instantiated when
+    # this Prototype is instantiated.
+    #
+    # - name = Name used for reference
+    # - param = Hash of parameter bindings
+    #
+    def addPrototype(name, param)
+      if @incPrototypes.has_key? name
+        raise "Prototype already has a prototype '" + name + "'."
+      end
+      @incPrototypes[name] = param
+    end
+
+    # Add an Application which should be installed on this prototype.
+    #
+    def addApplication(name, location = nil, &block)
+      @applications << [name, location, block]
+    end
+  end
+end

data/lib/omf_ec/runner.rb

@@ -36,8 +36,8 @@ module OmfEc
             rolling_file: {
               level: :debug,
               log_dir: '/var/tmp',
-              size: 1024*1024*50, # max 50mb of each log file
-              keep: 5, # keep a 5 logs in total
+              size: 1024*10, # max 510k of each log file
+              keep: 1, # keep 1 log in total
               date_pattern: '%F %T %z',
               pattern: '[%d] %-5l %c: %m\n'
             }
@@ -165,7 +165,7 @@ module OmfEc
       if @config_opts[:oml_uri]
         # Only change default if they are not set in config file
         @config_opts[:logging][:appenders][:oml4r] ||= {
-          level: :info,
+          level: :debug, # Log everything to OML
           appName: 'omf_ec',
           domain: OmfEc.experiment.id,
           collect: @config_opts[:oml_uri]

data/lib/omf_ec.rb

@@ -17,6 +17,7 @@ require "omf_ec/group"
 require "omf_ec/app_definition"
 require "omf_ec/context"
 require "omf_ec/graph"
+require "omf_ec/prototype"
 require "omf_ec/dsl"
 
 module OmfEc

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.4.pre.2
-  prerelease: 6
+  version: 6.1.4
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   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: simplecov
   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: pry
   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: 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: evented-spec
   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
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.pre.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.4.pre.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Experiment controller of OMF, a generic framework for controlling and
@@ -168,6 +153,9 @@ files:
 - lib/omf_ec/graph.rb
 - lib/omf_ec/graph/graph_description.rb
 - lib/omf_ec/group.rb
+- lib/omf_ec/parameter.rb
+- lib/omf_ec/property.rb
+- lib/omf_ec/prototype.rb
 - lib/omf_ec/runner.rb
 - lib/omf_ec/version.rb
 - omf_ec.gemspec
@@ -183,26 +171,34 @@ 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: omf_ec
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OMF experiment controller
-test_files: []
+test_files:
+- test/oedls/empty.oedl
+- test/omf_ec/app_context_spec.rb
+- test/omf_ec/context_spec.rb
+- test/omf_ec/dsl_spec.rb
+- test/omf_ec/experiment_property_spec.rb
+- test/omf_ec/experiment_spec.rb
+- test/omf_ec/group_spec.rb
+- test/omf_ec/runner_spec.rb
+- test/test_helper.rb