optimus-ep 0.10.1 → 0.10.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v 0.10.2. Generated counter columns no longer clobber columns with data you want. "Session" is the most common example.
+
 v.0.10.0. Actually make things like counter columns work again. Sorry, anyone who downloaded 0.9.x.
 
 v0.9.1. Change dependency from rparsec to rparsec-ruby19

data/lib/log_file_parser.rb

@@ -30,7 +30,6 @@ module Optimus
       #               (and their order)
       #   :force => true, if you want to ignore things such as column added
       #               warnings and if the file is incomplete
-      
       def initialize(file, options = {})
         @columns = options[:columns]
         @force = options[:force]
@@ -57,11 +56,12 @@ module Optimus
     
         @columns ||= @found_cols.names
         data = Optimus::Data.new(@columns)
-        self.leaf_frames.each do |frame|
+        self.leaf_frames.each_with_index do |frame, i|
           row = data.add_row
           @found_cols.names_with_cols.each do |pair|
             name, col = *pair
             val = frame.get(col)
+            $stderr.puts("Frame #{i}: setting #{name} to #{val}")
             row[name] = val
           end
         end
@@ -154,7 +154,7 @@ module Optimus
           counts[frame.level] += 1
           key = @levels[frame.level]
           @found_cols.store(Column.new(key, frame.level))
-          frame[key] = counts[frame.level]
+          frame[key] ||= counts[frame.level]
           counts.fill(0, (frame.level+1)..@levels.length)
         end
       end
@@ -175,6 +175,7 @@ module Optimus
         attr_accessor :level
         attr_accessor :parent
         attr_accessor :children
+
         def initialize(parser)
           @level = nil
           @parent = nil
@@ -204,6 +205,7 @@ module Optimus
         end
         
         def []=(key, val)
+          $stderr.puts("Setting #{key} to #{val}")
           @data[Column.new(key, @level).to_s] = val
         end
         

data/lib/version.rb

@@ -2,7 +2,7 @@ module Optimus
   module VERSION
     MAJOR = 0
     MINOR = 10
-    TINY  = 1
+    TINY  = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/optimus-ep.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "optimus-ep"
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Vack"]
-  s.date = "2012-04-13"
+  s.date = "2013-10-25"
   s.description = "Utilities to process behavioral data generated by E-Prime"
   s.email = "njvack@wisc.edu"
   s.executables = ["eprime2tabfile", "extract_timings"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Optimus-ep", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "optimus-ep"
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.23"
   s.summary = "Utilities to process behavioral data generated by E-Prime"
 
   if s.respond_to? :specification_version then

data/spec/samples/optimus_log.txt

@@ -83,7 +83,6 @@ Display.RefreshRate: 60.000
 	RFP.LastPulseTime: 305000
 	BlockElapsed: 300000
 	CarriedVal: BlockLevel
-	Block: 0
 	*** LogFrame End ***
 Level: 1
 *** LogFrame Start ***

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optimus-ep
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rparsec-ruby19
-  requirement: &70123679912640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123679912640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70123679911540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123679911540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utilities to process behavioral data generated by E-Prime
 email: njvack@wisc.edu
 executables:
@@ -161,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: optimus-ep
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Utilities to process behavioral data generated by E-Prime