omf_ec 6.1.2.pre.3 → 6.1.2.pre.4

data/bin/omf_ec

@@ -4,4 +4,6 @@ require 'omf_ec'
 require 'omf_ec/runner'
 $stdout.sync = true
 
-OmfEc::Runner.new.run
+runner = OmfEc::Runner.new
+runner.init
+runner.run

data/lib/omf_ec/dsl.rb

@@ -141,7 +141,7 @@ module OmfEc
     # Take the same parameter as def_property
     #
     def ensure_property(name, default_value, description = nil, type = nil)
-      begin 
+      begin
         property[name]
       rescue
         def_property(name, default_value, description, type)
@@ -211,10 +211,10 @@ module OmfEc
       end
     end
 
-    # Load an additional OEDL script 
+    # Load an additional OEDL script
     #
-    # First try to load the script from the paths associated to this running 
-    # Ruby instance. This would allow the loading of scripts shipped with 
+    # First try to load the script from the paths associated to this running
+    # Ruby instance. This would allow the loading of scripts shipped with
     # the EC gem. If that fails, then look for the script in the local file
     # system or at the given web URL.
     #
@@ -226,7 +226,7 @@ module OmfEc
     #
     def load_oedl(location, opts = {})
       # Define the additional properties from opts
-      opts.each { |k,v| def_property(k, v,) } 
+      opts.each { |k,v| def_property(k, v,) }
       # Try to load OEDL Library as built-in then external
       begin
         require location
@@ -238,13 +238,14 @@ module OmfEc
           file = Tempfile.new("oedl-#{Time.now.to_i}")
           open(location) { |io| file.write(io.read) }
           file.close
-          load(file.path) 
+          OmfEc.experiment.archive_oedl(file.path)
+          load(file.path)
           file.unlink
           info "Loaded external OEDL library '#{location}'"
         rescue Exception => e
           error "Fail loading external OEDL library '#{location}': #{e}"
         end
-      rescue Exception => e 
+      rescue Exception => e
         error "Fail loading built-in OEDL library '#{location}': #{e}"
       end
     end

data/lib/omf_ec/experiment.rb

@@ -5,6 +5,7 @@
 
 require 'hashie'
 require 'singleton'
+require 'zlib'
 require 'monitor'
 
 module OmfEc
@@ -187,6 +188,15 @@ module OmfEc
       MetaData.inject(domain.to_s, key.to_s, value.to_s)
     end
 
+    # Archive OEDL content to OML db
+    def archive_oedl(script_name)
+      log_metadata(
+        script_name,
+        Base64.encode64(Zlib::Deflate.deflate(File.read(script_name))),
+        "oedl_content"
+      )
+    end
+
     # Purely for backward compatibility
     class << self
       # Disconnect communicator, try to delete any XMPP affiliations

data/lib/omf_ec/runner.rb

@@ -9,6 +9,8 @@ module OmfEc
   class Runner
     include Hashie
 
+    attr_reader :oedl_path
+
     def initialize
       @gem_version = OmfEc::VERSION
       @oml_enabled = false
@@ -245,6 +247,7 @@ module OmfEc
             OmfEc.experiment.log_metadata("ec_version", "#{OmfEc::VERSION}")
             OmfEc.experiment.log_metadata("exp_path", @oedl_path)
             OmfEc.experiment.log_metadata("ec_pid", "#{Process.pid}")
+            OmfEc.experiment.archive_oedl(@oedl_path)
 
             begin
               load @oedl_path
@@ -268,9 +271,13 @@ module OmfEc
       end
     end
 
-    def run
+    def init
       oml_init
       setup_experiment
+      #load_experiment
+    end
+
+    def run
       load_experiment
     end
   end

data/omf_ec.gemspec

@@ -22,13 +22,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "minitest", "~> 3.2"
-  s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
+  s.add_development_dependency "minitest"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "pry"
   s.add_development_dependency "mocha"
+  s.add_development_dependency "evented-spec"
 
   s.add_runtime_dependency "omf_common", "= #{OmfCommon::VERSION}"
-  s.add_runtime_dependency "gli"
   s.add_runtime_dependency "sequel"
 end

data/test/omf_ec/runner_spec.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'omf_ec/runner'
+
+describe OmfEc::Runner do
+  before do
+    uninit
+  end
+
+  after do
+    uninit
+  end
+  it "must allow to accept a set of command line options" do
+    ARGV.clear
+    "-u amqp://localhost --slice empty --oml_uri tcp:localhost:3003 -e xxx -d --experiment e1 --show-graph exec #{File.dirname(__FILE__)}/../oedls/empty.oedl -- --prop_1 p1value".split(" ").each do |opt|
+      ARGV << opt
+    end
+    runner = OmfEc::Runner.new
+    runner.init
+
+    assert_equal 'e1', OmfEc.experiment.name
+    assert_equal "tcp:localhost:3003", OmfEc.experiment.oml_uri
+    assert_equal true, OmfEc.experiment.show_graph
+    assert_match /oedls\/empty.oedl/, runner.oedl_path
+  end
+end

data/test/test_helper.rb

@@ -11,17 +11,17 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 
-require 'omf_ec'
+require 'evented-spec'
 
-# Default fixture directory
-FIXTURE_DIR = "#{File.dirname(__FILE__)}/fixture"
+require 'omf_ec'
 
 # Shut up all the loggers
 Logging.logger.root.clear_appenders
 
-# Reading fixture file
-def fixture(name)
-  File.read("#{FIXTURE_DIR}/#{name.to_s}")
+def uninit
+  OmfEc::Experiment.reset
+  OmfEc::ExperimentProperty.reset
+  OmfCommon::Eventloop.reset
 end
 
 class OmfCommon::Eventloop
@@ -32,21 +32,12 @@ 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
+    Singleton.__init__(self)
   end
 end
 
 class OmfEc::ExperimentProperty
   def self.reset
-    @@properties = Hashie::Mash.new
-    @@creation_observers = []
+    Singleton.__init__(self)
   end
 end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.3
+  version: 6.1.2.pre.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,42 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-15 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: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-minitest-spec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: evented-spec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.3
+        version: 6.1.2.pre.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,23 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.3
-- !ruby/object:Gem::Dependency
-  name: gli
-  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'
+        version: 6.1.2.pre.4
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +168,14 @@ files:
 - lib/omf_ec/runner.rb
 - lib/omf_ec/version.rb
 - omf_ec.gemspec
+- 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
 homepage: http://omf.mytestbed.net
 licenses: