optimus-ep 0.10.3 → 0.10.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9c5410cc89e909a9dd6b0cb2bdea464d4857de53
+  data.tar.gz: 42c34c6d72a81c67bfe9fa8cb66543e9131bb21a
+SHA512:
+  metadata.gz: 1d25abe2d6a0fdcb90ffb143c5634dd220abc0b977dfd515228237f127d0c9e59b8376e5349052bbd66927b4e33db2be224de454158caeb573d6a28b82f1c279
+  data.tar.gz: c546b812bce35c5ad96bca18c0db1803582b69228327279b993a312b7f5c1c723c75ae2d6cc14e252793f2d8dd096fe1c799eff8eadce69b4b871b2e9d86d746

data/.gitignore

@@ -0,0 +1,18 @@
+.DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGELOG

@@ -1,3 +1,5 @@
+v 0.10.4. Fix for unicode handling under Ruby 2.x.
+
 v 0.10.3. Oh god oh god I left logging information in now it is gone again.
 
 v 0.10.2. Generated counter columns no longer clobber columns with data you want. "Session" is the most common example.

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in optimus-ep.gemspec
+gemspec

data/lib/optimus_reader.rb

@@ -60,18 +60,19 @@ module Optimus
       converted_f = nil
       file.rewind
       datas = file.read(2)
-      if datas == "\377\376"
+      if datas.respond_to? :encode and
+          datas == "\xff\xfe".force_encoding("ASCII-8BIT")
+        # Ruby 1.9.x -- iconv is deprecated here
         file_data = file.read
-        if file_data.respond_to? :encode
-          # Ruby 1.9.x -- iconv is deprecated here
-          converted_f = StringIO.new(
-            file_data.encode("UTF-8", "UTF-16LE"))
-        else
-          # Ruby 1.8.x -- no String#encode()
-          require 'iconv'
-          converted_f = StringIO.new(
-            Iconv.conv("UTF-8", "UTF-16LE", file_data))
-        end
+        converted_f = StringIO.new(
+          file_data.encode("UTF-8", "UTF-16LE"))
+      elsif not datas.respond_to? :encode and
+          datas == "\xff\xfe"
+        # Ruby 1.8.x -- no String#encode()
+        file_data = file.read
+        require 'iconv'
+        converted_f = StringIO.new(
+          Iconv.conv("UTF-8", "UTF-16LE", file_data))
       else
         converted_f = file
         converted_f.rewind
@@ -91,6 +92,9 @@ module Optimus
       2.times do
         first_lines << @file.gets
       end
+      unless first_lines[1]
+        first_lines = first_lines[0].gsub(/\r\n?/, '\n').split('\n')[0..1]
+      end
       @file.pos = original_pos
       @type = determine_file_type(first_lines)
       if @type.nil?
@@ -115,4 +119,4 @@ module Optimus
       }
     end
   end
-end
+end

data/lib/tabfile_parser.rb

@@ -24,15 +24,28 @@ module Optimus
         @file = file
         @skip_lines = options[:skip_lines] || 0
         @columns = options[:columns]
+        @merge_header_lines = options[:merge_header_lines] || 1
       end
       
       def to_optimus
-        lines = @file.readlines
+        lines = @file.read
+        lines.gsub!(/\r\n?/,"\n")
+        lines = lines.split("\n")
+        
+        raise DamagedFileError.new("File #{@file.path} appears to be empty.") if lines.nil?
+        
         @skip_lines.times do
           lines.shift
         end
         
-        file_columns = lines.shift.split("\t").map {|elt| elt.strip }
+        headers = []
+
+        @merge_header_lines.times do
+          l = lines.shift
+          headers << l.split("\t",-1).map {|elt| elt.strip }
+        end
+        file_columns = headers[0].zip(*headers[1..-1]).map{|labels| labels.join(' ')}
+
         expected_size = file_columns.size
         columns = file_columns
         data = Optimus::Data.new(columns)
@@ -40,7 +53,7 @@ module Optimus
         lines.each do |line|
           current_line += 1
           row = data.add_row
-          col_data = line.split("\t").map {|e| e.strip }
+          col_data = line.split("\t",-1).map {|e| e.strip }
           if col_data.size != expected_size
             raise DamagedFileError.new("In #{@file.path}, line #{current_line} should have #{expected_size} columns but had #{col_data.size}.")
           end

data/lib/version.rb

@@ -1,8 +1,3 @@
 module Optimus
-  module VERSION
-    MAJOR = 0
-    MINOR = 10
-    TINY  = 3
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end
+  VERSION = "0.10.4"
+end

data/optimus-ep.gemspec

@@ -1,36 +1,23 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'version'
 
-Gem::Specification.new do |s|
-  s.name = "optimus-ep"
-  s.version = "0.10.3"
+Gem::Specification.new do |gem|
+  gem.name          = "optimus-ep"
+  gem.version       = Optimus::VERSION
+  gem.authors       = ["Nate Vack"]
+  gem.email         = ["njvack@wisc.edu"]
+  gem.description   = %q{Utilities to process behavioral data generated by E-Prime}
+  gem.summary       = %q{Utilities to process behavioral data generated by E-Prime}
+  gem.homepage      = "http://github.com/njvack/optimus-ep"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nate Vack"]
-  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"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "README.textile", "bin/eprime2tabfile", "bin/extract_timings", "lib/eprimetab_parser.rb", "lib/excel_parser.rb", "lib/expression_parser/evaluators.rb", "lib/expression_parser/expressions.rb", "lib/log_file_parser.rb", "lib/optimus.rb", "lib/optimus_data.rb", "lib/optimus_reader.rb", "lib/parsed_calculator.rb", "lib/raw_tab_parser.rb", "lib/runners/generic_runner.rb", "lib/runners/yaml_template/option_parser.rb", "lib/runners/yaml_template/runner.rb", "lib/tabfile_parser.rb", "lib/tabfile_writer.rb", "lib/transformers/basic_transformer.rb", "lib/transformers/column_calculator.rb", "lib/transformers/multipasser.rb", "lib/transformers/row_filter.rb", "lib/transformers/timing_extractor.rb", "lib/version.rb", "lib/writers/stimtimes_writer.rb"]
-  s.files = ["CHANGELOG", "GPL.txt", "LICENSE", "Manifest", "README", "README.textile", "Rakefile", "autotest/discover.rb", "bin/eprime2tabfile", "bin/extract_timings", "lib/eprimetab_parser.rb", "lib/excel_parser.rb", "lib/expression_parser/evaluators.rb", "lib/expression_parser/expressions.rb", "lib/log_file_parser.rb", "lib/optimus.rb", "lib/optimus_data.rb", "lib/optimus_reader.rb", "lib/parsed_calculator.rb", "lib/raw_tab_parser.rb", "lib/runners/generic_runner.rb", "lib/runners/yaml_template/option_parser.rb", "lib/runners/yaml_template/runner.rb", "lib/tabfile_parser.rb", "lib/tabfile_writer.rb", "lib/transformers/basic_transformer.rb", "lib/transformers/column_calculator.rb", "lib/transformers/multipasser.rb", "lib/transformers/row_filter.rb", "lib/transformers/timing_extractor.rb", "lib/version.rb", "lib/writers/stimtimes_writer.rb", "spec/eprimetab_parser_spec.rb", "spec/excel_parser_spec.rb", "spec/expression_parser/evaluators_spec.rb", "spec/expression_parser/expressions_spec.rb", "spec/log_file_parser_spec.rb", "spec/optimus_data_spec.rb", "spec/optimus_reader_spec.rb", "spec/parsed_calculator_spec.rb", "spec/raw_tab_parser_spec.rb", "spec/runners/generic_runner_spec.rb", "spec/runners/yaml_template/option_parser_spec.rb", "spec/runners/yaml_template/runner_spec.rb", "spec/samples/bad_excel_tsv.txt", "spec/samples/corrupt_log_file.txt", "spec/samples/eprime_tsv.txt", "spec/samples/excel_tsv.txt", "spec/samples/optimus_log.txt", "spec/samples/optimus_log_utf16le.txt", "spec/samples/raw_tsv.txt", "spec/samples/short_columns.txt", "spec/samples/sorted_columns.txt", "spec/samples/std_columns.txt", "spec/samples/unknown_type.txt", "spec/samples/unreadable_file", "spec/spec_helper.rb", "spec/tabfile_parser_spec.rb", "spec/tabfile_writer_spec.rb", "spec/transformers/basic_transformer_spec.rb", "spec/transformers/column_calculator_spec.rb", "spec/transformers/multipasser_spec.rb", "spec/transformers/row_filter_spec.rb", "spec/transformers/timing_extractor_spec.rb", "spec/writers/stimtimes_writer_spec.rb", "optimus-ep.gemspec"]
-  s.homepage = "http://github.com/njvack/optimus-ep"
-  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.23"
-  s.summary = "Utilities to process behavioral data generated by E-Prime"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rparsec-ruby19>, [">= 1.0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rparsec-ruby19>, [">= 1.0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rparsec-ruby19>, [">= 1.0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  
+  gem.add_runtime_dependency "rparsec-ruby19", ">=1.0"
+  gem.add_development_dependency "rspec"
+  
 end

data/spec/samples/.gitattributes

@@ -0,0 +1 @@
+* -text

metadata

@@ -1,92 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: optimus-ep
 version: !ruby/object:Gem::Version
-  version: 0.10.3
-  prerelease: 
+  version: 0.10.4
 platform: ruby
 authors:
 - Nate Vack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rparsec-ruby19
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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
+email:
+- njvack@wisc.edu
 executables:
 - eprime2tabfile
 - extract_timings
 extensions: []
-extra_rdoc_files:
-- CHANGELOG
-- LICENSE
-- README
-- README.textile
-- bin/eprime2tabfile
-- bin/extract_timings
-- lib/eprimetab_parser.rb
-- lib/excel_parser.rb
-- lib/expression_parser/evaluators.rb
-- lib/expression_parser/expressions.rb
-- lib/log_file_parser.rb
-- lib/optimus.rb
-- lib/optimus_data.rb
-- lib/optimus_reader.rb
-- lib/parsed_calculator.rb
-- lib/raw_tab_parser.rb
-- lib/runners/generic_runner.rb
-- lib/runners/yaml_template/option_parser.rb
-- lib/runners/yaml_template/runner.rb
-- lib/tabfile_parser.rb
-- lib/tabfile_writer.rb
-- lib/transformers/basic_transformer.rb
-- lib/transformers/column_calculator.rb
-- lib/transformers/multipasser.rb
-- lib/transformers/row_filter.rb
-- lib/transformers/timing_extractor.rb
-- lib/version.rb
-- lib/writers/stimtimes_writer.rb
+extra_rdoc_files: []
 files:
+- ".gitignore"
 - CHANGELOG
 - GPL.txt
+- Gemfile
 - LICENSE
 - Manifest
 - README
 - README.textile
 - Rakefile
-- autotest/discover.rb
 - bin/eprime2tabfile
 - bin/extract_timings
 - lib/eprimetab_parser.rb
@@ -111,6 +80,7 @@ files:
 - lib/transformers/timing_extractor.rb
 - lib/version.rb
 - lib/writers/stimtimes_writer.rb
+- optimus-ep.gemspec
 - spec/eprimetab_parser_spec.rb
 - spec/excel_parser_spec.rb
 - spec/expression_parser/evaluators_spec.rb
@@ -123,6 +93,7 @@ files:
 - spec/runners/generic_runner_spec.rb
 - spec/runners/yaml_template/option_parser_spec.rb
 - spec/runners/yaml_template/runner_spec.rb
+- spec/samples/.gitattributes
 - spec/samples/bad_excel_tsv.txt
 - spec/samples/corrupt_log_file.txt
 - spec/samples/eprime_tsv.txt
@@ -144,35 +115,61 @@ files:
 - spec/transformers/row_filter_spec.rb
 - spec/transformers/timing_extractor_spec.rb
 - spec/writers/stimtimes_writer_spec.rb
-- optimus-ep.gemspec
 homepage: http://github.com/njvack/optimus-ep
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Optimus-ep
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements: []
-rubyforge_project: optimus-ep
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Utilities to process behavioral data generated by E-Prime
-test_files: []
+test_files:
+- spec/eprimetab_parser_spec.rb
+- spec/excel_parser_spec.rb
+- spec/expression_parser/evaluators_spec.rb
+- spec/expression_parser/expressions_spec.rb
+- spec/log_file_parser_spec.rb
+- spec/optimus_data_spec.rb
+- spec/optimus_reader_spec.rb
+- spec/parsed_calculator_spec.rb
+- spec/raw_tab_parser_spec.rb
+- spec/runners/generic_runner_spec.rb
+- spec/runners/yaml_template/option_parser_spec.rb
+- spec/runners/yaml_template/runner_spec.rb
+- spec/samples/.gitattributes
+- spec/samples/bad_excel_tsv.txt
+- spec/samples/corrupt_log_file.txt
+- spec/samples/eprime_tsv.txt
+- spec/samples/excel_tsv.txt
+- spec/samples/optimus_log.txt
+- spec/samples/optimus_log_utf16le.txt
+- spec/samples/raw_tsv.txt
+- spec/samples/short_columns.txt
+- spec/samples/sorted_columns.txt
+- spec/samples/std_columns.txt
+- spec/samples/unknown_type.txt
+- spec/samples/unreadable_file
+- spec/spec_helper.rb
+- spec/tabfile_parser_spec.rb
+- spec/tabfile_writer_spec.rb
+- spec/transformers/basic_transformer_spec.rb
+- spec/transformers/column_calculator_spec.rb
+- spec/transformers/multipasser_spec.rb
+- spec/transformers/row_filter_spec.rb
+- spec/transformers/timing_extractor_spec.rb
+- spec/writers/stimtimes_writer_spec.rb

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }