tracksperanto 2.6.2 → 2.6.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.6.3 / 2011-31-07
+
+* Report progress from the parser for Flame, like it has been before
+
 === 2.6.2 / 2011-30-07
 
 * Fix missing progress percentages in the Flame import module

data/Rakefile

@@ -10,7 +10,12 @@ begin
     p.extra_rdoc_files  = FileList['*.rdoc'] + FileList['*.txt']
     p.version = Tracksperanto::VERSION
     
-    p.extra_deps = {"flame_channel_parser" => "~> 2.1", "progressbar" => "~> 0.9", "update_hints" => "~> 1.0" }
+    p.extra_deps = {
+      "flame_channel_parser" => "2.2.1",
+      "progressbar" => "~> 0.9",
+      "update_hints" => "~> 1.0"
+    }
+    
     p.extra_dev_deps = {"flexmock" => "~> 0.8", "cli_test" => "~>1.0"}
     
     p.developer('Julik Tarkhanov', 'me@julik.nl')

data/lib/import/flame_stabilizer.rb

@@ -61,8 +61,10 @@ class Tracksperanto::Import::FlameStabilizer < Tracksperanto::Import::Base
     end
     
     def extract_channels_from_stream(io)
-      parser = StabilizerParser.new(&method(:report_progress))
+      parser = StabilizerParser.new
+      parser.logger_proc = method(:report_progress)
       channels = parser.parse(io)
+      
       [channels, channels.map{|c| c.path }]
     end
     

data/lib/tracksperanto.rb

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

data/test/import/test_flame_import.rb

@@ -86,11 +86,18 @@ class FlameImportTest < Test::Unit::TestCase
     assert_equal 61, trackers[0].length
   end
   
-  # a failing setup from flame 2012
   def test_from_flame2012_with_empty_trackers
     fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/flame_2012_another.stabilizer')
     trackers = Tracksperanto::Import::FlameStabilizer.new(:io => fixture).to_a
     assert_equal 1, trackers.length
     assert_equal 100, trackers[0].length
   end
+  
+  def test_from_flame2012_with_traced_messages
+    fixture = File.open(File.dirname(__FILE__) + '/samples/flame_stabilizer/flame_2012_another.stabilizer')
+    output = ""
+    progress_block = lambda {|msg|  output << msg }
+    trackers = Tracksperanto::Import::FlameStabilizer.new(:io => fixture, :progress_block => progress_block).to_a
+    assert output.include?('Parsing channel "tracker1/shift/x"')
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: tracksperanto
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 Z
+date: 2011-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flame_channel_parser
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: 2.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency