typingpool 0.8.0 → 0.8.1

data/bin/tp-make

@@ -71,6 +71,11 @@ OptionParser.new do |opts|
     options[:bitrate] = kbps
   end
 
+  opts.on('--devtest',
+          'Runs in a special development mode. Ignore.') do
+    options[:devtest] = true
+  end
+
   opts.on('--help',
           'Display this screen.') do
     puts opts
@@ -136,6 +141,7 @@ else
   converted_files = project.local.subdir('audio', 'originals').as(:audio).to_mp3(temp_conversion_dir, project.bitrate) do |file| 
     STDERR.puts "Converting #{File.basename(file) } to mp3" 
   end
+  converted_files = Typingpool::Filer::Files::Audio.new(converted_files.sort{|a,b| a.path <=> b.path})
 
   STDERR.puts "Merging audio" if converted_files.count > 1
   temp_merge_file = Tempfile.new(["#{project.name}.all.", ".mp3"])
@@ -151,6 +157,9 @@ else
   assignment_path = project.create_assignment_csv(:path => ['data', 'assignment.csv'], :urls => urls, :unusual => options[:unusual], :voices => options[:voices])
 
   temp_merge_file.close
+  if options[:devtest]
+    FileUtils.cp(temp_merge_file.path, project.local.subdir('audio', 'originals'))
+  end
   temp_merge_file.unlink
   FileUtils.remove_entry_secure(temp_conversion_dir)
 end #if project.local

data/lib/typingpool/test/script.rb

@@ -83,7 +83,7 @@ module Typingpool
       end
 
       def call_tp_make(*args)
-        call_script(path_to_tp_make, *args)
+        call_script(path_to_tp_make, *args, '--devtest')
       end
 
       def tp_make(in_dir, config=config_path(in_dir), audio_subdir='mp3')

data/lib/typingpool/version.rb

@@ -1,3 +1,3 @@
 module Typingpool
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end #Typingpool

data/test/test_integration_script_2_tp_make.rb

@@ -5,6 +5,7 @@ $:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
 require 'typingpool'
 require 'typingpool/test'
 require 'csv'
+require 'open3'
 
 class TestTpMake < Typingpool::Test::Script                   
   def test_abort_with_no_files
@@ -118,4 +119,30 @@ class TestTpMake < Typingpool::Test::Script
     end #in_temp_tp_dir do...
   end
 
+  def test_audio_files_sorted_correctly
+    in_temp_tp_dir do |dir|
+      config_path = self.config_path(dir)
+      skip_if_no_upload_credentials('tp-make audio file sorting test', Typingpool::Config.file(config_path))
+      assert(audio_files('mp3').count > 1)
+      correctly_ordered_paths = audio_files('mp3').sort
+      tp_make_with(dir, config_path, 'mp3')
+      assert(project = temp_tp_dir_project(dir))
+      assert(merged_audio_file = project.local.subdir('audio','originals').files.detect{|filer| filer.path.match(/.\.all\../)})
+      assert(File.exists? merged_audio_file)
+      actually_ordered_paths = originals_from_merged_audio_file(merged_audio_file)
+      assert_equal(correctly_ordered_paths.map{|path| File.basename(path) }, actually_ordered_paths.map{|path| File.basename(path) })
+    end #in_temp_tp_dir
+  end
+
+  def originals_from_merged_audio_file(path)
+    out, err, status = Open3.capture3('mp3splt', '-l', path)
+    refute_nil(out)
+    refute_empty(out)
+    paths = out.scan(/^\/.+\.mp3$/i)
+    refute_empty(paths)
+    assert(paths.count > 1)
+    paths.each{|path| assert(File.exists? path) }
+    paths
+  end
+
 end #TestTpMake

data/test/test_unit_project_remote.rb

@@ -64,7 +64,7 @@ class TestProjectRemote < Typingpool::Test
       standard_put_remove_tests(remote)
       assert(s3.buckets[config.amazon.bucket].exists?)
     ensure
-      s3.buckets[config.amazon.bucket].delete
+      s3.buckets[config.amazon.bucket].delete rescue AWS::S3::Errors::NoSuchBucket
     end #begin
   end
 
@@ -101,6 +101,7 @@ class TestProjectRemote < Typingpool::Test
                     :test_with => lambda{|urls| urls.each_with_index{|url, i| assert_includes(url, basenames[i]) } }
                     )
 
+    sleep 5
     #now with different basenames
     remote_basenames = basenames.map{|name| [File.basename(name, '.*'), pseudo_random_chars, File.extname(name)].join }
     base_args = {
@@ -115,6 +116,7 @@ class TestProjectRemote < Typingpool::Test
                                     )
                     )
 
+    sleep 5
     #now using remove_urls for removal
     put_remove_test(
                     base_args.merge(
@@ -123,6 +125,7 @@ class TestProjectRemote < Typingpool::Test
                                     )
                     )
 
+    sleep 5
     #now with stringio streams
     put_remove_test(
                     base_args.merge( 
@@ -161,12 +164,13 @@ class TestProjectRemote < Typingpool::Test
     assert(urls = args[:remote].put(*put_args))
     begin
       assert_equal(args[:streams].count, urls.count)
-      sleep 4
+      sleep 10
       urls.each{|url| assert(working_url?(url)) }
       args[:test_with].call(urls) if args[:test_with]
     ensure
       args[:remove_with].call(urls)
     end #begin
+    sleep 10
     urls.each{|url| refute(working_url?(url)) }
     urls
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typingpool
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rturk