flame_channel_parser 4.0.0 → 4.0.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 4.0.1 / 2011-09-11
+
+* Minor fixes
+
 === 4.0.0 / 2011-09-11
 
 * Integrate the Framecurve library. Parse TO framecurve as well as FROM to all supported timewarpers

data/bin/framecurve_from_flame

@@ -6,27 +6,20 @@ require "update_hints"
 options = {:destination => $stdout }
 op = OptionParser.new
 
-op.banner = "Usage: bake_flame_timewarp /usr/discreet/projects/ExpensiveDildo/timewarp/shot2_tw.timewarp > /mnt/3d/curves/shot2_tw.framecurve.txt"
+op.banner = "Usage: framecurve_from_flame /usr/discreet/projects/BoringBeautySpot/timewarp/shot2_tw.timewarp"
 op.on(" -s", "--startframe FRAME", 
-  Integer, "Bake the time curve from this specific frame (defaults to the end of the setup"
+  Integer, "Bake the time curve upto this specific frame (defaults to the end of the setup"
 ) {|from| options[:start_frame] = from }
 op.on(" -e", "--endframe FRAME",
-  Integer, "Bake the time curve upto this specific frame (defaults to frame 1)"
+  Integer, "Bake the time curve from this specific frame (defaults to frame 1)"
 ) {|upto| options[:end_frame] = upto }
 
 op.parse!
 
 setup_path = ARGV.shift
 
-unless setup_path
-  $stderr.puts "No input file path provided. Please see flametwextract --help for usage information." 
-  exit -1
-end
-
-unless File.exist?(setup_path)
-  $stderr.puts "File does not exist." 
-  exit -1
-end
+fail "No input file path provided. Use --help for usage information." unless setup_path
+fail "File does not exist" unless File.exist?(setup_path)
 
 # Setup the destination
 destination_path = setup_path.gsub(/\.(\w+)$/, '.framecurve.txt')

data/bin/framecurve_to_flame

@@ -12,6 +12,14 @@ fail("No input file path provided.") unless fc_path
 fail("File %s does not exist." % fc_path) unless File.exist?(fc_path)
 
 curve = Framecurve::Parser.new.parse(fc_path)
+v = Framecurve::Validator.new
+v.validate(curve)
+if v.any_errors?
+  v.errors.each do | error |
+    $stderr.puts "Framecurve file was faulty: #{error}"
+  end
+end
+
 FlameChannelParser::FramecurveWriters::Base.with_each_writer do | writer_class |
   filename = [fc_path, writer_class.extension].join
   File.open(filename, "wb") do | f |

data/flame_channel_parser.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "flame_channel_parser"
-  s.version = "4.0.0"
+  s.version = "4.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]

data/lib/flame_channel_parser.rb

@@ -1,5 +1,5 @@
 module FlameChannelParser
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
   
   module FramecurveWriters; end
   

data/test/test_cli_timewarp_extractor.rb

@@ -20,14 +20,14 @@ class TestCliTimewarpExtractor < Test::Unit::TestCase
   
   def test_cli_with_no_args_produces_usage
     status, o, e = cli('')
-    assert_equal( -1, status)
+    assert_equal( 1, status)
     assert_match( /No input file path provided/, e)
     assert_match( /--help for usage information/, e)
   end
   
   def test_cli_with_nonexisting_file
     status, o, e = cli(" amazing.action")
-    assert_equal( -1, status)
+    assert_equal( 1, status)
     assert_match /does not exist/, e
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flame_channel_parser
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: update_hints
-  requirement: &10778380 !ruby/object:Gem::Requirement
+  requirement: &10740070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10778380
+  version_requirements: *10740070
 - !ruby/object:Gem::Dependency
   name: framecurve
-  requirement: &10778120 !ruby/object:Gem::Requirement
+  requirement: &10739830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *10778120
+  version_requirements: *10739830
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10777770 !ruby/object:Gem::Requirement
+  requirement: &10739570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10777770
+  version_requirements: *10739570
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10777390 !ruby/object:Gem::Requirement
+  requirement: &10739250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10777390
+  version_requirements: *10739250
 - !ruby/object:Gem::Dependency
   name: cli_test
-  requirement: &10777080 !ruby/object:Gem::Requirement
+  requirement: &10738930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *10777080
+  version_requirements: *10738930
 description: Reads and interpolates animation channels in IFFS setups
 email: me@julik.nl
 executables: