tracksperanto 3.4.1 → 3.5.0

data/Gemfile

@@ -15,20 +15,15 @@ gem "update_hints", "~> 1.0"
 group :development do
   gem "approximately"
   
-  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 )
+  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 "flexmock", "~> 0.8", :require => %w( flexmock flexmock/test_unit )
+    gem "jeweler", '~> 1.8'
+    gem "flexmock", "~> 1.3.2", :require => %w( flexmock flexmock/test_unit )
   end
   
   gem "cli_test", "~>1.0"

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.5.0
+
+* Add early bailout if unsupported formats are fed in. Because some people just can't read.
+
 === 3.4.1
 
 * Fix parsing of curve expressions with modifiers in Nuke scripts

data/lib/pipeline/base.rb

@@ -93,6 +93,9 @@ module Tracksperanto::Pipeline
   # Returns the number of trackers and the number of keyframes processed during the run
   def run(from_input_file_path, passed_options = {})
     
+    # Prevent formats that we do not support
+    Tracksperanto::Blacklist.raise_if_format_unsupported(from_input_file_path)
+    
     # Check for empty files
     raise EmptySourceFileError if File.stat(from_input_file_path).size.zero?
     

data/lib/tracksperanto.rb

@@ -5,13 +5,14 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.4.1'
+  VERSION = '3.5.0'
   
   module Import; end
   module Export; end
   module Tool; end
   module Pipeline; end
   
+  class UnsupportedFormatError < NameError; end
   class UnknownExporterError < NameError; end
   class UnknownImporterError < NameError; end
   class UnknownToolError < NameError; end
@@ -108,6 +109,7 @@ end
   parameters
   yield_non_empty
   pf_coords
+  blacklist
 ).each do | submodule |
   require File.join(Tracksperanto::PATH, "tracksperanto", submodule)
 end

data/lib/tracksperanto/blacklist.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+class Tracksperanto::Blacklist
+  
+  # Prevent totally unsupported formats from being used
+  def self.raise_if_format_unsupported(judging_from_file_path)
+    extension = File.extname(judging_from_file_path).downcase
+    formats_and_extensions.each_pair do | matcher, message |
+      raise Tracksperanto::UnsupportedFormatError, message if matcher.is_a?(String) && extension == matcher
+      raise Tracksperanto::UnsupportedFormatError, message if matcher.is_a?(Regexp) && extension =~ matcher
+    end
+  end
+  
+  def self.formats_and_extensions
+    {
+      '.ma' =>  'We cannot import Maya ASCII files directly. For processing Maya Live tracks export them from Maya.',
+      '.mb' => 'We cannot import Maya ASCII files directly. For processing Maya Live tracks export them from Maya.',
+      /\.(mov|avi|xvid|mp4)$/ => 'Tracksperanto is not a tracking application, it converts tracks. We do not support movie file formats.',
+      /\.(r3d)$/ => 'Tracksperanto is not a tracking application, it converts tracks. We do not support RAW file formats.',
+      /\.(dpx|tif(f?)|jp(e?)g|png|gif|tga)$/ => 'Tracksperanto is not a tracking application, it converts tracks. We do not support image file formats.',
+      '.sni' => 'We cannot read binary SynthEyes scene files. Export your tracks as one of the supported formats.',
+      '.pfb' => 'We cannot directly open PFTrack projects, export .2dt files instead',
+      '.mmf' => 'We cannot directly open MatchMover projects, please export your tracks as .rz2 instead',
+    }
+  end
+end

data/test/test_blacklist.rb

@@ -0,0 +1,36 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+class TestBlacklist < Test::Unit::TestCase
+  
+  def test_non_blacklisted_formats
+    %( file.txt file.2dt file.stabilizer ).each do | filename |
+      Tracksperanto::Blacklist.raise_if_format_unsupported(filename)
+    end
+    assert true, 'No exceptions should have been raised'
+  end
+  
+  def test_blacklisted_formats
+    %w(
+      file.jpg
+      file.tif
+      file.tiff
+      file.mov
+      file.r3d
+      file.dpx
+      file.jpg
+      file.gif
+      file.PNG
+      file.sni
+      file.ma
+      file.mb
+      file.pfb
+      file.mmf
+    ).each do | filename |
+      error = assert_raise(Tracksperanto::UnsupportedFormatError, "Should fail for #{filename.inspect}") do
+        Tracksperanto::Blacklist.raise_if_format_unsupported(filename)
+      end
+      assert_operator error.message.length, :>, 5, 'Should contain a descriptive error message'
+    end
+  end
+end

data/test/test_pipeline.rb

@@ -45,6 +45,15 @@ class TestPipeline < Test::Unit::TestCase
     end
   end
   
+  def test_run_for_unsupported_format_raises_exception
+    pipeline = Tracksperanto::Pipeline::Base.new
+    %w( file.MOV file.mb vfx/shots/file.SNI ).each do | path |
+      assert_raise(Tracksperanto::UnsupportedFormatError) do
+        pipeline.run(path)
+      end
+    end
+  end
+  
   def test_run_with_autodetected_importer_and_size_with_progress_block
     in_temp_dir do
       create_stabilizer_file

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.4.1"
+  s.version = "3.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-03-05}
+  s.date = %q{2014-06-26}
   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}
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
     "lib/tools/slipper.rb",
     "lib/tools/start_trim.rb",
     "lib/tracksperanto.rb",
+    "lib/tracksperanto/blacklist.rb",
     "lib/tracksperanto/block_init.rb",
     "lib/tracksperanto/buffer_io.rb",
     "lib/tracksperanto/casts.rb",
@@ -172,6 +173,7 @@ Gem::Specification.new do |s|
     "test/subpixel/subpixel_grid.sni",
     "test/subpixel/subpixel_grid.tif",
     "test/subpixel/sy_subpix_2dpaths.txt",
+    "test/test_blacklist.rb",
     "test/test_block_init.rb",
     "test/test_buffer_io.rb",
     "test/test_casts.rb",
@@ -226,10 +228,10 @@ Gem::Specification.new do |s|
       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>, ["~> 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<jeweler>, ["= 1.8.4"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_development_dependency(%q<rake-hooks>, ["~> 1.2.3"])
     else
@@ -242,10 +244,10 @@ Gem::Specification.new do |s|
       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>, ["~> 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<jeweler>, ["= 1.8.4"])
+      s.add_dependency(%q<flexmock>, ["~> 0.8"])
       s.add_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_dependency(%q<rake-hooks>, ["~> 1.2.3"])
     end
@@ -259,10 +261,10 @@ Gem::Specification.new do |s|
     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>, ["~> 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<jeweler>, ["= 1.8.4"])
+    s.add_dependency(%q<flexmock>, ["~> 0.8"])
     s.add_dependency(%q<cli_test>, ["~> 1.0"])
     s.add_dependency(%q<rake-hooks>, ["~> 1.2.3"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 3
-  - 4
-  - 1
-  version: 3.4.1
+  - 5
+  - 0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-05 00:00:00 +01:00
+date: 2014-06-26 00:00:00 +02:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,16 +156,14 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 3
         segments: 
-        - 1
-        - 8
-        - 8
-        version: 1.8.8
+        - 0
+        version: "0"
   type: :development
-  name: jeweler
+  name: rake
   version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -179,21 +177,23 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rake
+  name: linebyline
   version_requirements: *id011
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 8
+        - 4
+        version: 1.8.4
   type: :development
-  name: linebyline
+  name: jeweler
   version_requirements: *id012
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -202,12 +202,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+        - 0
+        - 8
+        version: "0.8"
   type: :development
   name: flexmock
   version_requirements: *id013
@@ -317,6 +316,7 @@ files:
 - lib/tools/slipper.rb
 - lib/tools/start_trim.rb
 - lib/tracksperanto.rb
+- lib/tracksperanto/blacklist.rb
 - lib/tracksperanto/block_init.rb
 - lib/tracksperanto/buffer_io.rb
 - lib/tracksperanto/casts.rb
@@ -406,6 +406,7 @@ files:
 - test/subpixel/subpixel_grid.sni
 - test/subpixel/subpixel_grid.tif
 - test/subpixel/sy_subpix_2dpaths.txt
+- test/test_blacklist.rb
 - test/test_block_init.rb
 - test/test_buffer_io.rb
 - test/test_casts.rb