tracksperanto 3.2.1 → 3.2.2

data/Gemfile

@@ -1,18 +1,27 @@
 # -*- ruby -*-
 source :rubygems
 
-gem "tickly", "~> 0.0.4"
-gem "obuf", "~> 1.1.0"
+# gem "bychar", "~> 1.1" - controlled by Tickly
+gem "obuf", "~> 1.1"
+gem "tickly", "~> 0.0.8"
 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 "flexmock", "~>0.8"
+  
+  if RUBY_VERSION > "1.8"
+    gem "flexmock", "~> 1.3"
+  else
+    gem "flexmock", "~> 0.8"
+  end
+  
   gem "cli_test", "~>1.0"
   gem "rake-hooks"
+  gem "ruby-prof"
 end

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.2.2
+
+* Bump a whole array of dependencies to speed up and simplify Nuke and Shake parsers
+
 === 3.2.1
 
 * Improve Nuke 7 import support with the new version of Tickly

data/lib/import/nuke_script.rb

@@ -16,21 +16,11 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     'The only supported nodes that we can extract tracks from are Reconcile3D, PlanarTracker and Tracker (supported Nuke versions are 5, 6 and 7)'
   end
   
-  class Tickly::Parser
-  end
-  
-  class Levaluator < Tickly::Evaluator
-    def evaluate(expr)
-      s = super
-      yield(s) if s
-    end
-  end
-  
   def each
     parser = Tickly::NodeExtractor.new("Tracker3", "Tracker4", "PlanarTracker1_0", "Reconcile3D")
     script_tree = Tickly::Parser.new.parse(@io)
     
-    evaluator = Levaluator.new
+    evaluator = Tickly::Evaluator.new
     evaluator.add_node_handler_class(Tracker3)
     evaluator.add_node_handler_class(Reconcile3D)
     evaluator.add_node_handler_class(PlanarTracker1_0)

data/lib/import/shake_grammar/lexer.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require 'bychar'
+
 module Tracksperanto::ShakeGrammar
   class WrongInputError < RuntimeError; end
   
@@ -25,9 +27,16 @@ 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 = Tracksperanto::BufferingReader.new(with_io) unless with_io.respond_to?(:read_one_byte)
+      with_io = Bychar::Reader.new(with_io) unless with_io.respond_to?(:read_one_byte)
       @io, @stack, @buf, @sentinel, @limit_to_one_stmt, @stack_depth  = with_io, [], '', sentinel, limit_to_one_stmt, stack_depth
-      catch(STOP_TOKEN) { parse until @io.data_exhausted? }
+      
+      catch(STOP_TOKEN) do
+        begin
+          loop { parse }
+        rescue Bychar::EOFError
+        end
+      end
+      
       @in_comment ? consume_comment! : consume_atom!
     end
     
@@ -44,7 +53,7 @@ module Tracksperanto::ShakeGrammar
     
     def parse
       
-      c = @io.read_one_byte
+      c = @io.read_one_byte!
       
       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/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
   
   module Import; end
   module Export; end
@@ -100,7 +100,6 @@ end
   buffer_io
   simple_export
   uv_coordinates
-  buffering_reader
   parameters
   yield_non_empty
   pf_coords

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.2.1"
+  s.version = "3.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-14"
+  s.date = "2013-03-16"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -84,7 +84,6 @@ Gem::Specification.new do |s|
     "lib/tracksperanto.rb",
     "lib/tracksperanto/block_init.rb",
     "lib/tracksperanto/buffer_io.rb",
-    "lib/tracksperanto/buffering_reader.rb",
     "lib/tracksperanto/casts.rb",
     "lib/tracksperanto/const_name.rb",
     "lib/tracksperanto/ext_io.rb",
@@ -168,7 +167,6 @@ Gem::Specification.new do |s|
     "test/subpixel/subpixel_grid.tif",
     "test/subpixel/sy_subpix_2dpaths.txt",
     "test/test_buffer_io.rb",
-    "test/test_bufferingreader.rb",
     "test/test_casts.rb",
     "test/test_cli.rb",
     "test/test_const_name.rb",
@@ -212,8 +210,8 @@ 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<tickly>, ["~> 0.0.4"])
-      s.add_runtime_dependency(%q<obuf>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<obuf>, ["~> 1.1"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 0.0.8"])
       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"])
@@ -221,12 +219,13 @@ Gem::Specification.new do |s|
       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<flexmock>, ["~> 0.8"])
+      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<tickly>, ["~> 0.0.4"])
-      s.add_dependency(%q<obuf>, ["~> 1.1.0"])
+      s.add_dependency(%q<obuf>, ["~> 1.1"])
+      s.add_dependency(%q<tickly>, ["~> 0.0.8"])
       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"])
@@ -234,13 +233,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<approximately>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<flexmock>, ["~> 0.8"])
+      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<tickly>, ["~> 0.0.4"])
-    s.add_dependency(%q<obuf>, ["~> 1.1.0"])
+    s.add_dependency(%q<obuf>, ["~> 1.1"])
+    s.add_dependency(%q<tickly>, ["~> 0.0.8"])
     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"])
@@ -248,9 +248,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<approximately>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<flexmock>, ["~> 0.8"])
+    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
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tickly
+  name: obuf
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: obuf
+  name: tickly
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: progressive_io
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: cli_test
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Converts 2D track exports between different apps like Flame, MatchMover,
   PFTrack...
 email: me@julik.nl
@@ -279,7 +295,6 @@ files:
 - lib/tracksperanto.rb
 - lib/tracksperanto/block_init.rb
 - lib/tracksperanto/buffer_io.rb
-- lib/tracksperanto/buffering_reader.rb
 - lib/tracksperanto/casts.rb
 - lib/tracksperanto/const_name.rb
 - lib/tracksperanto/ext_io.rb
@@ -363,7 +378,6 @@ files:
 - test/subpixel/subpixel_grid.tif
 - test/subpixel/sy_subpix_2dpaths.txt
 - test/test_buffer_io.rb
-- test/test_bufferingreader.rb
 - test/test_casts.rb
 - test/test_cli.rb
 - test/test_const_name.rb
@@ -411,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1926493712064861893
+      hash: 419869014882253399
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tracksperanto/buffering_reader.rb

@@ -1,40 +0,0 @@
-# -*- encoding : utf-8 -*-
-# Shake uses this reader to parse byte by byte without having to read byte by byte.
-# Reading byte by byte is very inefficient, but we want to parse byte by byte since
-# this makes parser construction much easier. So what we do is cache some chunk of the
-# passed buffer and read from that. Once exhausted there will be some caching again,
-# and ad infinitum until the passed buffer is exhausted
-class Tracksperanto::BufferingReader
-  
-  DEFAULT_BUFFER_SIZE = 64 * 1024
-  
-  def initialize(with_io, buffer_size = DEFAULT_BUFFER_SIZE)
-    @io = with_io
-    @bufsize = buffer_size
-    @buf = StringIO.new
-  end
-  
-  # Will transparently read one byte off the contained IO, maintaining the internal cache.
-  # If the cache has been depleted it will read a big chunk from the IO and cache it and then
-  # return the byte
-  def read_one_byte
-    cache if @buf.pos == @buf.size
-    
-    return nil if @buf.size.zero?
-    return @buf.read(1)
-  end
-  
-  # Tells whether all the data has been both read from the passed buffer
-  # and from the internal cache buffer (checks whether there is anything that
-  # can be retreived using read_one_byte)
-  def data_exhausted?
-    @buf.eof? && @io.eof?
-  end
-  
-  private
-  
-  def cache
-    data = @io.read(@bufsize)
-    @buf = StringIO.new(data.to_s) # Make nil become ""
-  end
-end

data/test/test_bufferingreader.rb

@@ -1,48 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
-
-class TestBufferingReader < Test::Unit::TestCase
-  def test_reads_once
-    s = StringIO.new("This is a string")
-    
-    reader = Tracksperanto::BufferingReader.new(s)
-    assert_equal "T", reader.read_one_byte
-    assert_equal "h", reader.read_one_byte
-    assert !reader.data_exhausted?
-  end
-  
-  def test_reads_set_buffer_size
-    s = StringIO.new("abcd")
-    flexmock(s).should_receive(:read).with(4).once.and_return("abcd")
-    reader = Tracksperanto::BufferingReader.new(s, 4)
-    reader.read_one_byte
-  end
-  
-  def test_reads_in_64kb_chunks_by_default
-    s = StringIO.new("abcd")
-    flexmock(s).should_receive(:read).with(64 * 1024).once.and_return("abcd")
-    reader = Tracksperanto::BufferingReader.new(s)
-    reader.read_one_byte
-  end
-  
-  def test_eof_with_empty
-    s = StringIO.new
-    reader = Tracksperanto::BufferingReader.new(s)
-    assert s.eof?
-  end
-  
-  def test_eof_with_io_at_eof
-    s = StringIO.new("foo")
-    s.read(3)
-    reader = Tracksperanto::BufferingReader.new(s)
-    assert reader.data_exhausted?
-  end
-  
-  def test_eof_with_string_to_size
-    s = "Foobarboo another"
-    s = StringIO.new(s)
-    reader = Tracksperanto::BufferingReader.new(s, 1)
-    s.length.times { reader.read_one_byte }
-    assert reader.data_exhausted?
-  end
-end