tracksperanto 2.8.5 → 2.8.6

data/test/export/test_flame_stabilizer_cornerpin_export.rb

@@ -3,10 +3,12 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 class FlameStabilizerCornerpinExportTest < Test::Unit::TestCase
   include ParabolicTracks
   P = File.dirname(__FILE__) + "/samples/ref_flameCornerpin.stabilizer"
+  P2 = File.dirname(__FILE__) + "/samples/ref_FlameSimpleReorderedCornerpin.stabilizer"
+  P3 = File.dirname(__FILE__) + "/samples/ref_FlameProperlyReorderedCornerpin.stabilizer"
   
   def test_export_output_written
     t = Time.local(2010, "Feb", 18, 17, 22, 12)
-    flexmock(Time).should_receive(:now).once.and_return(t)
+    flexmock(Time).should_receive(:now).and_return(t)
     ensure_same_output Tracksperanto::Export::FlameStabilizerCornerpin, P 
   end
   
@@ -30,4 +32,36 @@ class FlameStabilizerCornerpinExportTest < Test::Unit::TestCase
     roundtrip = Tracksperanto::Import::FlameStabilizer.new(:io => s).to_a
     assert_equal 4, roundtrip.length
   end
+  
+  def test_roundtrip_with_correct_order
+    t = Time.local(2010, "Feb", 18, 17, 22, 12)
+    flexmock(Time).should_receive(:now).and_return(t)
+    
+    trackers = File.open(File.dirname(__FILE__) + "/../import/samples/flame_stabilizer/FlameStab_Cornerpin_CorrectOrder.stabilizer") do | f| 
+      Tracksperanto::Import::FlameStabilizer.new(:io => f).to_a
+    end
+    assert_equal 4, trackers.length
+    
+    s = StringIO.new
+    x = Tracksperanto::Export::FlameStabilizerCornerpin.new(s)
+    x.just_export(trackers, 1920, 1080)
+    
+    assert_same_buffer(File.open(P2), s)
+  end
+  
+  def test_roundtrip_with_incorrect_order
+    t = Time.local(2010, "Feb", 18, 17, 22, 12)
+    flexmock(Time).should_receive(:now).and_return(t)
+    
+    trackers = File.open(File.dirname(__FILE__) + "/../import/samples/flame_stabilizer/FlameStab_Cornerpin_IncorrectOrder.stabilizer") do | f| 
+      Tracksperanto::Import::FlameStabilizer.new(:io => f).to_a
+    end
+    assert_equal 4, trackers.length
+    
+    s = StringIO.new
+    x = Tracksperanto::Export::FlameStabilizerCornerpin.new(s)
+    x.just_export(trackers, 1920, 1080)
+    
+    assert_same_buffer(File.open(P3), s)
+  end
 end

data/test/helper.rb

@@ -92,22 +92,23 @@ module ParabolicTracks
     end
   end
   
+  def assert_same_buffer(ref_buffer, actual_buffer, message = "The line should be identical")
+    [ref_buffer, actual_buffer].each{|io| io.rewind }
+    at_line = 0
+    until ref_buffer.eof? && actual_buffer.eof?
+      at_line += 1
+      reference_line, output_line = ref_buffer.readline, actual_buffer.readline
+      assert_equal reference_line, output_line, "Line #{at_line} - #{message}"
+    end
+  end
+  
   def ensure_same_output(exporter_klass, reference_path, message = "The line should be identical")
-    
     io = StringIO.new
     x = exporter_klass.new(io)
     yield(x) if block_given?
     export_parabolics_with(x)
-    io.rewind
     
-    File.open(reference_path, "r") do | f |
-      at_line = 0
-      until f.eof? || io.eof?
-        at_line += 1
-        reference_line, output_line = f.readline, io.readline
-        assert_equal reference_line, output_line, "Line #{at_line} - #{message}"
-      end
-    end
+    assert_same_buffer(File.open(reference_path, "r"), io, message)
   end
   
   def export_parabolics_with(exporter)

data/test/test_cli.rb

@@ -29,7 +29,7 @@ class CliTest < Test::Unit::TestCase
   def test_cli_with_nonexisting_file
     status, o, e = cli(TEMP_DIR + "/nonexisting.file")
     assert_equal 1, status
-    assert_equal "Input file #{TEMP_DIR + "/nonexisting.file"} does not exist\n", e
+    assert_match /Input file #{TEMP_DIR + "/nonexisting.file"} does not exist/, e
   end
     
   def test_basic_cli

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "2.8.5"
+  s.version = "2.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2011-12-25"
+  s.date = "2012-01-13"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -78,7 +78,6 @@ Gem::Specification.new do |s|
     "lib/tracksperanto/casts.rb",
     "lib/tracksperanto/const_name.rb",
     "lib/tracksperanto/ext_io.rb",
-    "lib/tracksperanto/flame_builder.rb",
     "lib/tracksperanto/format_detector.rb",
     "lib/tracksperanto/keyframe.rb",
     "lib/tracksperanto/returning.rb",
@@ -88,6 +87,8 @@ Gem::Specification.new do |s|
     "lib/tracksperanto/uv_coordinates.rb",
     "lib/tracksperanto/zip_tuples.rb",
     "test/export/README_EXPORT_TESTS.txt",
+    "test/export/samples/ref_FlameProperlyReorderedCornerpin.stabilizer",
+    "test/export/samples/ref_FlameSimpleReorderedCornerpin.stabilizer",
     "test/export/samples/ref_Mayalive.txt",
     "test/export/samples/ref_Mayalive_CustomAspect.txt",
     "test/export/samples/ref_NukeScript.nk",
@@ -150,7 +151,6 @@ Gem::Specification.new do |s|
     "test/test_cli.rb",
     "test/test_const_name.rb",
     "test/test_extio.rb",
-    "test/test_flame_builder.rb",
     "test/test_format_detector.rb",
     "test/test_keyframe.rb",
     "test/test_pipeline.rb",
@@ -169,9 +169,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<obuf>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<obuf>, ["~> 1.0.4"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_runtime_dependency(%q<progressbar>, ["~> 0.9"])
       s.add_runtime_dependency(%q<update_hints>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -179,9 +179,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
     else
-      s.add_dependency(%q<obuf>, ["~> 1.0.1"])
+      s.add_dependency(%q<obuf>, ["~> 1.0.4"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
-      s.add_dependency(%q<flame_channel_parser>, ["~> 3.0"])
+      s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_dependency(%q<progressbar>, ["~> 0.9"])
       s.add_dependency(%q<update_hints>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -190,9 +190,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
     end
   else
-    s.add_dependency(%q<obuf>, ["~> 1.0.1"])
+    s.add_dependency(%q<obuf>, ["~> 1.0.4"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
-    s.add_dependency(%q<flame_channel_parser>, ["~> 3.0"])
+    s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
     s.add_dependency(%q<progressbar>, ["~> 0.9"])
     s.add_dependency(%q<update_hints>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-25 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: obuf
-  requirement: &10793450 !ruby/object:Gem::Requirement
+  requirement: &3815360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *10793450
+  version_requirements: *3815360
 - !ruby/object:Gem::Dependency
   name: progressive_io
-  requirement: &10792500 !ruby/object:Gem::Requirement
+  requirement: &3814680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10792500
+  version_requirements: *3814680
 - !ruby/object:Gem::Dependency
   name: flame_channel_parser
-  requirement: &10790820 !ruby/object:Gem::Requirement
+  requirement: &3814070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10790820
+  version_requirements: *3814070
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &10789080 !ruby/object:Gem::Requirement
+  requirement: &3813760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *10789080
+  version_requirements: *3813760
 - !ruby/object:Gem::Dependency
   name: update_hints
-  requirement: &10788410 !ruby/object:Gem::Requirement
+  requirement: &3813460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10788410
+  version_requirements: *3813460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10787690 !ruby/object:Gem::Requirement
+  requirement: &3829560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10787690
+  version_requirements: *3829560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10787260 !ruby/object:Gem::Requirement
+  requirement: &3829220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10787260
+  version_requirements: *3829220
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &10786840 !ruby/object:Gem::Requirement
+  requirement: &3828510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *10786840
+  version_requirements: *3828510
 - !ruby/object:Gem::Dependency
   name: cli_test
-  requirement: &10786400 !ruby/object:Gem::Requirement
+  requirement: &3827870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *10786400
+  version_requirements: *3827870
 description: Converts 2D track exports between different apps like Flame, MatchMover,
   PFTrack...
 email: me@julik.nl
@@ -180,7 +180,6 @@ files:
 - lib/tracksperanto/casts.rb
 - lib/tracksperanto/const_name.rb
 - lib/tracksperanto/ext_io.rb
-- lib/tracksperanto/flame_builder.rb
 - lib/tracksperanto/format_detector.rb
 - lib/tracksperanto/keyframe.rb
 - lib/tracksperanto/returning.rb
@@ -190,6 +189,8 @@ files:
 - lib/tracksperanto/uv_coordinates.rb
 - lib/tracksperanto/zip_tuples.rb
 - test/export/README_EXPORT_TESTS.txt
+- test/export/samples/ref_FlameProperlyReorderedCornerpin.stabilizer
+- test/export/samples/ref_FlameSimpleReorderedCornerpin.stabilizer
 - test/export/samples/ref_Mayalive.txt
 - test/export/samples/ref_Mayalive_CustomAspect.txt
 - test/export/samples/ref_NukeScript.nk
@@ -252,7 +253,6 @@ files:
 - test/test_cli.rb
 - test/test_const_name.rb
 - test/test_extio.rb
-- test/test_flame_builder.rb
 - test/test_format_detector.rb
 - test/test_keyframe.rb
 - test/test_pipeline.rb

data/lib/tracksperanto/flame_builder.rb

@@ -1,77 +0,0 @@
-# A Builder-like class for exporting Flame setups
-class Tracksperanto::FlameBuilder
-  INDENT = "\t"
-  
-  def initialize(io, indent = 0)
-    @io, @indent = io, indent
-  end
-  
-  def write_block!(name, value = nil, &blk)
-    value.nil? ? write_loose!(name) : write_tuple!(name, value)
-    yield(self.class.new(@io, @indent + 1))
-    @io.puts(INDENT * (@indent + 1) + "End")
-  end
-  
-  def write_unterminated_block!(name, value = nil, &blk)
-    value.nil? ? write_loose!(name) : write_tuple!(name, value)
-    yield(self.class.new(@io, @indent + 1))
-  end
-  
-  def write_tuple!(key, value)
-    @io.puts("%s%s %s" % [INDENT * @indent, __camelize(key), __flameize(value)])
-  end
-  
-  def write_loose!(value)
-    @io.puts("%s%s" % [INDENT * @indent, __camelize(value)])
-  end
-  
-  def linebreak!(how_many = 1)
-    @io.write("\n" * how_many)
-  end
-  
-  def color_hash!(name, red, green, blue)
-    write_unterminated_block!(name) do | b |
-      b.red(red)
-      b.green(green)
-      b.blue(blue)
-    end
-  end
-  
-  def <<(some_verbatim_string)
-    some_verbatim_string.split("\n").each do | line |
-      @io.puts(["\t" * @indent, line].join)
-    end
-  end
-  
-  private
-  
-  def method_missing(meth, arg = nil)
-    if block_given?
-      write_block!(meth, arg) {|c| yield(c) }
-    else
-      if arg.nil?
-        write_loose!(meth)
-      else
-        write_tuple!(meth, arg)
-      end
-    end
-  end
-  
-  def __camelize(s)
-    @@camelizations ||= {}
-    @@camelizations[s] ||= s.to_s.gsub(/(^|_)(.)/) { $2.upcase }
-  end
-  
-  def __flameize(v)
-    case v
-      when Float
-        "%.3f" % v
-      when TrueClass
-        "yes"
-      when FalseClass
-        "no"
-      else
-        v.to_s
-    end
-  end
-end

data/test/test_flame_builder.rb

@@ -1,67 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
-
-class FlameBuilderTest < Test::Unit::TestCase
-  def setup
-    @s = ""
-    @b = Tracksperanto::FlameBuilder.new(StringIO.new(@s))
-  end
-  
-  def test_write_loose
-    @b.write_loose!("Foo")
-    assert_equal "Foo\n", @s
-  end
-
-  def test_write_tuple
-    @b.write_tuple!("Foo", 3)
-    assert_equal "Foo 3\n", @s
-  end
-
-  def test_write_tuple_with_true
-    @b.write_tuple!("Foo", true)
-    assert_equal "Foo yes\n", @s
-  end
-
-  def test_write_tuple_with_false
-    @b.write_tuple!("Foo", false)
-    assert_equal "Foo no\n", @s
-  end
-  
-  def test_write_block
-    @b.write_block!("Foo", 1) do | b |
-      b.write_tuple!("Baz", 2)
-    end
-    assert_equal "Foo 1\n\tBaz 2\n\tEnd\n", @s
-  end
-  
-  def test_write_block_with_no_arg
-    @b.foo {|c| c.bar }
-    assert_equal "Foo\n\tBar\n\tEnd\n", @s
-  end
-  
-  def test_write_block_with_args
-    @b.foo(:bar) {|c| c.bar }
-    assert_equal "Foo bar\n\tBar\n\tEnd\n", @s
-  end
-  
-  def test_automissing_with_values
-    @b.some_key(2)
-    assert_equal "SomeKey 2\n", @s
-  end
-
-  def test_automissing_with_block
-    @b.some_key(2) do | b |
-      b.some_subkey
-    end
-    assert_equal "SomeKey 2\n\tSomeSubkey\n\tEnd\n", @s
-  end
-  
-  def test_linebreak
-    @b.linebreak!(5)
-    assert_equal "\n" * 5, @s
-  end
-  
-  def test_color_hash
-    @b.color_hash!(:triplet, 10, 12, 15)
-    assert_equal "Triplet\n\tRed 10\n\tGreen 12\n\tBlue 15\n", @s
-  end
-end