omf_ec 6.1.2.pre.4 → 6.1.2.pre.5

data/example/engine_oedl.rb

@@ -22,23 +22,20 @@ defEvent :rpm_reached_4000 do |state|
 end
 
 # Define a group and add garages to it.
-defGroup('garages', prop.garage, include_childern: true)
+defGroup('garages', prop.garage)
 
 # :ALL_UP is a pre-defined event,
 # triggered when all resources set to be part of groups are available and configured as members of the associated groups.
 onEvent :ALL_UP do
   group('garages') do |g|
-    #g.request("child_resources")
-    g.engines.request(:rpm)
-
-    g.create_engine('my_engine') do #, type: 'engine')
+    g.create_resource('my_engine', type: 'engine')
 
     onEvent :engine_created do
       info ">>> Accelerating all engines"
       g.resources[type: 'engine'].throttle = 50
+
       # We periodically check engine RPM
       every 2.second do
-        g.engines.request(:rpm)
         g.resources[type: 'engine'].rpm
       end
     end

data/lib/omf_ec/runner.rb

@@ -176,7 +176,9 @@ module OmfEc
 
       remove_cmd_opts_from_argv("exec")
 
-      @argv.in_groups_of(2) do |arg_g|
+      index_of_dividing_hyphen = @argv.index("--")
+
+      @argv[0..index_of_dividing_hyphen || -1].in_groups_of(2) do |arg_g|
         if arg_g[0] =~ /^--(.+)/ && !arg_g[1].nil?
           remove_cmd_opts_from_argv(*arg_g)
         end
@@ -189,19 +191,23 @@ module OmfEc
         exit(1)
       end
 
+      @argv.slice!(0)
+
       # User-provided command line values for Experiment Properties cannot be
       # set here as the properties have not been defined yet by the experiment.
       # Thus just pass them to the experiment, which will be responsible
       # for setting them later
       properties = {}
-      if @argv.size > 1 && @argv[1] == "--"
-        exp_properties = @argv[2..-1]
+      if index_of_dividing_hyphen
+        remove_cmd_opts_from_argv("--")
+        exp_properties = @argv
         exp_properties.in_groups_of(2) do |p|
           unless p[0] =~ /^--(.+)/ && !p[1].nil?
             puts "Malformatted properties '#{exp_properties.join(' ')}'"
             exit(1)
           else
             properties[$1.to_sym] = p[1].ducktype
+            remove_cmd_opts_from_argv(*p)
           end
         end
         OmfEc.experiment.cmdline_properties = properties

data/test/omf_ec/experiment_property_spec.rb

@@ -9,6 +9,14 @@ require 'omf_ec/dsl'
 include OmfEc::DSL
 
 describe OmfEc::ExperimentProperty do
+  before do
+    OmfEc::ExperimentProperty.reset
+  end
+
+  after do
+    OmfEc::ExperimentProperty.reset
+  end
+
   describe "when a new ExperimentProperty is created" do
     it "must raise an error if it is given an invalid name" do
       created_properties = 0
@@ -54,8 +62,6 @@ 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
@@ -70,8 +76,6 @@ 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')
 

data/test/test_helper.rb

@@ -33,11 +33,13 @@ end
 class OmfEc::Experiment
   def self.reset
     Singleton.__init__(self)
+    self
   end
 end
 
 class OmfEc::ExperimentProperty
   def self.reset
-    Singleton.__init__(self)
+    @@properties = Hashie::Mash.new
+    @@creation_observers = []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.2.pre.4
+  version: 6.1.2.pre.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.4
+        version: 6.1.2.pre.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2.pre.4
+        version: 6.1.2.pre.5
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement