optimus-ep 0.10.1 → 0.10.2
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +2 -0
- data/lib/log_file_parser.rb +5 -3
- data/lib/version.rb +1 -1
- data/optimus-ep.gemspec +3 -3
- data/spec/samples/optimus_log.txt +0 -1
- metadata +17 -7
data/CHANGELOG
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
v 0.10.2. Generated counter columns no longer clobber columns with data you want. "Session" is the most common example.
|
2
|
+
|
1
3
|
v.0.10.0. Actually make things like counter columns work again. Sorry, anyone who downloaded 0.9.x.
|
2
4
|
|
3
5
|
v0.9.1. Change dependency from rparsec to rparsec-ruby19
|
data/lib/log_file_parser.rb
CHANGED
@@ -30,7 +30,6 @@ module Optimus
|
|
30
30
|
# (and their order)
|
31
31
|
# :force => true, if you want to ignore things such as column added
|
32
32
|
# warnings and if the file is incomplete
|
33
|
-
|
34
33
|
def initialize(file, options = {})
|
35
34
|
@columns = options[:columns]
|
36
35
|
@force = options[:force]
|
@@ -57,11 +56,12 @@ module Optimus
|
|
57
56
|
|
58
57
|
@columns ||= @found_cols.names
|
59
58
|
data = Optimus::Data.new(@columns)
|
60
|
-
self.leaf_frames.
|
59
|
+
self.leaf_frames.each_with_index do |frame, i|
|
61
60
|
row = data.add_row
|
62
61
|
@found_cols.names_with_cols.each do |pair|
|
63
62
|
name, col = *pair
|
64
63
|
val = frame.get(col)
|
64
|
+
$stderr.puts("Frame #{i}: setting #{name} to #{val}")
|
65
65
|
row[name] = val
|
66
66
|
end
|
67
67
|
end
|
@@ -154,7 +154,7 @@ module Optimus
|
|
154
154
|
counts[frame.level] += 1
|
155
155
|
key = @levels[frame.level]
|
156
156
|
@found_cols.store(Column.new(key, frame.level))
|
157
|
-
frame[key]
|
157
|
+
frame[key] ||= counts[frame.level]
|
158
158
|
counts.fill(0, (frame.level+1)..@levels.length)
|
159
159
|
end
|
160
160
|
end
|
@@ -175,6 +175,7 @@ module Optimus
|
|
175
175
|
attr_accessor :level
|
176
176
|
attr_accessor :parent
|
177
177
|
attr_accessor :children
|
178
|
+
|
178
179
|
def initialize(parser)
|
179
180
|
@level = nil
|
180
181
|
@parent = nil
|
@@ -204,6 +205,7 @@ module Optimus
|
|
204
205
|
end
|
205
206
|
|
206
207
|
def []=(key, val)
|
208
|
+
$stderr.puts("Setting #{key} to #{val}")
|
207
209
|
@data[Column.new(key, @level).to_s] = val
|
208
210
|
end
|
209
211
|
|
data/lib/version.rb
CHANGED
data/optimus-ep.gemspec
CHANGED
@@ -2,11 +2,11 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = "optimus-ep"
|
5
|
-
s.version = "0.10.
|
5
|
+
s.version = "0.10.2"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["Nate Vack"]
|
9
|
-
s.date = "
|
9
|
+
s.date = "2013-10-25"
|
10
10
|
s.description = "Utilities to process behavioral data generated by E-Prime"
|
11
11
|
s.email = "njvack@wisc.edu"
|
12
12
|
s.executables = ["eprime2tabfile", "extract_timings"]
|
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
|
|
16
16
|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Optimus-ep", "--main", "README"]
|
17
17
|
s.require_paths = ["lib"]
|
18
18
|
s.rubyforge_project = "optimus-ep"
|
19
|
-
s.rubygems_version = "1.8.
|
19
|
+
s.rubygems_version = "1.8.23"
|
20
20
|
s.summary = "Utilities to process behavioral data generated by E-Prime"
|
21
21
|
|
22
22
|
if s.respond_to? :specification_version then
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: optimus-ep
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2013-10-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rparsec-ruby19
|
16
|
-
requirement:
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,15 @@ dependencies:
|
|
21
21
|
version: '1.0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements:
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
26
|
+
requirements:
|
27
|
+
- - ! '>='
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '1.0'
|
25
30
|
- !ruby/object:Gem::Dependency
|
26
31
|
name: rspec
|
27
|
-
requirement:
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
28
33
|
none: false
|
29
34
|
requirements:
|
30
35
|
- - ! '>='
|
@@ -32,7 +37,12 @@ dependencies:
|
|
32
37
|
version: '0'
|
33
38
|
type: :development
|
34
39
|
prerelease: false
|
35
|
-
version_requirements:
|
40
|
+
version_requirements: !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
42
|
+
requirements:
|
43
|
+
- - ! '>='
|
44
|
+
- !ruby/object:Gem::Version
|
45
|
+
version: '0'
|
36
46
|
description: Utilities to process behavioral data generated by E-Prime
|
37
47
|
email: njvack@wisc.edu
|
38
48
|
executables:
|
@@ -161,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
161
171
|
version: '1.2'
|
162
172
|
requirements: []
|
163
173
|
rubyforge_project: optimus-ep
|
164
|
-
rubygems_version: 1.8.
|
174
|
+
rubygems_version: 1.8.23
|
165
175
|
signing_key:
|
166
176
|
specification_version: 3
|
167
177
|
summary: Utilities to process behavioral data generated by E-Prime
|