oml4r 2.9.0.1 → 2.9.0.2

data/lib/oml4r.rb

@@ -40,7 +40,7 @@ require 'optparse'
 #
 module OML4R
 
-  VERSION = "2.9.0.1"
+  VERSION = "2.9.0.2"
   VERSION_STRING = "OML4R Client V#{VERSION}"
   COPYRIGHT = "Copyright 2009-2012, NICTA"
   DEF_SERVER_PORT = 3003
@@ -246,7 +246,7 @@ module OML4R
     end
     omlCollectUri = ENV['OML_COLLECT'] || ENV['OML_SERVER'] || opts[:collect] || opts[:omlServer]
     noop = opts[:noop] || false
-
+    omlConfigFile = nil
 
     # Create a new Parser for the command line
     op = OptionParser.new
@@ -258,6 +258,7 @@ module OML4R
     op.on("--oml-collect uri", "URI of server to send measurements to") { |u|  omlCollectUri = u }
     op.on("--oml-log-level l", "Log level used (info: 0 .. debug: 1)") { |l| OML4R.loglevel = l.to_i }
     op.on("--oml-noop", "Do not collect measurements") { noop = true }
+    op.on("--oml-config file", "File holding OML configuration parameters") { |f| omlConfigFile = f }
     op.on("--oml-exp-id domain", "Obsolescent equivalent to --oml-domain domain") { |name|
       domain = name
       $stderr.puts "WARN	Option --oml-exp-id is getting deprecated; please use '--oml-domain #{domain}' instead"
@@ -282,6 +283,20 @@ module OML4R
     rest = op.parse(argv)
     return if noop
 
+    # Parameters in OML config file takes precedence
+    unless omlConfigFile.nil? 
+      f = File.open(omlConfigFile, 'r')
+      f.each_line do |l|
+        d = l[/.*experiment='([^']*)/,1]
+        domain = d if d
+        i = l[/.*id='([^']*)/,1]
+        nodeID = i if i
+        u = l[/.*url='([^']*)/,1]
+        omlCollectUri = u if u
+        end
+      f.close
+    end
+
     unless domain && nodeID && appName
       raise 'OML4R: Missing values for parameters :domain (--oml-domain), :nodeID (--oml-id), or :appName (in code)!'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.9.0.1
+  version: 2.9.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies: []
 description: ! '["Simple OML client library for Ruby"]'
 email: