tracksperanto 3.3.0.pre → 3.3.6

data/DEVELOPER_DOCS.rdoc

@@ -3,31 +3,37 @@
 === Tests
 
 Tracksperanto is heavily tested. Please use the Github checkout to also receive some 17+ megabytes of test files that the test suite
-can chew on. If you implement fixes or new features having tests for them is NOT OPTIONAL. We are not in crunchtime shot delivery mode
-here but we are sharing an essential pipeline tool that has to be robust day in day out, year to year. Mmmkay?
-
-So please do not underestimate tests.
+can chew on. Contributions or patches without tests will be rejected at sight.
 
 === Development environment
 
-Tracksperanto is currently being developed on Ruby 1.9.3 but it should also work fine on 1.8.7. What you will need is everything mentioned
-in the Gemfile plus Bundler. Please develop against the git repo checkout since we no longer package the test fixtures with the gem.
+Tracksperanto is currently being developed on Ruby 1.9.3 but it should also work fine on 1.8.7.
+What you will need is everything mentioned in the Gemfile plus Bundler.
+Development should be done agains the git checkout because the gem does not contain the test files
+(various example files in different formats that are used for verifying all the import and export modules).
+
+The test corpus on Tracksperanto is HUGE at the moment, and it makes no sense to ship it with the gem.
 
+So, to get started:
+
+* Make sure you have Ruby and Bundler (+sudo gem install bundler+ if unsure)
 * Checkout the repo at http://github.com/guerilla-di/tracksperanto
-* Run `bundle install' and `bundle exec rake' to run the tests
-* Carry your development, in your own branch or feature branch
-* File a pull request or send a patch to info at guerilla-di.org
+* Run +bundle install+ and +bundle exec rake+ to run the tests
+* Do your thing, in a separate branch
+* File a pull request or send a patch to +me at julik dot nl+
 
 === Internal tracker representation
 
 The trackers are represented by Tracker objects, which work like addressable hashes per frame number. The Tracker objects
 contain Keyframe objects, and those in turn contain coordinates. The coordinates are stored in absolute pixels, relative to
-the zero coordinate in the lower left corner. The absolute left/bottom of the image has coordinates 0,0 (at the lower left corner of the
-first pixel) and 0.5x0.5 in the middle of the leftmost lower pixel.
+the zero coordinate in the lower left corner.
+
+Note on subpixel precision: the absolute left/bottom of the image has coordinates 0,0 
+(at the lower left corner of the leftmost bottommost pixel) and 0.5x0.5 in the middle of that pixel.
 
 === Importing your own formats
 
-You can easily write a Tracksperanto import module - refer to Tracksperanto::Import::Base
+To write an import module refer to Tracksperanto::Import::Base
 docs. Your importer will be configured with width and height of the comp that it is importing, and will get an IO 
 object with the file that you are processing. You should then yield parsed trackers within the each method (tracker objects should
 be Tracksperanto::Tracker objects or compatibles)
@@ -44,7 +50,7 @@ You probably want to write a Tool (consult the Tracksperanto::Tool::Base docs) i
 or their data. A Tool is just like an export module, except that instead it sits between the exporter and the exporting routine. Tools wrap export
 modules or each other, so you can stack different tool modules together (like "scale first, then move").
 
-=== Writing your own processing routines
+=== Writing your own processing pipelines from start to finish
 
 You probably want to write a descendant of Tracksperanto::Pipeline::Base. This is a class that manages a conversion from start to finish, including detecting the
 input format, allocating output files and building a chain of Tools to process the export. If you want to make a GUI for Tracksperanto you will likely need
@@ -70,7 +76,7 @@ the software user-friendly. A well-behaved Tracksperanto module should manage it
   # This importer needs to know width and height
   some_importer.width = 1024
   some_importer.height = 576
-  some_importer.io = File.open("source_file.fmt")
+  some_importer.io = File.open("source_file.shk")
   
   # The importer responds to each() so if your file is not too big you can just load all the trackers
   # as an array. If you expect to have alot of trackers investigate a way to buffer them on disk
@@ -89,6 +95,8 @@ the software user-friendly. A well-behaved Tracksperanto module should manage it
   
   # Now when we send export commands to the Slipper it will play them through
   # to the Scaler and the Scaler in turn will send commands to the exporter.
+  # As you can see when you run export commands you do not have to use the Tracker
+  # objects, you just have to stream the right arguments in the right sequence
   slipper.start_export(1024, 576)
   trackers.each do | t |
     slipper.start_tracker_segment(t.name)
@@ -99,4 +107,4 @@ the software user-friendly. A well-behaved Tracksperanto module should manage it
   end
   slipper.end_export
   
-  # And we are done!
+  # And we are done!

data/Gemfile

@@ -1,24 +1,27 @@
 # -*- ruby -*-
 source :rubygems
 
+gem "bundler"
+
 gem "obuf", "~> 1.1"
-gem "tickly", "~> 2.0"
-gem "bychar"
+gem "tickly", "~> 2.1"
+gem "bychar", "~> 2"
 gem "progressive_io", "~> 1.0"
 gem "flame_channel_parser", "~> 4.0"
+
 gem "progressbar", "0.10.0"
 gem "update_hints", "~> 1.0"
 
-
 group :development do
   gem "approximately"
   gem "jeweler"
   gem "rake"
+  gem "linebyline"
   
   if RUBY_VERSION > "1.8"
-    gem "flexmock", "~> 1.3"
+    gem "flexmock", "~> 1.3", :require => %w( flexmock flexmock/test_unit )
   else
-    gem "flexmock", "~> 0.8"
+    gem "flexmock", "~> 0.8", :require => %w( flexmock flexmock/test_unit )
   end
   
   gem "cli_test", "~>1.0"

data/History.txt

@@ -1,3 +1,12 @@
+=== 3.3.6
+
+* Shake out the latest Bundler integration issues
+
+=== 3.3.0
+
+* Require dependencies using Bundler
+* Update to newer Tickly that has a faster parser
+
 === 3.2.2
 
 * Bump a whole array of dependencies to speed up and simplify Nuke and Shake parsers

data/README.rdoc

@@ -9,6 +9,8 @@ Unfortunately, the UIs of these are all different and not very user-friendly. It
 that an app cannot solve a shot that another one will, but you usually have to redo your 2D
 tracks in each one of them.
 
+=== Efficiency when doing tracks
+
 Another problem with today's matchmoving apps is that they are vastly inefficient when
 doing 2D tracks. Almost all of them use OpenGL and want to load the whole frame into memory
 at once. When doing tracks of long shots at high resolutions (like 2K and HD), especially
@@ -27,31 +29,65 @@ which is not adequate for all of the features being tracked.
 
 So it's very natural to track in a modern compositing app that has selective image
 loading, and then export one single group of tracks into all of the matchmoving
-applications at once. Also, you can always escape into the 2D world if no 3D app proves
-to be adequate. If you need to move from one app to another, you won't have to retrack.
+applications at once.
+
+=== Evaluating different camera solvers
+
+Since your 2D tracking data is now freely interchangeable you can load the same tracks
+into multiple 3D tracking applications and see which one gives you a better solve.
+Should all the 3D camera trackers fail, you can still take your tracks into the 2D
+compositing world to do the job. 
+
+=== Processing 2D tracking data
+
+Sometimes you need to offset your tracks in time, or resize them to a different pixel format.
+Very few apps allow you to convert your tracks in one step from format to format - like doing
+an unproportional scale on the tracks, or moving them a few pixels left and right. This comes 
+at a high cost if the footage you are tracking came cropped or in a wrong aspect - the only 
+way to solve the shot will be to retrack it from scratch.
+
+To circumvent this, Tracksperanto allows you to apply transformations to the tracking data
+that you export - and you can apply multiple transformations if desired.
+
+== Using Tracksperanto from the command line
 
-Another issue with tracks is adjusting to formats. Very few apps allow you to convert your
-tracks in one step from format to format - like doing an unproportional scale on the
-tracks, or moving them a few pixels left and right. This comes at a high cost if the
-footage you are tracking came cropped or in a wrong aspect - the only way to solve the shot
-will be to retrack it from scratch. Tracksperanto allows you to work around this
-by applying simple transformations to the tracks.
+To run on your own computer, make sure you have Ruby installed. Versions from 1.8.7
+and up are supported.
+    
+    $ ruby -v
+    ruby 1.9.3p286 (2012-10-12 revision 37165) [x86_64-darwin12.2.0]
 
-== Usage
+Then install tracksperanto. It will be downloaded and unpacked automatically for you by the
+RubyGems system:
 
-The main way to use Tracksperanto is with the the supplied "tracksperanto" binary, like so:
+    $ sudo gem install tracksperanto
 
- tracksperanto -w 1920 -h 1080 /Films/Blockbuster/Shots/001/script.shk
+Then you will have a "tracksperanto" binary in your $PATH, which you can use like this:
 
--w and -h stand for Width and Height and define the size of your comp (different tracking
-apps use different coordinate systems and we need to know the size of the comp to properly
-convert these). Some formats contain clear hints on the size of the comp, but most don't -
-for formats that do contain them you don't need to supply anything.
-You also have additional options like -xs, -ys and --slip - consult the usage info for the tracksperanto binary.
+    $ tracksperanto -w 1920 -h 1080 /Films/Blockbuster/Shots/001/script.shk
+
+To see the supported options, run
+
+    $ tracksperanto --help | more
 
 The converted files will be saved in the same directory as the source, if resulting
 converted files already exist <b>they will be overwritten without warning</b>.
 
+== Using Tracksperanto through the web
+
+For situations where you cannot install anything on your machine, or you run a shitty OS that cannot
+run Ruby decently, or you are in a locked-down environment, we offer a web-enabled version of
+Tracksperanto at the following URL:
+
+    http://tracksperanto.guerilla-di.org/
+
+This is a web-app which is always in lock-step with the main Tracksperanto in terms of versions,
+features and bug fixes. As a matter of principle, we reserve the right to use anything you upload
+to the web version for fixing bugs in Tracksperanto. Note that we usually scrub all the studio-specific
+data (like script and footage paths) from the files before adding them to the repo.
+
+If you want your own copy of the web application at your facility we can discuss that, but it's not free.
+
 == Format support
 
 --- 

data/bin/tracksperanto

@@ -10,11 +10,11 @@
 # == Author
 #   Julik <me@julik.nl>
 
+# Require the xperanto lib, which in turn requires Bundler and pulls in all the gems
 require File.dirname(__FILE__) + '/../lib/tracksperanto' unless defined?(Tracksperanto)
+require 'update_hints'
 require 'optparse'
-require 'rubygems'
 require 'progressbar'
-require "update_hints"
 
 def disclaimer
   "Please consider a small donation to keep Tracksperanto going: http://guerilla-di.org/source-and-license/\n"+
@@ -100,6 +100,8 @@ op.on(" -crop", "--crop CROP_VALUES_COMMA_SEPARATED", String, toold("Crop")) do
 end
 
 op.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, toold("Scaler"), &tool("Scaler", :y_factor))
+op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, toold("Scaler"), &tool("Scaler", :x_factor))
+
 op.on(" -t", "--trim", Float, toold("StartTrim"),  &tool("StartTrim")) # Before slip!
 op.on(" -s", "--slip FRAMES", Integer, toold("Slipper"), &tool("Slipper", :slip))
 op.on(" -g", "--golden", toold("Golden"), &tool("Golden"))

data/lib/export/base.rb

@@ -64,13 +64,14 @@ class Tracksperanto::Export::Base
   # Called on tracker start, once for each tracker. Receives the name of the tracker.
   def start_tracker_segment(tracker_name)
   end
+
+  # Called for each tracker keyframe, with the Tracksperanto internal coordinates and frame numbers.
+  # The calls come after start_tracker_segment and before end_tracker_segment
+  def export_point(at_frame_i, abs_float_x, abs_float_y, float_residual)
+  end
   
   # Called on tracker end, once for each tracker
   def end_tracker_segment
   end
   
-  # Called for each tracker keyframe, with the Tracksperanto internal coordinates and frame numbers.
-  # The calls come after start_tracker_segment and before end_tracker_segment
-  def export_point(at_frame_i, abs_float_x, abs_float_y, float_residual)
-  end
 end

data/lib/import/flame_stabilizer.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'flame_channel_parser'
+
 class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
   
   # Flame setups contain clear size indications

data/lib/import/nuke_script.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'tickly'
 
 class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base

data/lib/import/shake_grammar/lexer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'bychar'
 
 module Tracksperanto::ShakeGrammar
@@ -27,13 +28,13 @@ module Tracksperanto::ShakeGrammar
       # that will cache in chunks, and then read from there byte by byte. This yields a substantial speedup (4.9 seconds for the test
       # as opposed to 7.9 without this). We do check for the proper class only once so that when we use nested lexers
       # we only wrap the passed IO once, and only if necessary.
-      with_io = Bychar::Reader.new(with_io) unless with_io.respond_to?(:read_one_byte)
+      with_io = Bychar.wrap(with_io) unless with_io.respond_to?(:read_one_char!)
       @io, @stack, @buf, @sentinel, @limit_to_one_stmt, @stack_depth  = with_io, [], '', sentinel, limit_to_one_stmt, stack_depth
       
       catch(STOP_TOKEN) do
         begin
           loop { parse }
-        rescue Bychar::EOFError
+        rescue Bychar::EOF
         end
       end
       
@@ -53,7 +54,7 @@ module Tracksperanto::ShakeGrammar
     
     def parse
       
-      c = @io.read_one_byte!
+      c = @io.read_one_char!
       
       if @buf.length > MAX_BUFFER_SIZE # Wrong format and the buffer is filled up, bail
         raise WrongInputError, "Atom buffer overflow at #{MAX_BUFFER_SIZE} bytes, this is definitely not a Shake script"

data/lib/pipeline/base.rb

@@ -1,4 +1,8 @@
 # -*- encoding : utf-8 -*-
+
+require 'progressive_io'
+require 'obuf'
+
 module Tracksperanto::Pipeline
 
   class EmptySourceFileError < RuntimeError
@@ -213,9 +217,9 @@ module Tracksperanto::Pipeline
   # Setup output files and return a single output
   # that replays to all of them
   def setup_outputs_for(input_file_path)
-    file_name = File.basename(input_file_path).gsub(EXTENSION, '')
+    file_name_without_extension = File.basename(input_file_path, '.*')
     outputs = (exporters || Tracksperanto.exporters).map do | exporter_class |
-      export_name = [file_name, exporter_class.desc_and_extension].join("_")
+      export_name = [file_name_without_extension, exporter_class.desc_and_extension].join("_")
       export_path = File.join(File.dirname(input_file_path), export_name)
       exporter_class.new(open_owned_export_file(export_path))
     end

data/lib/tracksperanto.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
-%w( stringio delegate tempfile flame_channel_parser obuf progressive_io ).map(&method(:require))
+%w( stringio delegate tempfile ).map(&method(:require))
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.2.2'
+  VERSION = '3.3.6'
   
   module Import; end
   module Export; end

data/test/export/test_flame_stabilizer_cornerpin_export.rb

@@ -47,6 +47,8 @@ class FlameStabilizerCornerpinExportTest < Test::Unit::TestCase
     x = Tracksperanto::Export::FlameStabilizerCornerpin.new(s)
     x.just_export(trackers, 1920, 1080)
     
+    s.rewind
+    
     assert_same_buffer(File.open(P2), s)
   end
   
@@ -63,6 +65,8 @@ class FlameStabilizerCornerpinExportTest < Test::Unit::TestCase
     x = Tracksperanto::Export::FlameStabilizerCornerpin.new(s)
     x.just_export(trackers, 1920, 1080)
     
+    s.rewind
+    
     assert_same_buffer(File.open(P3), s)
   end
 end

data/test/helper.rb

@@ -2,17 +2,18 @@
 require "rubygems"
 require File.dirname(__FILE__) + '/../lib/tracksperanto' unless defined?(Tracksperanto)
 require 'test/unit'
-require 'flexmock'
-require 'flexmock/test_unit'
-require 'approximately'
 require 'fileutils'
 
+require 'bundler'
+Bundler.require :development
+
 unless File.exist?(File.dirname(__FILE__) + "/import/samples")
   puts "Please run tests on a git checkout from http://github.com/guerilla-di/tracksperanto"
   puts "so that you also have the 17-something megs of the test corpus to test against. Aborting."
   exit 1
 end
 
+# We are limited to flexmock 0.8 on Ruby 1.8
 # http://redmine.ruby-lang.org/issues/4882
 # https://github.com/jimweirich/flexmock/issues/4
 # https://github.com/julik/flexmock/commit/4acea00677e7b558bd564ec7c7630f0b27d368ca
@@ -22,6 +23,22 @@ class FlexMock::PartialMockProxy
   end
 end
 
+class Test::Unit::TestCase
+  # Runs the block with a temporary directory. The directory will be removed
+  # when the block completes. The path to the directory will be yielded to the block
+  def in_temp_dir
+    old_dir = Dir.pwd
+    begin
+      Dir.mktmpdir do | where |
+        Dir.chdir(where)
+        yield(where)
+      end
+    ensure
+      Dir.chdir(old_dir)
+    end
+  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
@@ -94,21 +111,9 @@ module ParabolicTracks
     flunk "The test output was overwritten, so this test is meaningless"
   end
   
-  def assert_same_buffer(ref_buffer, actual_buffer, message = "The line should be identical")
-    [ref_buffer, actual_buffer].each{|io| io.rewind }
-    
-    # There are subtle differences in how IO is handled on dfferent platforms (Darwin)
-    lineno = 0
-    begin
-      loop do
-        return if ref_buffer.eof? && actual_buffer.eof?
-        lineno += 1
-        ref_line, actual_line = ref_buffer.readline, actual_buffer.readline
-        assert_equal ref_line, actual_line, "Mismatch on line #{lineno}:"
-      end
-    rescue EOFError
-      flunk "One of the buffers was too short at #{lineno}"
-    end
+  # for assert_same_buffer
+  def self.included(into)
+    into.send(:include, LineByLine::Assertions)
   end
   
   def ensure_same_output(exporter_klass, reference_path, message = "The line should be identical")
@@ -118,6 +123,7 @@ module ParabolicTracks
       create_reference_output(exporter_klass, reference_path) do | x |
         yield(x) if block_given?
       end
+      flunk
       return
     end
     
@@ -126,6 +132,8 @@ module ParabolicTracks
     yield(x) if block_given?
     export_parabolics_with(x)
     
+    io.rewind
+    
     assert_same_buffer(File.open(reference_path, "r"), io, message)
   end
   

data/test/test_cli.rb

@@ -4,16 +4,15 @@ require "set"
 require "cli_test"
 
 class TestCli < Test::Unit::TestCase
-  TEMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp")
   BIN_P = File.expand_path(File.dirname(__FILE__) + "/../bin/tracksperanto")
   
-  def setup
-    Dir.mkdir(TEMP_DIR) unless File.exist?(TEMP_DIR)
-    FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
-  end
-  
-  def teardown
-    FileUtils.rm_rf(TEMP_DIR)
+  # Wraps in_temp_dir but sneaks a prefab file into it
+  def with_stabilizer_in_temp_dir
+    test_f = File.expand_path(File.dirname(__FILE__)) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer"
+    in_temp_dir do | where |
+      FileUtils.cp(test_f, where + "/flm.stabilizer")
+      yield(where)
+    end
   end
   
   # Run the tracksperanto binary with passed options, and return [exit_code, stdout_content, stderr_content]
@@ -28,43 +27,52 @@ class TestCli < Test::Unit::TestCase
   end
   
   def test_cli_with_nonexisting_file
-    status, o, e = cli(TEMP_DIR + "/nonexisting.file")
-    assert_equal 1, status
-    assert_match /Input file #{TEMP_DIR + "/nonexisting.file"} does not exist/, e
+    with_stabilizer_in_temp_dir do 
+      status, o, e = cli("nonexisting.file")
+      assert_equal 1, status
+      assert_match /file does not exist/, e
+    end
   end
     
   def test_basic_cli
-    status, o, e = cli(TEMP_DIR + "/flm.stabilizer")
-    assert_equal 0, status, "Should exit with a normal status"
-    fs = %w(. .. 
-      flm.stabilizer flm_3de_v3.txt flm_3de_v4.txt flm_boujou_text.txt flm_flame.stabilizer 
-      flm_matchmover.rz2 flm_mayalive.txt flm_nuke.nk flm_pftrack_2011_pfmatchit.txt flm_pftrack_v4.2dt
-      flm_pftrack_v5.2dt flm_shake_trackers.txt flm_syntheyes_2dt.txt flm_flame_cornerpin.stabilizer 
-      flm_tracksperanto_ruby.rb flm_mayaLocators.ma flm_createNulls.jsx flm_xsi_nulls.py flm_nuke_cam_trk_autotracks.txt flm_3dsmax_nulls.ms
-    )
-    assert_match /Found and converted 1 trackers with 232 keyframes\./, o, "Should have output coversion statistics"
-    assert_same_set fs, Dir.entries(TEMP_DIR)
+    with_stabilizer_in_temp_dir do | d |
+      status, o, e = cli("flm.stabilizer")
+      assert_equal 0, status, "Should exit with a normal status (error was #{e})"
+      fs = %w(. .. 
+        flm.stabilizer flm_3de_v3.txt flm_3de_v4.txt flm_boujou_text.txt flm_flame.stabilizer 
+        flm_matchmover.rz2 flm_mayalive.txt flm_nuke.nk flm_pftrack_2011_pfmatchit.txt flm_pftrack_v4.2dt
+        flm_pftrack_v5.2dt flm_shake_trackers.txt flm_syntheyes_2dt.txt flm_flame_cornerpin.stabilizer 
+        flm_tracksperanto_ruby.rb flm_mayaLocators.ma flm_createNulls.jsx flm_xsi_nulls.py flm_nuke_cam_trk_autotracks.txt flm_3dsmax_nulls.ms
+      )
+      assert_match /Found and converted 1 trackers with 232 keyframes\./, o, "Should have output coversion statistics"
+      assert_same_set fs, Dir.entries(d)
+    end
   end
   
   def test_cli_with_nonexisting_only_exporter_prints_proper_error_message
-    status, o, e = cli("--only microsoftfuckingword " + TEMP_DIR + "/flm.stabilizer")
-    assert_not_equal 0, status, "Should exit with abnormal state"
-    assert e.include?("Unknown exporter \"microsoftfuckingword\"")
-    assert e.include?("The following export modules are available")
+    with_stabilizer_in_temp_dir do
+      status, o, e = cli("--only microsoftfuckingword flm.stabilizer")
+      assert_not_equal 0, status, "Should exit with abnormal state"
+      assert e.include?("Unknown exporter \"microsoftfuckingword\"")
+      assert e.include?("The following export modules are available")
+    end
   end
   
   def test_cli_with_nonexisting_importer_prints_proper_error_message
-    status, o, e = cli("--from microsoftfuckingword " + TEMP_DIR + "/flm.stabilizer")
-    assert_not_equal 0, status, "Should exit with abnormal state"
-    assert e.include?("Unknown importer \"microsoftfuckingword\"")
-    assert e.include?("The following import modules are available")
+    with_stabilizer_in_temp_dir do
+      status, o, e = cli("--from microsoftfuckingword  flm.stabilizer")
+      assert_not_equal 0, status, "Should exit with abnormal state"
+      assert e.include?("Unknown importer \"microsoftfuckingword\"")
+      assert e.include?("The following import modules are available")
+    end
   end
   
   def test_cli_with_only_option
-    FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
-    cli("#{BIN_P} --only syntheyes #{TEMP_DIR}/flm.stabilizer")
-    fs = %w(. ..  flm.stabilizer flm_syntheyes_2dt.txt )
-    assert_same_set fs, Dir.entries(TEMP_DIR)
+    with_stabilizer_in_temp_dir do | d |
+      cli("#{BIN_P} --only syntheyes flm.stabilizer")
+      fs = %w(. ..  flm.stabilizer flm_syntheyes_2dt.txt )
+      assert_same_set fs, Dir.entries(d)
+    end
   end
   
   # TODO: This currently hangs in testing
@@ -74,20 +82,21 @@ class TestCli < Test::Unit::TestCase
   # end
   
   def test_cli_reformat
-    FileUtils.cp(File.dirname(__FILE__) + "/import/samples/flame_stabilizer/fromCombustion_fromMidClip_wSnap.stabilizer", TEMP_DIR + "/flm.stabilizer")
-    cli("--reformat-x 1204 --reformat-y 340 --only flamestabilizer #{TEMP_DIR}/flm.stabilizer")
-    
-    p = Tracksperanto::Import::FlameStabilizer.new(:io => File.open(TEMP_DIR + "/flm_flame.stabilizer"))
-    items = p.to_a
-    assert_equal 1204, p.width, "The width of the converted setup should be that"
-    assert_equal 340, p.height, "The height of the converted setup should be that"
+    with_stabilizer_in_temp_dir do | d |
+      cli("--reformat-x 1204 --reformat-y 340 --only flamestabilizer flm.stabilizer")
+      p = Tracksperanto::Import::FlameStabilizer.new(:io => File.open(d + "/flm_flame.stabilizer"))
+      items = p.to_a
+      assert_equal 1204, p.width, "The width of the converted setup should be that"
+      assert_equal 340, p.height, "The height of the converted setup should be that"
+    end
   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
+    with_stabilizer_in_temp_dir do | d |
+      results = cli("--slip -8000 --trim --only flamestabilizer flm.stabilizer")
+      assert_not_equal 0, results[0] # status
+      assert_match /There were no trackers exported/, results[-1] # STDERR
+    end
   end
   
   # We use this instead of assert_equals for arrays of file names since different filesystems

data/test/test_pipeline.rb

@@ -3,14 +3,8 @@ require File.expand_path(File.dirname(__FILE__)) + '/helper'
 
 class TestPipeline < Test::Unit::TestCase
   
-  def setup
-    @old_dir = Dir.pwd
-    Dir.chdir(File.dirname(__FILE__))
-    super
-  end
-  
   def create_stabilizer_file
-    @stabilizer = "./input.stabilizer"
+    @stabilizer = "input.stabilizer"
     trackers = %w( Foo Bar Baz).map do | name |
       t = Tracksperanto::Tracker.new(:name => name)
       t.keyframe!(:frame => 3, :abs_x => 100, :abs_y => 200)
@@ -25,144 +19,166 @@ class TestPipeline < Test::Unit::TestCase
     end
   end
   
-  def teardown
-     Dir.glob("./input*.*").each(&File.method(:unlink))
-     Dir.chdir(@old_dir)
-     super
-  end
-  
   def test_supports_block_init
     pipeline = Tracksperanto::Pipeline::Base.new(:tool_tuples => [:a, :b])
     assert_equal [:a, :b], pipeline.tool_tuples
   end
   
   def test_run_with_autodetected_importer_and_size_without_progress_block
-    create_stabilizer_file
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_nothing_raised { pipeline.run(@stabilizer) }
-    assert_equal 3, pipeline.converted_points
-    assert_equal 9, pipeline.converted_keyframes, "Should report conversion of 9 keyframes"
+    in_temp_dir do
+      create_stabilizer_file
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_nothing_raised { pipeline.run(@stabilizer) }
+      assert_equal 3, pipeline.converted_points
+      assert_equal 9, pipeline.converted_keyframes, "Should report conversion of 9 keyframes"
+    end
   end
   
   def test_run_with_error_picks_up_known_snags_from_importer
-    create_stabilizer_file
-    pipeline = Tracksperanto::Pipeline::Base.new
-    flexmock(Tracksperanto::Import::ShakeScript).should_receive(:known_snags).times(1)
-    assert_raise(Tracksperanto::Pipeline::NoTrackersRecoveredError) do
-      pipeline.run(@stabilizer, :importer => "ShakeScript", :width => 2910, :height => 1080)
+    in_temp_dir do
+      create_stabilizer_file
+      pipeline = Tracksperanto::Pipeline::Base.new
+      flexmock(Tracksperanto::Import::ShakeScript).should_receive(:known_snags).times(1)
+      assert_raise(Tracksperanto::Pipeline::NoTrackersRecoveredError) do
+        pipeline.run(@stabilizer, :importer => "ShakeScript", :width => 2910, :height => 1080)
+      end
     end
   end
   
   def test_run_with_autodetected_importer_and_size_with_progress_block
-    create_stabilizer_file
-    processing_log = ""
-    accum = lambda do | percent, message |
-      processing_log << ("%d -> %s\n" % [percent, message])
-    end
+    in_temp_dir do
+      create_stabilizer_file
+      processing_log = ""
+      accum = lambda do | percent, message |
+        processing_log << ("%d -> %s\n" % [percent, message])
+      end
     
-    pipeline = Tracksperanto::Pipeline::Base.new(:progress_block => accum)
-    assert_nothing_raised { pipeline.run(@stabilizer) }
-    assert processing_log.include?("Parsing the file")
-    assert processing_log.include?("Parsing channel \"tracker1/ref/y\"")
+      pipeline = Tracksperanto::Pipeline::Base.new(:progress_block => accum)
+      assert_nothing_raised { pipeline.run(@stabilizer) }
+      assert processing_log.include?("Parsing the file")
+      assert processing_log.include?("Parsing channel \"tracker1/ref/y\"")
+    end
   end
   
   def test_run_returns_the_number_of_trackers_and_keyframes_processed
-    create_stabilizer_file
-    pipeline = Tracksperanto::Pipeline::Base.new
-    result = pipeline.run(@stabilizer)
-    assert_equal [3, 9], result
+    in_temp_dir do
+      create_stabilizer_file
+      pipeline = Tracksperanto::Pipeline::Base.new
+      result = pipeline.run(@stabilizer)
+      assert_equal [3, 9], result
+    end
   end
 
   def test_run_crashes_with_empty_file
-    empty_file_path = "./input_empty.stabilizer"
-    f = File.open(empty_file_path, "w"){|f| f.write('') }
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_raise(Tracksperanto::Pipeline::EmptySourceFileError) { pipeline.run(empty_file_path) }
+    in_temp_dir do
+      empty_file_path = "input_empty.stabilizer"
+      f = File.open(empty_file_path, "w"){|f| f.write('') }
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_raise(Tracksperanto::Pipeline::EmptySourceFileError) { pipeline.run(empty_file_path) }
+    end
   end
   
   def test_run_crashes_with_no_trackers
-    empty_file_path = "./input_empty.stabilizer"
-    f = File.open(empty_file_path, "w"){|f| f.write('xx') }
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_raise(Tracksperanto::Pipeline::NoTrackersRecoveredError) { pipeline.run(empty_file_path) }
+    in_temp_dir do
+      empty_file_path = "input_empty.stabilizer"
+      f = File.open(empty_file_path, "w"){|f| f.write('xx') }
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_raise(Tracksperanto::Pipeline::NoTrackersRecoveredError) { pipeline.run(empty_file_path) }
+    end
   end
   
   def test_tool_initialization_from_tuples
-    create_stabilizer_file
+    in_temp_dir do
+      create_stabilizer_file
     
-    pipeline = Tracksperanto::Pipeline::Base.new
-    pipeline.tool_tuples = [
-      ["Bla", {:foo=> 234}]
-    ]
+      pipeline = Tracksperanto::Pipeline::Base.new
+      pipeline.tool_tuples = [
+        ["Bla", {:foo=> 234}]
+      ]
     
-    mock_mux = flexmock("MUX")
-    mock_lint = flexmock("LINT")
-    flexmock(Tracksperanto::Export::Mux).should_receive(:new).and_return(mock_mux)
-    flexmock(Tracksperanto::Tool::Lint).should_receive(:new).with(mock_mux).and_return(mock_lint)
+      mock_mux = flexmock("MUX")
+      mock_lint = flexmock("LINT")
+      flexmock(Tracksperanto::Export::Mux).should_receive(:new).and_return(mock_mux)
+      flexmock(Tracksperanto::Tool::Lint).should_receive(:new).with(mock_mux).and_return(mock_lint)
 
-    m = flexmock("tool object")
-    mock_tool_class = flexmock("tool class")
+      m = flexmock("tool object")
+      mock_tool_class = flexmock("tool class")
     
-    flexmock(Tracksperanto).should_receive(:get_tool).with("Bla").once.and_return(mock_tool_class)
-    mock_tool_class.should_receive(:new).with(mock_lint, {:foo => 234}).once
+      flexmock(Tracksperanto).should_receive(:get_tool).with("Bla").once.and_return(mock_tool_class)
+      mock_tool_class.should_receive(:new).with(mock_lint, {:foo => 234}).once
     
-    assert_raise(NoMethodError) { pipeline.run(@stabilizer) }
+      assert_raise(NoMethodError) { pipeline.run(@stabilizer) }
+    end
   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
-    assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("./input.shk") }
+    in_temp_dir do
+      FileUtils.cp( File.dirname(__FILE__) + "/import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "input.shk")
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("input.shk") }
+    end
   end
   
   def test_run_with_autodetected_importer_that_requires_size_when_size_supplied
-    FileUtils.cp("./import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "./input.shk")
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_nothing_raised { pipeline.run("./input.shk", :width => 720, :height => 576) }
+    in_temp_dir do
+      FileUtils.cp( File.dirname(__FILE__) + "/import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "input.shk")
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_nothing_raised { pipeline.run("input.shk", :width => 720, :height => 576) }
+    end
   end
   
   def test_run_with_overridden_importer_and_no_size
-    FileUtils.cp("./import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "./input.shk")
-    pipeline = Tracksperanto::Pipeline::Base.new
-    num_exporters = Tracksperanto.exporters.length
-    assert_nothing_raised { pipeline.run("./input.shk", :importer => "ShakeScript", :width => 720, :height => 576) }
-    assert_equal num_exporters, Dir.glob("./input_*").length, "#{num_exporters} files should be present for the input and outputs"
+    in_temp_dir do
+      FileUtils.cp( File.dirname(__FILE__) + "/import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "input.shk")
+      pipeline = Tracksperanto::Pipeline::Base.new
+      num_exporters = Tracksperanto.exporters.length
+      assert_nothing_raised { pipeline.run("input.shk", :importer => "ShakeScript", :width => 720, :height => 576) }
+      assert_equal num_exporters, Dir.glob("input_*").length, "#{num_exporters} files should be present for the input and outputs"
+    end
   end
   
   def test_run_with_overridden_importer_and_size_for_file_that_would_be_recognized_differently
-    FileUtils.cp("./import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "./input.stabilizer")
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_nothing_raised { pipeline.run("./input.stabilizer", :importer => "ShakeScript", :width => 720, :height => 576) }
+    in_temp_dir do
+      FileUtils.cp( File.dirname(__FILE__) + "/import/samples/shake_script/four_tracks_in_one_stabilizer.shk", "input.stabilizer")
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_nothing_raised { pipeline.run("input.stabilizer", :importer => "ShakeScript", :width => 720, :height => 576) }
+    end
   end
   
   def test_run_with_unknown_format_raises
-    File.open("./input.txt", "w"){|f| f.write("foo") }
+    in_temp_dir do
+      File.open("input.txt", "w"){|f| f.write("foo") }
     
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("./input.txt") }
-    assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("./input.txt", :width => 100, :height => 100) }
-    assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("./input.txt", :importer => "Syntheyes") }
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("input.txt") }
+      assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("input.txt", :width => 100, :height => 100) }
+      assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("input.txt", :importer => "Syntheyes") }
+    end
   end
   
   def test_importing_file_with_trackers_of_zero_length_does_not_accumulate_any_trackers
-    pft_with_empty_trackers = "./import/samples/pftrack5/empty_trackers.2dt"
-    i = Tracksperanto::Import::PFTrack.new(:io => File.open(pft_with_empty_trackers), :width => 1920, :height => 1080)
-    tks = i.to_a
-    assert_equal 3, tks.length
-    assert_equal 0, tks[0].length, "The tracker should have 0 keyframes for this test to make sense"
+    in_temp_dir do
+      pft_with_empty_trackers = File.dirname(__FILE__) + "/import/samples/pftrack5/empty_trackers.2dt"
+      i = Tracksperanto::Import::PFTrack.new(:io => File.open(pft_with_empty_trackers), :width => 1920, :height => 1080)
+      tks = i.to_a
+      assert_equal 3, tks.length
+      assert_equal 0, tks[0].length, "The tracker should have 0 keyframes for this test to make sense"
     
-    FileUtils.cp(pft_with_empty_trackers, "./input_empty.2dt")
+      FileUtils.cp(pft_with_empty_trackers, "input_empty.2dt")
     
-    pipeline = Tracksperanto::Pipeline::Base.new
-    num_t, num_k = pipeline.run("./input_empty.2dt", :width => 1920, :height => 1080)
-    assert_equal 1, num_t, "Only one tracker should have been sent through the export"
+      pipeline = Tracksperanto::Pipeline::Base.new
+      num_t, num_k = pipeline.run("input_empty.2dt", :width => 1920, :height => 1080)
+      assert_equal 1, num_t, "Only one tracker should have been sent through the export"
+    end
   end
   
   def test_run_with_overridden_importer_and_size
-    FileUtils.cp("./import/samples/3de_v4/3de_export_cube.txt", "./input.txt")
-    pipeline = Tracksperanto::Pipeline::Base.new
-    assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("./input.txt", :importer => "Equalizer4") }
-    assert_nothing_raised { pipeline.run("./input.txt", :importer => "Equalizer4", :width => 720, :height => 576) }
+    in_temp_dir do
+      FileUtils.cp( File.dirname(__FILE__) + "/import/samples/3de_v4/3de_export_cube.txt", "input.txt")
+      pipeline = Tracksperanto::Pipeline::Base.new
+      assert_raise(Tracksperanto::Pipeline::DimensionsRequiredError) { pipeline.run("input.txt", :importer => "Equalizer4") }
+      assert_nothing_raised { pipeline.run("input.txt", :importer => "Equalizer4", :width => 720, :height => 576) }
+    end
   end
   
 end

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.3.0.pre"
+  s.version = "3.3.6"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-22"
+  s.date = "2013-04-04"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -209,50 +209,53 @@ 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<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_runtime_dependency(%q<tickly>, ["~> 2.0"])
-      s.add_runtime_dependency(%q<bychar>, [">= 0"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 2.1"])
+      s.add_runtime_dependency(%q<bychar>, ["~> 2"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_runtime_dependency(%q<progressbar>, ["= 0.10.0"])
       s.add_runtime_dependency(%q<update_hints>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<approximately>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<linebyline>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, ["~> 1.3"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_development_dependency(%q<rake-hooks>, [">= 0"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_dependency(%q<tickly>, ["~> 2.0"])
-      s.add_dependency(%q<bychar>, [">= 0"])
+      s.add_dependency(%q<tickly>, ["~> 2.1"])
+      s.add_dependency(%q<bychar>, ["~> 2"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
       s.add_dependency(%q<progressbar>, ["= 0.10.0"])
       s.add_dependency(%q<update_hints>, ["~> 1.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<approximately>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<linebyline>, [">= 0"])
       s.add_dependency(%q<flexmock>, ["~> 1.3"])
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_dependency(%q<rake-hooks>, [">= 0"])
       s.add_dependency(%q<ruby-prof>, [">= 0"])
     end
   else
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<obuf>, ["~> 1.1"])
-    s.add_dependency(%q<tickly>, ["~> 2.0"])
-    s.add_dependency(%q<bychar>, [">= 0"])
+    s.add_dependency(%q<tickly>, ["~> 2.1"])
+    s.add_dependency(%q<bychar>, ["~> 2"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
     s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
     s.add_dependency(%q<progressbar>, ["= 0.10.0"])
     s.add_dependency(%q<update_hints>, ["~> 1.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<approximately>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<linebyline>, [">= 0"])
     s.add_dependency(%q<flexmock>, ["~> 1.3"])
     s.add_dependency(%q<cli_test>, ["~> 1.0"])
     s.add_dependency(%q<rake-hooks>, [">= 0"])

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre
-  prerelease: 6
+  version: 3.3.6
+  prerelease: 
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: obuf
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,23 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bychar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: progressive_io
   requirement: !ruby/object:Gem::Requirement
@@ -124,14 +140,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: approximately
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -140,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: approximately
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: linebyline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -456,13 +472,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 506904342212099543
+      hash: -4545677537433489103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24