tracksperanto 1.7.0 → 1.7.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.7.1 / 2010-01-24
+
+* Fix Ruby 1.9 compatibility
+
 === 1.7.0 / 2010-01-24
 
 * Fix edge cases of specific comp sizes outputting incorrect exports for Equalizer 3 and MatchMover

data/bin/tracksperanto

@@ -62,6 +62,8 @@ parser = OptionParser.new do | p |
  p.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down") {|sx| y_shift = sx }
  p.on("--version", "Show the version and exit") {|v| 
     puts "#{Tracksperanto::VERSION} running on Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+    puts "Copyright 2008-#{Time.now.year} by Guerilla-DI (Julik Tarkhanov and contributors)"
+    puts "For questions and support contact info at guerilla-di.org"
     exit(0)
  }
 end
@@ -75,7 +77,7 @@ rescue OptionParser::MissingArgument => e
 end
 
 begin
-  reader_klass = Tracksperanto::Import.const_get(reader_name)
+  reader_klass = Tracksperanto.get_importer(reader_name)
 rescue NameError => e
   STDERR.puts "Unknown reader #{reader_name}, available readers: #{readers.join(', ')}"
   exit(-1)
@@ -109,7 +111,7 @@ pipe.progress_block = Spinner.new.method(:spin).to_proc
 
 if sole_format
   begin
-    pipe.exporters = [Tracksperanto::Export.const_get(sole_format)]
+    pipe.exporters = [Tracksperanto::Export.get_exporter(sole_format)]
   rescue NameError
     STDERR.puts "Unknown exporter #{sole_format}. Available exporters: #{writers.join(", ")}"
     exit(-1)

data/lib/import/flame_stabilizer.rb

@@ -36,13 +36,17 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
       keyframes = []
       
       while line = io.gets
-        indent ||= line.scan(/^(\s+)/)[1]
+        
+        unless indent 
+          indent = line.scan(/^(\s+)/)[1]
+          end_mark = "#{indent}End"
+        end
         
         if line =~ keyframe_count_matcher
           $1.to_i.times { push(extract_key_from(io)) }
         elsif line =~ base_value_matcher && empty?
           self.base_value = $1
-        elsif line.strip == "#{indent}End"
+        elsif line.strip == end_mark
           break
         end
       end
@@ -60,13 +64,17 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
         if line =~ frame_matcher
           frame = $1.to_i
         elsif line =~ value_matcher
-          value = $1.to_f
-          return [frame,value]
+          return [frame, $1.to_f]
         end
       end
       
       raise "Did not detect any keyframes!"
     end
+    
+    # Hack - prevents the channel to be flattened into keyframes
+    # when it gets Array#flatten'ed
+    def to_ary; end  
+    private :to_ary
   end
   
   def parse(io)

data/lib/import/match_mover.rb

@@ -36,7 +36,7 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
   end
   
   def extract_track(start_line, io)
-    tracker_name = start_line.scan(/\"([^\"]+)\"/).to_s
+    tracker_name = start_line.scan(/\"([^\"]+)\"/).flatten[0]
     t = Tracksperanto::Tracker.new(:name => tracker_name)
     while(line = io.gets) do
       return t if line =~ /\}/

data/lib/import/shake_grammar/catcher.rb

@@ -35,8 +35,9 @@ module Tracksperanto::ShakeGrammar
     private
     
     def can_handle_meth?(m)
-      @meths ||= self.class.public_instance_methods(false)
-      @meths.include?(m)
+      # Ruby 1.9 - match on stringified methname
+      @meths ||= self.class.public_instance_methods(false).map{|mn| mn.to_s }
+      @meths.include?(m.to_s)
     end
     
     def exec_funcall(methname, args)

data/lib/pipeline/base.rb

@@ -111,7 +111,7 @@ class Tracksperanto::Pipeline::Base
       t.each_with_index do | kf, idx |
         keyframes += 1
         processor.export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual)
-        yield(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.length}") if block_given?
+        yield(percent_complete += kf_weight, "Writing keyframe #{idx+1} of #{t.name.inspect}") if block_given?
       end
       processor.end_tracker_segment
     end

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
   
   module Import; end
   module Export; end
@@ -39,6 +39,25 @@ module Tracksperanto
   
   self.exporters, self.importers, self.middlewares = [], [], []
   
+  # Case-insensitive search for an export module by name
+  def self.get_exporter(name)
+    exporters.each do | x |
+      normalized_name = x.to_s.split("::")[-1].downcase
+      return x if normalized_name == name.downcase
+    end
+    
+    raise NameError, "Unknown exporter #{name}"
+  end
+  
+  # Case-insensitive search for an export module by name
+  def self.get_importer(name)
+    importers.each do | x |
+      normalized_name = x.to_s.split("::")[-1].downcase
+      return x if normalized_name == name.downcase
+    end
+    
+    raise NameError, "Unknown importer #{name}"
+  end
 end
 
 %w(

data/test/export/test_equalizer_export.rb

@@ -1,10 +1,12 @@
 require File.dirname(__FILE__) + '/../helper'
 
-class EqualizerExportTestTest < Test::Unit::TestCase
+class Equalizer4ExportTest < Test::Unit::TestCase
   include ParabolicTracks
   P = File.dirname(__FILE__) + "/samples/ref_equalizer.txt"
   
   def test_export_output_written
+    # This test might be failing due to different float rounding between platforms
+    # (currently fails on win ruby and jruby)
     ensure_same_output Tracksperanto::Export::Equalizer4, P
   end
   

data/test/test_tracksperanto.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TracksperantoTest < Test::Unit::TestCase
+  def test_middlewares
+    m = Tracksperanto.middlewares
+    m.each do | middleware_module |
+      assert_kind_of Module, middleware_module
+    end
+  end
+
+  def test_exporters
+    m = Tracksperanto.exporters
+    m.each do | x |
+      assert_kind_of Class, x
+    end
+  end
+  
+  def test_importers
+    m = Tracksperanto.importers
+    m.each do | x |
+      assert_kind_of Class, x
+    end
+  end
+  
+  def test_middleware_names
+    m = Tracksperanto.middleware_names
+    assert m.include?("Golden")
+  end
+  
+  def test_importer_names
+    m = Tracksperanto.importer_names
+    assert m.include?("FlameStabilizer")
+  end
+  
+  def test_exporter_names
+    m = Tracksperanto.exporter_names
+    assert m.include?("PFTrack5")
+  end
+  
+  def test_get_importer
+    i1 = Tracksperanto.get_importer("syntheyes")
+    assert_equal i1, Tracksperanto::Import::Syntheyes
+  end
+  
+  def test_get_importer_multicase
+    i1 = Tracksperanto.get_importer("ShakeScript")
+    assert_equal i1, Tracksperanto::Import::ShakeScript
+  end
+
+  def test_get_exporter
+    i1 = Tracksperanto.get_exporter("syntheyes")
+    assert_equal i1, Tracksperanto::Export::SynthEyes
+    
+    i1 = Tracksperanto.get_exporter("SynThEyes")
+    assert_equal i1, Tracksperanto::Export::SynthEyes
+  end
+  
+  def test_get_unknown_exporter_should_raise
+    assert_raise(NameError) { Tracksperanto.get_exporter("foo") }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 +01:00
+date: 2010-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -238,3 +238,4 @@ test_files:
 - test/test_keyframe.rb
 - test/test_simple_export.rb
 - test/test_tracker.rb
+- test/test_tracksperanto.rb