lib/runners/generic_runner.rb in optimus-ep-0.6.91 vs lib/runners/generic_runner.rb in optimus-ep-0.8.0

@@ -1,27 +1,27 @@
 # Part of the Optimus package for managing E-Prime data
 # 
-# Copyright (C) 2008 Board of Regents of the University of Wisconsin System
+# Copyright (C) 2008-09 Board of Regents of the University of Wisconsin System
 # 
 # Written by Nathan Vack <[e-mail]>, at the Waisman Laborotory for Brain
 # Imaging and Behavior, University of Wisconsin - Madison
 
 #
 # This class should handle argument processing, file I/O, and such.
 
 
-require 'eprime'
-require 'eprime_reader'
+require 'optimus'
+require 'optimus_reader'
 require 'tabfile_writer'
 require 'transformers/timing_extractor'
 require 'optparse'
 require 'ostruct'
 
-module Eprime
+module Optimus
   module Runners
     class GenericRunner
-      include ::Eprime::Transformers
+      include ::Optimus::Transformers
       
       attr_accessor :out, :err
       def initialize(extractor_class, *args)
         @extractor_class = extractor_class
         # caller() returns an array of 'filename:line' -- the last element
@@ -41,13 +41,13 @@
         extract_timings
         write_timings
       end
       
       def read_data
-        data = Eprime::Data.new()
+        data = Optimus::Data.new()
         @options.input_files.each do |infile|
           File.open(infile) do |f|
-            data.merge!(Eprime::Reader.new(f).eprime_data)
+            data.merge!(Optimus::Reader.new(f).optimus_data)
           end
         end
         @data = data
       end
       
\ No newline at end of file