oml4r 2.8.pre1 → 2.8.0

data/lib/oml4r/oml4r-simple-example.rb

@@ -49,7 +49,7 @@ end
 
 # Initialise the OML4R module for your application
 opts = {:appName => 'oml4rSimpleExample',
-  :expID => 'foo', :nodeId => 'n1',
+  :expID => 'foo', :nodeID => 'n1',
   :omlServer => 'file:-'} # Server could also be tcp:host:port
 #  OML4R::create_channel(:default, 'file:-')    
 

data/lib/oml4r.rb

@@ -39,7 +39,7 @@ require 'thread'
 #
 module OML4R
 
-  VERSION = "2.8.pre1"
+  VERSION = "2.8.0"
   REVISION = "$Revision: 1 $".split(":")[1].chomp("$").strip
   VERSION_STRING = "OML4R Client Library - Version #{VERSION} (#{REVISION})"
   DEF_SERVER_PORT = 3003
@@ -137,6 +137,7 @@ module OML4R
 	index = ca[1]
 	channel.send "#{t}\t#{index}\t#{msg}"
       end
+      args
     end
 
     def self.start_time()
@@ -163,6 +164,15 @@ module OML4R
 
     end
 
+    def self.__unfreeze__()
+      self.each_mp do |klass, defs|
+	defs[:seq_no] = 0
+      end
+      @@channels = {}
+      @@start_time = nil
+      @@frozen = false
+    end
+
     # Build the table schema for this MP and send it to the OML collection server
     # - name_prefix = the name for this MP to use as a prefix for its table
     def self.__print_meta__(name_prefix = nil)
@@ -253,13 +263,12 @@ module OML4R
     rest = op.parse(argv)
     return if noop
 
-
-    Channel.create(:default, omlCollectUri) if omlCollectUri
-
     unless domain && nodeID && appName
       raise 'OML4R: Missing values for parameters :expID (--oml-exp-id), :nodeID (--oml-id), or :appName (in code)!'
     end
 
+    Channel.create(:default, omlCollectUri) if omlCollectUri
+
     # Handle the defined Measurement Points
     startTime = Time.now
     Channel.init_all(domain, nodeID, appName, startTime)
@@ -269,13 +278,6 @@ module OML4R
     rest || []
   end
 
-  #
-  # Create a new channel over which to send measurement channels.
-  #
-  def self.create_channel(name, url)
-    Channel.create(name.to_s, url)
-  end
-
   #
   # Close the OML collection. This will block until all outstanding data have been sent out.
   # 
@@ -358,6 +360,8 @@ module OML4R
 
     def self.close_all()
       @@channels.values.each { |c| c.close }
+      @@channels = {}
+      MPBase.__unfreeze__()
     end
 
     attr_reader :url
@@ -431,6 +435,7 @@ module OML4R
 	    @out.flush
 	  end
 	  @out.close
+	  @out = nil
 	rescue Exception => ex
 	  msg = "Exception while sending message to channel '#{@url}' (#{ex})"
 	  Object.const_defined?(:MObject) ? MObject.warn(:oml4r, msg) : $stderr.puts("OML4R: #{msg}")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.8.pre1
-  prerelease: 4
+  version: 2.8.0
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies: []
 description: ! '["Simple OML client library for Ruby"]'
 email:
@@ -42,9 +42,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23