tracksperanto 2.5.0 → 2.6.0

data/Gemfile

@@ -0,0 +1,14 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source :gemcutter
+
+gem "progressbar", "~>0.9"
+gem "update_hints", "~>1.0"
+
+gem "flexmock", "~>0.8", :group => [:development, :test]
+gem "cli_test", "~>1.0", :group => [:development, :test]
+gem "hoe", ">=2.9.4", :group => [:development, :test]
+
+# vim: syntax=ruby

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.6.0 / 2011-14-06
+
+* Adds the --trim option to remove keyframes that come in negative frames (before frame 0).
+  Some apps improperly handle such frames (Syntheyes)
+
 === 2.5.0 / 2011-14-06
 
 * No status display in the progress bar. It was an annoyance.

data/Manifest.txt

@@ -1,5 +1,6 @@
 .yardopts
 DEVELOPER_DOCS.rdoc
+Gemfile
 History.txt
 MIT_LICENSE.txt
 Manifest.txt
@@ -47,6 +48,7 @@ lib/middleware/reformat.rb
 lib/middleware/scaler.rb
 lib/middleware/shift.rb
 lib/middleware/slipper.rb
+lib/middleware/start_trim.rb
 lib/pipeline/base.rb
 lib/tracksperanto.rb
 lib/tracksperanto/accumulator.rb
@@ -163,6 +165,7 @@ test/middleware/test_reformat_middleware.rb
 test/middleware/test_scaler_middleware.rb
 test/middleware/test_shift_middleware.rb
 test/middleware/test_slip_middleware.rb
+test/middleware/test_start_trim_middleware.rb
 test/test_accumulator.rb
 test/test_buffer_io.rb
 test/test_cli.rb

data/Rakefile

@@ -1,19 +1,19 @@
-require 'rubygems'
 require './lib/tracksperanto'
-
 begin
   require 'hoe'
   
+  Hoe::RUBY_FLAGS.gsub!(/^\-w/, '') # No thanks undefined ivar warnings
+  Hoe.plugin :bundler
   Hoe.spec('tracksperanto') do | p |
     p.readme_file   = 'README.rdoc'
     p.extra_rdoc_files  = FileList['*.rdoc'] + FileList['*.txt']
     p.version = Tracksperanto::VERSION
     
-    p.extra_deps = {"progressbar" => ">=0", "update_hints" => ">=0" }
-    p.extra_dev_deps = {"flexmock" => ">=0"}
-    p.rubyforge_name = 'guerilla-di'
+    p.extra_deps = {"progressbar" => "~> 0.9", "update_hints" => "~> 1.0" }
+    p.extra_dev_deps = {"flexmock" => "~> 0.8", "cli_test" => "~>1.0"}
+    
     p.developer('Julik Tarkhanov', 'me@julik.nl')
-    p.clean_globs = %w( **/.DS_Store  coverage.info **/*.rbc .idea .yardoc)
+    p.clean_globs = File.read(File.dirname(__FILE__) + "/.gitignore").split(/\s/).to_a
   end
 rescue LoadError
   

data/bin/tracksperanto

@@ -60,6 +60,7 @@ op.on("--code PATH_TO_SCRIPT", String, "Load custom Ruby code into tracksperanto
   end
 end
 
+
 op.on(" -f", "--from TRANSLATOR", String, "Use the specific import translator") { |f| options[:importer] = f }
 op.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| options[:width] = w }
 op.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| options[:height] = w }
@@ -67,7 +68,9 @@ op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, f
 
 op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)", &mw("Scaler", :x_factor))
 op.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, "Scale the result in Y by this factor (1.0 is the default)", &mw("Scaler", :y_factor))
+op.on(" -t", "--trim", "Trim the start frames (do not allow negative frame values)",  &mw("StartTrim", :enabled, true)) # Before slip!
 op.on(" -s", "--slip FRAMES", Integer, "Slip the result by this number of frames, positive is 'later'", &mw("Slipper", :slip))
+
 op.on(" -g", "--golden", "Reset the residuals of all trackers to 0 (ignore correlation)", &mw("Golden", :enabled, true))
 op.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it", &mw("Reformat", :width))
 op.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it", &mw("Reformat", :height))
@@ -102,12 +105,12 @@ end
 input_file = ARGV.pop
 unless input_file
   $stderr.puts "No input file provided - should be the last argument. Also use the --help option."
-  exit(-1)
+  exit(1)
 end
 
 unless File.exist?(input_file)
   $stderr.puts "Input file #{input_file} does not exist"
-  exit(-1)
+  exit(1)
 end
 
 pbar = ProgressBar.new("Converting", 100, $stderr)

data/lib/export/match_mover.rb

@@ -6,7 +6,7 @@ class Tracksperanto::Export::MatchMover < Tracksperanto::Export::Base
   end
   
   def self.human_name
-    "Matchmover 2D export .rz2 file"
+    "MatchMover REALVIZ Ascii Point Tracks .rz2 file"
   end
   
   PREAMBLE = %[imageSequence	"Sequence 01"\n{\n\t%d\t%d\tf( "D:/temp/sequence.%%04d.dpx" )\tb( 1 211 1 )\t\n}\n]

data/lib/import/flame_stabilizer.rb

@@ -77,7 +77,6 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
     report_progress("Extracting all animation channels")
     channels, names = extract_channels_from_stream(@io)
     
-    raise "The setup contained no channels that we could process" if channels.empty?
     raise "A channel was nil" if channels.find{|e| e.nil? }
     
     report_progress("Assembling tracker curves from channels")

data/lib/import/match_mover.rb

@@ -5,7 +5,7 @@ class Tracksperanto::Import::MatchMover < Tracksperanto::Import::Base
   end
   
   def self.human_name
-    "MatchMover .rz2 file"
+    "MatchMover REALVIZ Ascii Point Tracks .rz2 file"
   end
   
   def self.distinct_file_ext

data/lib/middleware/start_trim.rb

@@ -0,0 +1,16 @@
+# This middleware removes all keyframes before frame 0, and skips trackers entirely if they are all before frame 0
+class Tracksperanto::Middleware::StartTrim < Tracksperanto::Middleware::Base
+  attr_accessor :enabled
+  
+  def start_export( img_width, img_height)
+    if @enabled
+      @exporter = Tracksperanto::Middleware::LengthCutoff.new(@exporter, :min_length => 1) # Ensure at least one keyframe
+    end
+    
+    super
+  end
+  
+  def export_point(frame, float_x, float_y, float_residual)
+    return super unless (@enabled && frame < 0)
+  end
+end

data/lib/tracksperanto/buffer_io.rb

@@ -48,6 +48,8 @@ class Tracksperanto::BufferIO < DelegateClass(IO)
   def replace_with_tempfile
     sio = __getobj__
     tf = Tempfile.new("tracksperanto-xbuf")
+    tf.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
+    tf.binmode
     tf.write(sio.string)
     tf.flush # Needed of we will reopen this file soon from another thread/loop
     sio.string = ""

data/lib/tracksperanto.rb

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

data/test/export/test_match_mover_export.rb

@@ -10,7 +10,7 @@ class MatchmoverExportTest < Test::Unit::TestCase
   
   def test_exporter_meta
     assert_equal "matchmover.rz2", Tracksperanto::Export::MatchMover.desc_and_extension
-    assert_equal "Matchmover 2D export .rz2 file", Tracksperanto::Export::MatchMover.human_name
+    assert_equal "MatchMover REALVIZ Ascii Point Tracks .rz2 file", Tracksperanto::Export::MatchMover.human_name
   end
   
   def test_width_and_height_not_stepping_on_each_other_in_preamble

data/test/helper.rb

@@ -1,10 +1,18 @@
 require File.dirname(__FILE__) + '/../lib/tracksperanto' unless defined?(Tracksperanto)
 require 'test/unit'
-require 'rubygems'
 require 'flexmock'
 require 'flexmock/test_unit'
 require 'fileutils'
 
+# http://redmine.ruby-lang.org/issues/4882
+# https://github.com/jimweirich/flexmock/issues/4
+# https://github.com/julik/flexmock/commit/4acea00677e7b558bd564ec7c7630f0b27d368ca
+class FlexMock::PartialMockProxy
+  def singleton?(method_name)
+    @obj.singleton_methods.include?(method_name.to_s)
+  end
+end
+
 # This module creates ideal parabolic tracks for testing exporters. The two trackers
 # will start at opposite corners of the image and traverse two parabolic curves, touching
 # the bounds of the image at the and and in the middle. On the middle frame they will vertically

data/test/import/test_match_mover_import.rb

@@ -7,7 +7,7 @@ class MatchMoverImportTest < Test::Unit::TestCase
   
   def test_introspects_properly
     i = Tracksperanto::Import::MatchMover
-    assert_equal "MatchMover .rz2 file", i.human_name
+    assert_equal "MatchMover REALVIZ Ascii Point Tracks .rz2 file", i.human_name
     assert i.autodetects_size?
   end
   

data/test/middleware/test_start_trim_middleware.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class StartTrimMiddlewareTest < Test::Unit::TestCase
+  
+  def test_default_set_to_false
+    m = Tracksperanto::Middleware::StartTrim.new(nil)
+    assert_nil m.enabled
+  end
+  
+  def test_start_trim_supports_hash_init
+    m = Tracksperanto::Middleware::StartTrim.new(nil, :enabled => true)
+    assert_equal true, m.enabled
+  end
+  
+  def test_start_mw_works
+    x = flexmock(:exporter)
+    
+    x.should_receive(:start_export).once.with(720, 576)
+    x.should_receive(:start_tracker_segment).once.with("TrackerBehind")
+    x.should_receive(:export_point).once.with(0, 100, 100, 0.56)
+    x.should_receive(:end_tracker_segment).once
+    x.should_receive(:end_export).once
+    
+    m = Tracksperanto::Middleware::StartTrim.new(x, :enabled => true)
+    
+    m.start_export(720, 576)
+    m.start_tracker_segment("TrackerBehind")
+    m.export_point(-2, 120, 87, 0.56)
+    m.export_point(-1, 110, 92, 0.56)
+    m.export_point(0, 100, 100, 0.56)
+    m.end_tracker_segment
+    
+    # This tracker should be skipped since it's now entirely behind the 0 frame mark
+    m.start_tracker_segment("SecondTracker")
+    m.export_point(-567, 120, 87, 0.56)
+    m.export_point(-566, 110, 92, 0.56)
+    m.export_point(-564, 100, 100, 0.56)
+    m.end_tracker_segment
+    
+    m.end_export
+  end
+end

data/test/test_cli.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__)) + '/helper'
 require "set"
+require "cli_test"
 
 class CliTest < Test::Unit::TestCase
   TEMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp")
@@ -16,32 +17,18 @@ class CliTest < Test::Unit::TestCase
   
   # Run the tracksperanto binary with passed options, and return [exit_code, stdout_content, stderr_content]
   def cli(commandline_arguments)
-    old_stdout, old_stderr, old_argv = $stdout, $stderr, ARGV.dup
-    os, es = StringIO.new, StringIO.new
-    begin
-      $stdout, $stderr, verbosity = os, es, $VERBOSE
-      ARGV.replace(commandline_arguments.split)
-      $VERBOSE = false
-      load(BIN_P)
-      return [0, os.string, es.string]
-    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)
-      $stdout, $stderr = old_stdout, old_stderr
-    end
+    CLITest.new(BIN_P).run(commandline_arguments)
   end
   
   def test_cli_with_no_args_produces_usage
     status, o, e = cli('')
-    assert_equal -1, status
+    assert_equal 1, status
     assert_match /Also use the --help option/, e
   end
   
   def test_cli_with_nonexisting_file
     status, o, e = cli(TEMP_DIR + "/nonexisting.file")
-    assert_equal -1, status
+    assert_equal 1, status
     assert_equal "Input file #{TEMP_DIR + "/nonexisting.file"} does not exist\n", e
   end
     
@@ -74,6 +61,13 @@ class CliTest < Test::Unit::TestCase
     assert_equal 340, p.height, "The height of the converted setup should be that"
   end
   
+  def test_cli_trim
+    FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
+    results = cli("--slip -8000 --trim --only flamestabilizer #{TEMP_DIR}/flm.stabilizer")
+    assert_not_equal 0, results[0] # status
+    assert_match /There were no trackers exported /, results[-1] # STDERR
+  end
+  
   # We use this instead of assert_equals for arrays since different filesystems
   # return files in different order
   def assert_same_set(expected_enum, enum, message = "Should be the same set")

metadata

@@ -2,7 +2,7 @@
 name: tracksperanto
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
+date: 2011-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: progressbar
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.9"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -40,22 +40,33 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "0.8"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: cli_test
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.9.4
+        version: "1.0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.10"
+  type: :development
+  version_requirements: *id005
 description: Tracksperanto is a universal 2D-track translator between many apps.
 email: 
 - me@julik.nl
@@ -72,6 +83,7 @@ extra_rdoc_files:
 files: 
 - .yardopts
 - DEVELOPER_DOCS.rdoc
+- Gemfile
 - History.txt
 - MIT_LICENSE.txt
 - Manifest.txt
@@ -119,6 +131,7 @@ files:
 - lib/middleware/scaler.rb
 - lib/middleware/shift.rb
 - lib/middleware/slipper.rb
+- lib/middleware/start_trim.rb
 - lib/pipeline/base.rb
 - lib/tracksperanto.rb
 - lib/tracksperanto/accumulator.rb
@@ -235,6 +248,7 @@ files:
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
+- test/middleware/test_start_trim_middleware.rb
 - test/test_accumulator.rb
 - test/test_buffer_io.rb
 - test/test_cli.rb
@@ -272,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: guerilla-di
+rubyforge_project: tracksperanto
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
@@ -315,6 +329,7 @@ test_files:
 - test/middleware/test_scaler_middleware.rb
 - test/middleware/test_shift_middleware.rb
 - test/middleware/test_slip_middleware.rb
+- test/middleware/test_start_trim_middleware.rb
 - test/test_accumulator.rb
 - test/test_buffer_io.rb
 - test/test_cli.rb