tracksperanto 3.4.0 → 3.4.1

data/Gemfile

@@ -4,7 +4,7 @@ source 'http://rubygems.org'
 gem "bundler"
 
 gem "obuf", "~> 1.1"
-gem "tickly", "~> 2.1.4"
+gem "tickly", "~> 2.1.5"
 gem "bychar", "~> 2"
 gem "progressive_io", "~> 1.0"
 gem "flame_channel_parser", "~> 4.0"
@@ -14,16 +14,23 @@ gem "update_hints", "~> 1.0"
 
 group :development do
   gem "approximately"
-  gem "jeweler"
+  
+  if RUBY_VERSION > "1.8" # Jeweler pulls Nokogiri which does not want to build on Travis in 1.8
+    gem "jeweler", '~> 1.8.8'
+  else
+    gem "jeweler", '~> 1.8.4'
+  end
+  
   gem "rake"
   gem "linebyline"
   
   if RUBY_VERSION > "1.8"
+    # Max. supported on 1.8
     gem "flexmock", "~> 1.3.2", :require => %w( flexmock flexmock/test_unit )
   else
     gem "flexmock", "~> 0.8", :require => %w( flexmock flexmock/test_unit )
   end
   
   gem "cli_test", "~>1.0"
-  gem "rake-hooks"
+  gem "rake-hooks", '~> 1.2.3'
 end

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.4.1
+
+* Fix parsing of curve expressions with modifiers in Nuke scripts
+
 === 3.4.0
 
 * Add specific Flame/Smoke exporters for IFFS 2014 and above, including updated cornerpin order

data/Rakefile

@@ -1,7 +1,7 @@
 require './lib/tracksperanto'
-require 'jeweler'
 require 'rake/hooks'
 
+require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.version = Tracksperanto::VERSION
   gem.name = "tracksperanto"
@@ -18,13 +18,14 @@ Jeweler::Tasks.new do |gem|
   gem.files.exclude "test/import/samples"
   gem.files.exclude "test/import/samples/*/*.*"
   gem.files.exclude "test/subpixel"
-  
+
   # Do not package invisibles
   gem.files.exclude ".*"
 end
 
 Jeweler::RubygemsDotOrgTasks.new
 
+
 require 'rake/testtask'
 desc "Run all tests"
 Rake::TestTask.new("test") do |t|

data/lib/tracksperanto.rb

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

data/test/import/test_nuke_import.rb

@@ -189,6 +189,22 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 48, first_t.length
   end
   
+  def test_parsing_nuke7_start_with_curve_command
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/curve-start-with-curve-command.nk')
+    
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 2048
+    parser.height = 1556
+    trackers = parser.to_a
+    
+    assert_equal 4, trackers.length
+    first_t = trackers[0]
+    assert_equal "gun_track_track_1", first_t.name
+    assert_equal 40, first_t.length
+    assert_in_delta 1234.300049, first_t[0].abs_x, 0.001
+    assert_in_delta 738.0, first_t[0].abs_y, 0.001
+  end
+  
   def test_parsing_nuke8_tracker4
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/track_nuke8.nk')
     

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.4.0"
+  s.version = "3.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-02-22}
+  s.date = %q{2014-03-05}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Converts 2D track exports between different apps like Flame, MatchMover, PFTrack...}
   s.email = %q{me@julik.nl}
@@ -219,52 +219,52 @@ Gem::Specification.new do |s|
     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.1.4"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 2.1.5"])
       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_development_dependency(%q<approximately>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<linebyline>, [">= 0"])
       s.add_development_dependency(%q<flexmock>, ["~> 1.3.2"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
-      s.add_development_dependency(%q<rake-hooks>, [">= 0"])
+      s.add_development_dependency(%q<rake-hooks>, ["~> 1.2.3"])
     else
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<obuf>, ["~> 1.1"])
-      s.add_dependency(%q<tickly>, ["~> 2.1.4"])
+      s.add_dependency(%q<tickly>, ["~> 2.1.5"])
       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<approximately>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<linebyline>, [">= 0"])
       s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
-      s.add_dependency(%q<rake-hooks>, [">= 0"])
+      s.add_dependency(%q<rake-hooks>, ["~> 1.2.3"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<obuf>, ["~> 1.1"])
-    s.add_dependency(%q<tickly>, ["~> 2.1.4"])
+    s.add_dependency(%q<tickly>, ["~> 2.1.5"])
     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<approximately>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<linebyline>, [">= 0"])
     s.add_dependency(%q<flexmock>, ["~> 1.3.2"])
     s.add_dependency(%q<cli_test>, ["~> 1.0"])
-    s.add_dependency(%q<rake-hooks>, [">= 0"])
+    s.add_dependency(%q<rake-hooks>, ["~> 1.2.3"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 4
-  - 0
-  version: 3.4.0
+  - 1
+  version: 3.4.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-22 00:00:00 +01:00
+date: 2014-03-05 00:00:00 +01:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,12 +53,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 2
         - 1
-        - 4
-        version: 2.1.4
+        - 5
+        version: 2.1.5
   type: :runtime
   name: tickly
   version_requirements: *id003
@@ -156,12 +156,14 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 39
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 8
+        - 8
+        version: 1.8.8
   type: :development
   name: jeweler
   version_requirements: *id010
@@ -229,12 +231,14 @@ dependencies:
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
   type: :development
   name: rake-hooks
   version_requirements: *id015