omf_ec 6.1.3.pre.2 → 6.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmJjNThkMjY5ODMzYzA3YWViYjY5YzY4ODIwYTlmOTIyOWRmYTUwNg==
+  data.tar.gz: !binary |-
+    ZmU4MGQxMTA2MDBmNjgyNTgwZjhhOGIzYjVkODlmODg2ZjM5MWFmYQ==
+SHA512:
+  metadata.gz: !binary |-
+    N2Y4MjFhNGM4MDA5YjQ3MGY4ZWExNWIwMjI5Mzg1Y2U3YjExMGNhN2RjOGI1
+    Y2Y4NDgyNDdmMTVmZDE1ZTMxMWI5OWVkYjM0OWY5ZmQyZTQ2NzY4YTMyZTA5
+    N2ExY2RiYWVlMGNkZWIwMjFmMjVmNmRhMGViMGQyMzQ2MDJjMzQ=
+  data.tar.gz: !binary |-
+    ODA1NTUyMGJhNWY0NGMwYjBkODZiYTRhMmNhMDBmMDUyMjFjYWJlYTJjYWM4
+    ZmQxNzgyNWE0OGI4NDQ1MDdmMzJlNzQzZjNkNjczYzgwZWMyZGRiZmJhNmYy
+    M2U1YjUxMzRiNTgyZjkwNmEzZTU5ZjBmODJiZmUzZWYwYjFlOGY=

data/Gemfile

@@ -3,8 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in omf_ec.gemspec
 gemspec
 
-gem 'omf_common', path: "../omf_common"
-
 group :test do
   gem 'rake'
 end

data/lib/omf_ec/runner.rb

@@ -25,24 +25,6 @@ module OmfEc
       @config_opts = Mash.new(
         environment: 'development',
         communication: { url: "amqp://localhost" },
-        logging: {
-          level: { default: 'debug' },
-          appenders: {
-            stdout: {
-              level: :info,
-              date_pattern: '%H:%M:%S',
-              pattern: '%d %5l %c{2}: %m\n'
-            },
-            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
-              date_pattern: '%F %T %z',
-              pattern: '[%d] %-5l %c: %m\n'
-            }
-          }
-        }
       )
 
       @cmd_opts = Mash.new
@@ -93,7 +75,6 @@ module OmfEc
 
           op.on("--name", "--experiment EXPERIMENT_NAME", "Experiment name") do |e_name|
             @cmd_opts[:experiment_name] = e_name
-            OmfEc.experiment.name = e_name
             remove_cmd_opts_from_argv("--name", "--experiment", e_name)
           end
 
@@ -132,7 +113,7 @@ module OmfEc
             exit
           end
 
-          op.on("-d", "--debug", "Debug mode (Set logging level in Stdout to :debug)") do
+          op.on("-d", "--debug", "Debug mode (printing debug logging messages)") do
             @cmd_opts[:debug] = true
             remove_cmd_opts_from_argv("-d", "--debug")
           end
@@ -158,25 +139,13 @@ module OmfEc
       uri = @cmd_opts.delete(:uri)
       @config_opts[:communication][:url] = uri if uri
       @config_opts[:communication][:auth] = { authenticate: true } if @cmd_opts[:cert]
-
-
       @config_opts.merge!(@cmd_opts)
-
-      if @config_opts[:oml_uri]
-        # Only change default if they are not set in config file
-        @config_opts[:logging][:appenders][:oml4r] ||= {
-          level: :info,
-          appName: 'omf_ec',
-          domain: OmfEc.experiment.id,
-          collect: @config_opts[:oml_uri]
-        }
-      end
     end
 
     def parse_config_file
       if (config_file = @cmd_opts.delete(:config_file))
         if File.exist?(config_file)
-          @config_opts.merge!(OmfCommon.load_yaml(config_file, erb_process: true))
+          @config_opts.merge!(OmfCommon.load_yaml(config_file))
         else
           puts "Config file '#{config_file}' doesn't exist"
           exit(1)
@@ -189,6 +158,7 @@ module OmfEc
     end
 
     def setup_experiment
+      OmfEc.experiment.name = @config_opts[:experiment_name] if @config_opts[:experiment_name]
       OmfEc.experiment.oml_uri = @config_opts[:oml_uri] if @config_opts[:oml_uri]
       OmfEc.experiment.show_graph = @config_opts['show-graph']
 
@@ -249,11 +219,14 @@ module OmfEc
 
       if @config_opts[:debug]
         Logging.logger.root.level = 'debug'
-        stdout_appender = Logging.logger.root.appenders.find { |a| a.class == Logging::Appenders::Stdout }
-        stdout_appender.level = 'debug' if stdout_appender
       else
         Logging.consolidate 'OmfCommon', 'OmfRc'
       end
+
+      if OmfEc.experiment.oml_uri
+        require 'oml4r/logging/oml4r_appender'
+        Logging.logger.root.add_appenders(Logging.appenders.oml4r('oml4r', :appName => 'omf_ec', :domain => "#{OmfEc.experiment.id}", :collect => "#{OmfEc.experiment.oml_uri}"))
+      end
     end
 
     def load_experiment
@@ -307,6 +280,7 @@ module OmfEc
     def init
       oml_init
       setup_experiment
+      #load_experiment
     end
 
     def run

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.3.pre.2
-  prerelease: 6
+  version: 6.1.3
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: evented-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.pre.2
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.pre.2
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,9 +121,6 @@ files:
 - Gemfile
 - Rakefile
 - bin/omf_ec
-- example/config/default.yml
-- example/config/logging_to_oml.yml
-- example/config/with_custom_logging.yml
 - example/engine_oedl.rb
 - example/engine_test.rb
 - example/test_exp/test00.rb
@@ -183,26 +165,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.1.10
 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

data/example/config/default.yml

@@ -1,6 +0,0 @@
-communication:
-  # Connect to AMQP server at localhost
-  url: amqp://localhost
-
-# Use OML server located at localhost port 3003
-oml_uri: tcp:localhost:3003

data/example/config/logging_to_oml.yml

@@ -1,36 +0,0 @@
-communication:
-  url: amqp://localhost
-
-# This setup will silent STDOUT,
-# send info messages to OML SERVER,
-# and everything to ROLLING LOG FILES
-#
-# In this example, these setting are identical to EC default
-logging:
-  level:
-    default: debug
-  appenders:
-    # Turn off STDOUT
-    stdout:
-      level: :info
-    # 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
-      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
-    #   appName: 'omf_ec'
-    #   domain: '<%= OmfEc.experiment.id %>'
-    #   collect: tcp:some_other_oml_server:3003
-
-# Use OML server located at localhost port 3003
-oml_uri: tcp:localhost:3003

data/example/config/with_custom_logging.yml

@@ -1,30 +0,0 @@
-communication:
-  url: amqp://localhost
-
-# By providing logging section, you can modify log message location and layout
-#
-# In this example, these setting are identical to EC default
-logging:
-  level:
-    default: debug
-  appenders:
-    # To STDOUT
-    stdout:
-      level: info
-      date_pattern: "%H:%M:%S"
-      pattern: "%d %5l %c{2}: %m\n"
-      # To turn colour on use 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
-      date_pattern: "%F %T %z"
-      pattern: "[%d] %-5l %c: %m\n"
-
-# Use OML server located at localhost port 3003
-oml_uri: tcp:localhost:3003