tracksperanto 3.5.5 → 3.5.6

data/Gemfile

@@ -18,11 +18,11 @@ group :development do
   gem "rake"
   gem "linebyline"
   
+  gem "jeweler", '1.8.4' # Last one without the stupid nokogiri dependency
+  
   if RUBY_VERSION < "1.9"
-    gem "jeweler", '1.8.4' # Last one without the stupid nokogiri dependency
     gem "flexmock", "~> 0.8", :require => %w( flexmock flexmock/test_unit ) # Max. supported on 1.8
   else
-    gem "jeweler", '~> 1.8'
     gem "flexmock", "~> 1.3.2", :require => %w( flexmock flexmock/test_unit )
   end
   

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.5.6
+
+* SynthEyes has two export formats which creates confusion. Add snag messages to import moudules to hint that.
+
 === 3.5.5
 
 * Fix joining animation curves that had negative frame numbers (might happen in Nuke scripts)

data/MIT_LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Julik Tarkhanov
+Copyright (c) 2009-2015 Julik Tarkhanov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -108,7 +108,7 @@ If you want your own copy of the web application at your facility we can discuss
 * Shake .shk script file
 * Shake .txt tracker file and Nuke CameraTracker auto tracks export
 * Syntheyes "All Tracker Paths" export .txt file
-* Syntheyes 2D tracker paths file
+* Syntheyes "Tracker 2-D paths" file
  
 ### Formats Tracksperanto can export to
  
@@ -144,8 +144,8 @@ Consult the --help option to see what is available.
 
 ## Development
 
-![Gem Version](https://badge.fury.io/rb/tracksperanto.png)
-![tests](https://secure.travis-ci.org/guerilla-di/tracksperanto.png)
+[![Gem Version](https://badge.fury.io/rb/tracksperanto.svg)](http://badge.fury.io/rb/tracksperanto)
+[![Travis](https://secure.travis-ci.org/guerilla-di/tracksperanto.png)](https://travis-ci.org/guerilla-di/tracksperanto)
 
 If you are interested in reusing Tracksperanto's code or adding modules to the software consult
 the [short developer introduction](https://github.com/guerilla-di/tracksperanto/blob/master/CONTRIBUTING.md)

data/Rakefile

@@ -65,5 +65,13 @@ after :test do
   
 end
 
+# Automatically update the LICENSE
+after :test do
+  license_path = File.dirname(__FILE__) + "/MIT_LICENSE.txt"
+  license_text = File.read(license_path)
+  license_text.gsub!(/2009\-(\d+)/, "2009-#{Time.now.year + 1}")
+  File.open(license_path, "w"){|f| f << license_text }
+end
+
 task :default => [ :test ]
 

data/lib/import/syntheyes.rb

@@ -3,7 +3,13 @@ class Tracksperanto::Import::Syntheyes < Tracksperanto::Import::Base
   include Tracksperanto::UVCoordinates
   
   def self.human_name
-    "Syntheyes 2D tracker paths file"
+    "Syntheyes \"Tracker 2-D paths\" file"
+  end
+  
+  def self.known_snags
+    "Syntheyes has two formats for exporting tracks. One is called \"Tracker 2-D paths\" in the menu. " +
+    "The other is called \"All Tracker Paths\". You told Tracksperanto to treat your file as " +
+    "\"Tracker 2-D paths\", if something goes wrong might be a good idea to try the other Tracksperanto input format"
   end
   
   def each

data/lib/import/syntheyes_all_tracker_paths.rb

@@ -7,6 +7,13 @@ class Tracksperanto::Import::SyntheyesAllTrackerPaths < Tracksperanto::Import::B
   CHARACTERS_OR_QUOTES = /[AZaz"]/
   TRACKER_KEYFRAME = /^(\d+) ((\d+)\.(\d+)) ((\d+)\.(\d+))/
   
+  def self.known_snags
+    "Syntheyes has two formats for exporting tracks. One is called \"Tracker 2-D paths\" in the menu. " +
+    "The other is called \"All Tracker Paths\". You told Tracksperanto to treat your file as " +
+    "\"All Tracker Paths\", if something goes wrong might be a good idea to try the other Tracksperanto input format"
+  end
+  
+  
   def each
     t = Tracksperanto::Tracker.new
     while line = @io.gets do

data/lib/tracksperanto.rb

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

data/lib/tracksperanto/blacklist.rb

@@ -24,6 +24,7 @@ class Tracksperanto::Blacklist
       /\.(abc|fbx)$/ => 'We cannot import 3D scenes such as Alembic or FBX.',
       '.3de' => 'We cannot handle 3DE project files directly, please export your 2D tracks in a compatible format instead.',
       '.bpj' => "We cannot handle Boujou projects directly, please export your feature tracks from Boujou as a text file",
+      '.py' => 'We cannot handle Python scripts - please export your 2D tracks in a compatible format instead.'
     }
   end
 end

data/test/import/test_syntheyes_all_tracker_paths_import.rb

@@ -8,6 +8,8 @@ class SyntheyesAllPathsImportTest < Test::Unit::TestCase
     i = Tracksperanto::Import::SyntheyesAllTrackerPaths
     assert_equal "Syntheyes \"All Tracker Paths\" export .txt file", i.human_name
     assert !i.autodetects_size?
+    assert_not_nil i.known_snags
+    assert !i.known_snags.empty?
   end
   
   def test_parsing_from_importable

data/test/import/test_syntheyes_import.rb

@@ -6,8 +6,10 @@ class SyntheyesImportTest < Test::Unit::TestCase
   
   def test_introspects_properly
     i = Tracksperanto::Import::Syntheyes
-    assert_equal "Syntheyes 2D tracker paths file", i.human_name
+    assert_equal 'Syntheyes "Tracker 2-D paths" file', i.human_name
     assert !i.autodetects_size?
+    assert_not_nil i.known_snags
+    assert !i.known_snags.empty?
   end
   
   def test_parsing_from_importable

data/test/test_blacklist.rb

@@ -37,6 +37,7 @@ class TestBlacklist < Test::Unit::TestCase
       file.abc
       file.3de
       file.bpj
+      file.py
     ).each do | filename |
       error = assert_raise(Tracksperanto::UnsupportedFormatError, "Should fail for #{filename.inspect}") do
         Tracksperanto::Blacklist.raise_if_format_unsupported(filename)

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.5.5"
+  s.version = "3.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-11-24}
+  s.date = %q{2014-11-29}
   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}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 3
   - 5
-  - 5
-  version: 3.5.5
+  - 6
+  version: 3.5.6
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-11-24 00:00:00 +01:00
+date: 2014-11-29 00:00:00 +01:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency