tracksperanto 1.9.3 → 1.9.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.9.4 / 2010-04-16
+
+* Fix the boujou exporter to not crash boujou 5
+
 === 1.9.3 / 2010-04-15
 
 * Add direct export to boujou feature tracks

data/lib/export/boujou.rb

@@ -10,10 +10,12 @@ class Tracksperanto::Export::Boujou < Tracksperanto::Export::Base
   end
   
   DATETIME_FORMAT = '%a %b %d %H:%M:%S %Y'
-  PREAMBLE = "#boujou 2d tracks export: text\n# boujou version: 4.1.0 28444\n" + 
-    "#Creation date : %s\n# track_id    view      x    y"
-  
-  TEMPLATE = "%s  %d  %.3f  %.3f"
+  PREAMBLE = %[# boujou 2d tracks export: text
+# boujou version: 4.1.0 28444 
+# Creation date : %s
+# 
+# track_id      view      x      y]
+  POINT_T = "%s  %d  %.3f  %.3f"
   
   def start_export( img_width, img_height)
     @height = img_height
@@ -26,6 +28,6 @@ class Tracksperanto::Export::Boujou < Tracksperanto::Export::Base
   
   def export_point(frame, abs_float_x, abs_float_y, float_residual)
     height_inv = @height - abs_float_y
-    @io.write(TEMPLATE % [@tracker_name, frame + 1, abs_float_x, height_inv])
+    @io.puts(POINT_T % [@tracker_name, frame + 1, abs_float_x, height_inv])
   end
 end

data/lib/tracksperanto.rb

@@ -4,7 +4,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '1.9.3'
+  VERSION = '1.9.4'
   
   module Import; end
   module Export; end

data/test/export/samples/ref_boujou.txt

@@ -1,5 +1,43 @@
-#boujou 2d tracks export: text
-# boujou version: 4.1.0 28444
-#Creation date : Thu Apr 15 17:21:26 2010
-# track_id    view      x    y
-Parabolic_1_from_top_left  1  0.000  0.000Parabolic_1_from_top_left  2  96.000  205.200Parabolic_1_from_top_left  3  192.000  388.800Parabolic_1_from_top_left  4  288.000  550.800Parabolic_1_from_top_left  5  384.000  691.200Parabolic_1_from_top_left  6  480.000  810.000Parabolic_1_from_top_left  7  576.000  907.200Parabolic_1_from_top_left  8  672.000  982.800Parabolic_1_from_top_left  9  768.000  1036.800Parabolic_1_from_top_left  10  864.000  1069.200Parabolic_1_from_top_left  13  1152.000  1036.800Parabolic_1_from_top_left  14  1248.000  982.800Parabolic_1_from_top_left  15  1344.000  907.200Parabolic_1_from_top_left  16  1440.000  810.000Parabolic_1_from_top_left  17  1536.000  691.200Parabolic_1_from_top_left  18  1632.000  550.800Parabolic_1_from_top_left  19  1728.000  388.800Parabolic_1_from_top_left  20  1824.000  205.200Parabolic_1_from_top_left  21  1920.000  0.000Parabolic_2_from_bottom_right  1  1920.000  1080.000Parabolic_2_from_bottom_right  2  1824.000  874.800Parabolic_2_from_bottom_right  3  1728.000  691.200Parabolic_2_from_bottom_right  4  1632.000  529.200Parabolic_2_from_bottom_right  5  1536.000  388.800Parabolic_2_from_bottom_right  6  1440.000  270.000Parabolic_2_from_bottom_right  7  1344.000  172.800Parabolic_2_from_bottom_right  8  1248.000  97.200Parabolic_2_from_bottom_right  9  1152.000  43.200Parabolic_2_from_bottom_right  10  1056.000  10.800Parabolic_2_from_bottom_right  13  768.000  43.200Parabolic_2_from_bottom_right  14  672.000  97.200Parabolic_2_from_bottom_right  15  576.000  172.800Parabolic_2_from_bottom_right  16  480.000  270.000Parabolic_2_from_bottom_right  17  384.000  388.800Parabolic_2_from_bottom_right  18  288.000  529.200Parabolic_2_from_bottom_right  19  192.000  691.200Parabolic_2_from_bottom_right  20  96.000  874.800Parabolic_2_from_bottom_right  21  0.000  1080.000
+# boujou 2d tracks export: text
+# boujou version: 4.1.0 28444 
+# Creation date : Thu Apr 15 17:21:26 2010
+# 
+# track_id      view      x      y
+Parabolic_1_from_top_left  1  0.000  0.000
+Parabolic_1_from_top_left  2  96.000  205.200
+Parabolic_1_from_top_left  3  192.000  388.800
+Parabolic_1_from_top_left  4  288.000  550.800
+Parabolic_1_from_top_left  5  384.000  691.200
+Parabolic_1_from_top_left  6  480.000  810.000
+Parabolic_1_from_top_left  7  576.000  907.200
+Parabolic_1_from_top_left  8  672.000  982.800
+Parabolic_1_from_top_left  9  768.000  1036.800
+Parabolic_1_from_top_left  10  864.000  1069.200
+Parabolic_1_from_top_left  13  1152.000  1036.800
+Parabolic_1_from_top_left  14  1248.000  982.800
+Parabolic_1_from_top_left  15  1344.000  907.200
+Parabolic_1_from_top_left  16  1440.000  810.000
+Parabolic_1_from_top_left  17  1536.000  691.200
+Parabolic_1_from_top_left  18  1632.000  550.800
+Parabolic_1_from_top_left  19  1728.000  388.800
+Parabolic_1_from_top_left  20  1824.000  205.200
+Parabolic_1_from_top_left  21  1920.000  0.000
+Parabolic_2_from_bottom_right  1  1920.000  1080.000
+Parabolic_2_from_bottom_right  2  1824.000  874.800
+Parabolic_2_from_bottom_right  3  1728.000  691.200
+Parabolic_2_from_bottom_right  4  1632.000  529.200
+Parabolic_2_from_bottom_right  5  1536.000  388.800
+Parabolic_2_from_bottom_right  6  1440.000  270.000
+Parabolic_2_from_bottom_right  7  1344.000  172.800
+Parabolic_2_from_bottom_right  8  1248.000  97.200
+Parabolic_2_from_bottom_right  9  1152.000  43.200
+Parabolic_2_from_bottom_right  10  1056.000  10.800
+Parabolic_2_from_bottom_right  13  768.000  43.200
+Parabolic_2_from_bottom_right  14  672.000  97.200
+Parabolic_2_from_bottom_right  15  576.000  172.800
+Parabolic_2_from_bottom_right  16  480.000  270.000
+Parabolic_2_from_bottom_right  17  384.000  388.800
+Parabolic_2_from_bottom_right  18  288.000  529.200
+Parabolic_2_from_bottom_right  19  192.000  691.200
+Parabolic_2_from_bottom_right  20  96.000  874.800
+Parabolic_2_from_bottom_right  21  0.000  1080.000

data/test/test_cli.rb

@@ -23,9 +23,8 @@ class CliTest < Test::Unit::TestCase
       $VERBOSE = false
       load(BIN_P)
       return [0, os.string, es.string]
-    rescue Exception => boom # The binary uses exit(), we use that to preserve the output code
-      return [boom.status, os.string, es.string] if boom.is_a?(SystemExit)
-      raise boom
+    rescue SystemExit => boom # The binary uses exit(), we use that to preserve the output code
+      return [boom.status, os.string, es.string]
     ensure
       $VERBOSE = verbosity
       ARGV.replace(old_argv)

data/test/test_pipeline.rb

@@ -5,6 +5,7 @@ class PipelineTest < Test::Unit::TestCase
   def setup
     @old_dir = Dir.pwd
     Dir.chdir(File.dirname(__FILE__))
+    super
   end
   
   def create_stabilizer_file
@@ -26,6 +27,7 @@ class PipelineTest < Test::Unit::TestCase
   def teardown
      Dir.glob("./input*.*").each(&File.method(:unlink))
      Dir.chdir(@old_dir)
+     super
   end
   
   def test_supports_block_init
@@ -41,6 +43,25 @@ class PipelineTest < Test::Unit::TestCase
     assert_equal 9, pipeline.converted_keyframes, "Should report conversion of 9 keyframes"
   end
   
+  def test_middleware_initialization_from_tuples
+    create_stabilizer_file
+    
+    pipeline = Tracksperanto::Pipeline::Base.new
+    pipeline.middleware_tuples = [
+      ["Bla", {:foo=> 234}]
+    ]
+    
+    mock_mux = flexmock("MUX")
+    flexmock(Tracksperanto::Export::Mux).should_receive(:new).and_return(mock_mux)
+    m = flexmock("middleware object")
+    mock_middleware_class = flexmock("middleware class")
+    
+    flexmock(Tracksperanto).should_receive(:get_middleware).with("Bla").once.and_return(mock_middleware_class)
+    mock_middleware_class.should_receive(:new).with(mock_mux, {:foo => 234}).once
+    
+    assert_raise(NoMethodError) { pipeline.run(@stabilizer) }
+  end
+  
   def test_run_with_autodetected_importer_that_requires_size
     FileUtils.cp("./import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "./input.shk")
     pipeline = Tracksperanto::Pipeline::Base.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency