typingpool 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d9537ae9deb2fdab3078afea4a69132658bf8e
-  data.tar.gz: 7a343081d80b50c26220e5701a3f4a6e758b7006
+  metadata.gz: c9684ded37fc04f867ff0149b4c3e5818c406816
+  data.tar.gz: 0ce4f81ef776d2c66a43b7ef36480f1b238dd70c
 SHA512:
-  metadata.gz: 6405ecd1a2744e022e45bb0e3dca0c1ca7a396e0633022c6a80aba676f0e6e02f8e9fc922f9683d9165f4cee25d3ed3f8904c1eaf9bfc24d6a1b39aaf8345954
-  data.tar.gz: 6c391f5f719098d40cd987dbe4de7e454f654b3cd2c65cdf99a21c82431d370a992d0a78844fd176ccc028331d289899367930a74f750612528f01522874c964
+  metadata.gz: 81e328fc781b70bd82a4c9b8bda7d8fb2b3f339f266967faec6785526452fef5c94ce50802da0df75d2b533d5218a48a662967db981547c70a1dfa0ea35a3a08
+  data.tar.gz: 95849ca6aef153d4868726cb6106761dd101fd1c3efdc31c9c3f99823fad1150f62fdfd7c01636ceb1ccea27d435a8a4875edd2184077b47887e0c607c0a5f87

data/Rakefile

@@ -10,14 +10,10 @@ task :test => [:test_unit, :test_integration]
 
 desc "Run unit tests"
 Rake::TestTask.new('test_unit') do |t|
-  t.test_files = FileList[
-                          'test/test_unit*'
-                         ]
+  t.pattern = 'test/test_unit*'
 end
 
 desc "Run integration tests"
 Rake::TestTask.new('test_integration') do |t|
-  t.test_files = FileList[ 
-                          (1..6).map{|n| "test/test_integration_script_#{n}*" }
-                         ]
+  t.pattern = 'test/test_integration_script*'
 end

data/bin/tp-collect

@@ -18,6 +18,7 @@ OptionParser.new do |commands|
   commands.on('--fixture=PATH',
               "Optional. For testing purposes only.",
               "A VCR ficture for running with mock data.") do |fixture|
+    require 'typingpool/app/test'
     options[:fixture] = fixture
   end
   commands.on('--help',

data/bin/tp-make

@@ -164,8 +164,10 @@ else
   FileUtils.remove_entry_secure(temp_conversion_dir)
 end #if project.local
 
-Typingpool::App.upload_audio_for_project(project) do |file, as|
-  STDERR.puts "Uploading #{File.basename(file)} to #{project.remote.host}/#{project.remote.path} as #{as}"
+unless options[:devtest]
+  Typingpool::App.upload_audio_for_project(project) do |file, as|
+    STDERR.puts "Uploading #{File.basename(file)} to #{project.remote.host}/#{project.remote.path} as #{as}"
+  end 
 end
 
 if STDOUT.tty? && Typingpool::Utility.os_x?

data/bin/tp-review

@@ -29,6 +29,7 @@ OptionParser.new do |commands|
   commands.on('--fixture=PATH',
               "Optional. For testing purposes only.",
               "A VCR fixture for running with mock data") do |fixture|
+    require 'typingpool/app/test'
     options[:fixture] = fixture
   end
   commands.on('--help',

data/lib/typingpool/app.rb

@@ -11,7 +11,6 @@ module Typingpool
   #As such, all App methods should be considered fluid and likely to
   #change in subsequent releases.
   module App
-    require 'vcr'
     require 'stringio'
     require 'open3'
     class << self
@@ -424,35 +423,6 @@ module Typingpool
         yield(missing) unless missing.empty?
       end
 
-      #Begins recording of an HTTP mock fixture (for automated
-      #testing) using the great VCR gem. Automatically filters your
-      #Config#amazon#key and Config#amazon#secret from the recorded
-      #fixture, and automatically determines the "cassette" name and
-      #"cassette library" dir from the supplied path.
-      # ==== Params
-      # [fixture_path] Path to where you want the HTTP fixture
-      #                recorded, including filename.
-      # [config]       A Config instance, used to extract the
-      #                Config#amazon#secret and Config#amazon#key that
-      #                will be filtered from the fixture.
-      # ==== Returns
-      # Result of calling VCR.insert_cassette.
-      def vcr_record(fixture_path, config)
-        VCR.configure do |c|
-          c.cassette_library_dir = File.dirname(fixture_path)
-          c.hook_into :webmock 
-          c.filter_sensitive_data('<AWS_KEY>'){ config.amazon.key }
-          c.filter_sensitive_data('<AWS_SECRET>'){ config.amazon.secret }
-        end
-        VCR.insert_cassette(File.basename(fixture_path, '.*'), :record => :new_episodes)
-      end
-
-      #Stops recording of the last call to vcr_record. Returns the
-      #result of VCR.eject_cassette.
-      def vcr_stop
-        VCR.eject_cassette
-      end
-
       #protected
 
       def with_abort_on_url_mismatch(url_type='')

data/lib/typingpool/app/test.rb

@@ -0,0 +1,35 @@
+module Typingpool
+  module App
+    require 'vcr'
+    class << self
+      #Begins recording of an HTTP mock fixture (for automated
+      #testing) using the great VCR gem. Automatically filters your
+      #Config#amazon#key and Config#amazon#secret from the recorded
+      #fixture, and automatically determines the "cassette" name and
+      #"cassette library" dir from the supplied path.
+      # ==== Params
+      # [fixture_path] Path to where you want the HTTP fixture
+      #                recorded, including filename.
+      # [config]       A Config instance, used to extract the
+      #                Config#amazon#secret and Config#amazon#key that
+      #                will be filtered from the fixture.
+      # ==== Returns
+      # Result of calling VCR.insert_cassette.
+      def vcr_record(fixture_path, config)
+        VCR.configure do |c|
+          c.cassette_library_dir = File.dirname(fixture_path)
+          c.hook_into :webmock 
+          c.filter_sensitive_data('<AWS_KEY>'){ config.amazon.key }
+          c.filter_sensitive_data('<AWS_SECRET>'){ config.amazon.secret }
+        end
+        VCR.insert_cassette(File.basename(fixture_path, '.*'), :record => :new_episodes)
+      end
+
+      #Stops recording of the last call to vcr_record. Returns the
+      #result of VCR.eject_cassette.
+      def vcr_stop
+        VCR.eject_cassette
+      end
+    end #class << self
+  end #App
+end #Typingpool

data/lib/typingpool/test.rb

@@ -1,6 +1,6 @@
 module Typingpool
-  require 'minitest/autorun' 
-
+  require 'minitest'
+  require 'typingpool/app/test'
   class Test < Minitest::Test 
     require 'nokogiri'
     require 'fileutils'
@@ -100,6 +100,23 @@ module Typingpool
       Typingpool::Utility.working_url?(*args)
     end
 
+    def working_url_eventually?(url, max_seconds=10, min_tries=2, max_redirects=6, seeking=true)
+      start = Time.now.to_i
+      tries = 0
+      wait = 0
+      loop do
+        sleep wait
+        return seeking if (working_url?(url, max_redirects) == seeking)
+        wait = wait > 0 ? wait * 2 : 1
+        tries += 1
+      end until (tries >= min_tries) && ((Time.now.to_i + wait - start) >= max_seconds)
+      not seeking
+    end
+
+    def broken_url_eventually?(url, max_seconds=10, min_tries=2, max_redirects=6)
+      not(working_url_eventually?(url, max_seconds, min_tries, max_redirects, false))
+    end
+
     def fetch_url(*args)
       Typingpool::Utility.fetch_url(*args)
     end

data/lib/typingpool/test/script.rb

@@ -4,7 +4,64 @@ module Typingpool
       require 'typingpool'
       require 'yaml'
       require 'open3'
+      require 'fileutils'
 
+      @@readymade_project_path = nil
+
+      def self.readymade_project_container=(path)
+        @@readymade_project_path = path
+      end
+
+      def self.readymade_project_container
+        @@readymade_project_path
+      end
+
+      def with_temp_readymade_project
+        in_temp_tp_dir do |dir|
+          setup_readymade_project_into(config_path(dir))
+          yield(dir)
+        end
+      end
+
+      def setup_readymade_project_into(config_path)
+        init_readymade_project
+        copy_readymade_project_into(config_path)
+        reconfigure_readymade_project_in(config_path)
+      end
+
+      def init_readymade_project
+        unless Typingpool::Test::Script.readymade_project_container
+          dir = Typingpool::Test::Script.readymade_project_container = Dir.mktmpdir('typingpool_')
+          Minitest.after_run{ FileUtils.remove_entry_secure(dir) }
+          setup_temp_tp_dir(dir)
+          tp_make(dir, config_path(dir), 'mp3', true)
+        end 
+      end
+
+      def copy_readymade_project_into(config_path)
+        config = Typingpool::Config.file(config_path)
+        FileUtils.cp_r(temp_tp_dir_project_dir(Typingpool::Test::Script.readymade_project_container), config.transcripts)
+      end
+
+      def reconfigure_readymade_project_in(config_path)
+        #rewrite URLs in assignment.csv according to config at config_path
+        project = Project.new(project_default[:title], Config.file(config_path))
+        File.delete(project.local.file('data', 'id.txt'))
+        project.local.create_id
+        id = project.local.id
+        assignments = project.local.file('data', 'assignment.csv').as(:csv)
+        urls = project.create_remote_names(assignments.map{|assignment| Project.local_basename_from_url(assignment['audio_url']) }).map{|file| project.remote.file_to_url(file) }
+        assignments.each! do |assignment|
+          assignment['audio_url'] = urls.shift
+          assignment['project_id'] = id
+        end
+      end
+
+      def simulate_failed_audio_upload_in(config_path)
+        project = Project.new(project_default[:title], Config.file(config_path))
+        csv = project.local.file('data', 'assignment.csv').as(:csv)
+        csv.each!{|a| a['audio_uploaded'] = 'maybe'}
+      end
 
       def audio_files(subdir='mp3')
         dir = File.join(audio_dir, subdir)
@@ -26,7 +83,7 @@ module Typingpool
 
 
       def in_temp_tp_dir
-        ::Dir.mktmpdir('typingpool_') do |dir|
+        Dir.mktmpdir('typingpool_') do |dir|
           setup_temp_tp_dir(dir)
           yield(dir)
         end
@@ -83,17 +140,19 @@ module Typingpool
       end
 
       def call_tp_make(*args)
-        call_script(path_to_tp_make, *args, '--devtest')
+        call_script(path_to_tp_make, *args)
       end
 
-      def tp_make(in_dir, config=config_path(in_dir), audio_subdir='mp3')
-        call_tp_make(
+      def tp_make(in_dir, config=config_path(in_dir), audio_subdir='mp3', devtest_mode_skipping_upload=false)
+        commands = [
                      '--config', config, 
                      '--chunks', project_default[:chunks],
                      *[:title, :subtitle].map{|param| ["--#{param}", project_default[param]] }.flatten,
                      *[:voice, :unusual].map{|param| project_default[param].map{|value| ["--#{param}", value] } }.flatten,
                      *audio_files(audio_subdir).map{|path| ['--file', path]}.flatten
-                     )
+                   ]
+        commands.push('--devtest') if devtest_mode_skipping_upload
+        call_tp_make(*commands)
       end
 
       def path_to_tp_finish

data/lib/typingpool/version.rb

@@ -1,3 +1,3 @@
 module Typingpool
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end #Typingpool

data/test/test_integration_script_1_tp_config.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 

data/test/test_integration_script_2_tp_make.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
-require 'csv'
 require 'open3'
 
 class TestTpMake < Typingpool::Test::Script                   
@@ -25,58 +25,80 @@ class TestTpMake < Typingpool::Test::Script
   end
 
   def assert_tp_make_abort_match(args, regex)
+    args.push('--devtest')
     assert_script_abort_match(args, regex) do |args|
       call_tp_make(*args)
     end
   end
 
-  def tp_make_with(dir, config_path, subdir='mp3')
+  def tp_make_and_upload_with(dir, config_path)
     begin
-      tp_make(dir, config_path, subdir)
+      tp_make(dir, config_path, 'mp3', false)
       assert(project = temp_tp_dir_project(dir, Typingpool::Config.file(config_path)))
-      assert(project.local)
-      assert(project.local.id)
-      assert(project.local.subdir('audio','chunks').to_a.size <= 7)
-      assert(project.local.subdir('audio','chunks').to_a.size >= 6)
-      assert_equal(project_default[:subtitle], project.local.subtitle)
-      assignments = project.local.file('data', 'assignment.csv').as(:csv)
-      assert_equal(project.local.subdir('audio','chunks').to_a.size, assignments.count)
-      assert_all_assets_have_upload_status(assignments, ['audio'], 'yes')
-      sleep 4 #pause before checking URLs so remote server has time to fully upload
-      assignments.each do |assignment|
-        assert(assignment['audio_url'])
-        assert(working_url? assignment['audio_url'])
-        assert_equal(assignment['project_id'], project.local.id)
-        assert_equal(assignment['unusual'].split(/\s*,\s*/), project_default[:unusual])
-        project_default[:voice].each_with_index do |voice, i|
-          name, description = voice.split(/\s*,\s*/)
-          assert_equal(name, assignment["voice#{i+1}"])
-          if not(description.to_s.empty?)
-            assert_equal(description, assignment["voice#{i+1}title"])
-          end
-        end #project_default[:voice].each_with_index...
-      end #assignments.each d0....
+      check_project_files(project)
+      check_project_uploads(project)
     ensure
       tp_finish_outside_sandbox(dir, config_path)
     end #begin
-    assert_all_assets_have_upload_status(assignments, ['audio'], 'no')
+    assert_all_assets_have_upload_status(project.local.file('data', 'assignment.csv').as(:csv), ['audio'], 'no') 
   end
 
-  def test_tp_make
+
+  def check_project_uploads(project)
+    assignments = project.local.file('data', 'assignment.csv').as(:csv)
+    assert_all_assets_have_upload_status(assignments, ['audio'], 'yes')
+    assignments.each do |assignment|
+      assert(assignment['audio_url'])
+      assert(working_url_eventually? assignment['audio_url'])
+      assert_equal('yes', assignment['audio_uploaded'])
+    end #assignments.each do....
+  end
+
+  def check_project_files(project)
+    assert(project.local)
+    assert(project.local.id)
+    assert(project.local.subdir('audio','chunks').to_a.size <= 7)
+    assert(project.local.subdir('audio','chunks').to_a.size >= 6)
+    assert_equal(project_default[:subtitle], project.local.subtitle)
+    assignments = project.local.file('data', 'assignment.csv').as(:csv)
+    assert_equal(project.local.subdir('audio','chunks').to_a.size, assignments.count)
+    assignments.each do |assignment|
+      assert_equal(assignment['project_id'], project.local.id)
+      assert_equal(assignment['unusual'].split(/\s*,\s*/), project_default[:unusual])
+      project_default[:voice].each_with_index do |voice, i|
+        name, description = voice.split(/\s*,\s*/)
+        assert_equal(name, assignment["voice#{i+1}"])
+        if not(description.to_s.empty?)
+          assert_equal(description, assignment["voice#{i+1}title"])
+        end
+      end #project_default[:voice].each_with_index...
+    end #assignments.each do....
+  end
+
+  def test_tp_make_audio_handling
     Dir.entries(audio_dir).select{|entry| File.directory?(File.join(audio_dir, entry))}.reject{|entry| entry.match(/^\./) }.each do |subdir|
       in_temp_tp_dir do |dir|
         config_path = self.config_path(dir)
-        skip_if_no_upload_credentials('tp-make integration test', Typingpool::Config.file(config_path))
-        tp_make_with(dir, config_path, subdir)
+        skip_if_no_upload_credentials('tp-make audio handling test', Typingpool::Config.file(config_path))
+        tp_make(dir, config_path, subdir, true)
+        assert(project = temp_tp_dir_project(dir, Typingpool::Config.file(config_path)))
+        check_project_files(project)
       end #in_temp_tp_dir
     end #Dir.entries
   end
 
+  def test_tp_make_sftp
+    in_temp_tp_dir do |dir|
+      skip_if_no_sftp_credentials('tp-make SFTP upload test', config)
+      tp_make_and_upload_with(dir, config_path(dir))
+    end #in_temp_tp_dir do...
+  end
+
   def test_tp_make_s3
     in_temp_tp_dir do |dir|
       skip_if_no_s3_credentials('tp-make S3 integration test', config)
       config_path = setup_s3_config(dir)
-      tp_make_with(dir, config_path)
+      tp_make_and_upload_with(dir, config_path)
     end #in_temp_tp_dir do...
   end 
 
@@ -110,8 +132,7 @@ class TestTpMake < Typingpool::Test::Script
         audio_urls.each_with_index do |original_url, i|
           assert_equal(original_url, audio_urls2[i])
         end
-        sleep 4 #pause before checking URLs so remote server has time to fully upload
-        assert_equal(audio_urls.count, audio_urls2.select{|url| working_url? url }.count)
+        assert_equal(audio_urls.count, audio_urls2.select{|url| working_url_eventually? url }.count)
       ensure
         tp_finish_outside_sandbox(dir, good_config_path)
       end #begin
@@ -125,8 +146,9 @@ class TestTpMake < Typingpool::Test::Script
       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')
+      tp_make(dir, config_path, 'mp3', true)
       assert(project = temp_tp_dir_project(dir))
+      check_project_files(project)
       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)

data/test/test_integration_script_3_tp_assign.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 
@@ -39,8 +40,7 @@ class TestTpAssign < Typingpool::Test::Script
   def test_tp_assign
     skip_if_no_amazon_credentials('tp-assign integration test')
     skip_if_no_upload_credentials('tp-assign integration test')
-    in_temp_tp_dir do |dir|
-      tp_make(dir)
+    with_temp_readymade_project do |dir|
       begin
         tp_assign(dir)
         assign_time = Time.now
@@ -65,88 +65,88 @@ class TestTpAssign < Typingpool::Test::Script
         tp_finish(dir)
       end #begin
       assert_empty(Typingpool::Amazon::HIT.all_for_project(project.local.id))
-    end # in_temp_tp_dir
+    end #with_temp_readymade_project do...
   end
 
    def test_uploads_audio_when_needed
      skip_if_no_amazon_credentials('tp-assign unuploaded audio integration test')
      skip_if_no_s3_credentials('tp-assign unuploaded audio integration test')
-     in_temp_tp_dir do |dir|
-       good_config_path = setup_s3_config(dir)
-       bad_config_path = setup_s3_config_with_bad_password(dir)
-       assert_raises(Typingpool::Error::Shell) do
-         tp_make(dir, bad_config_path, 'mp3')
-       end
+     with_temp_readymade_project do |dir|
        project_dir = temp_tp_dir_project_dir(dir)
        assert(File.exists? project_dir)
        assert(File.directory? project_dir)
-       assert(project = temp_tp_dir_project(dir, Typingpool::Config.file(bad_config_path)))
+       assert(project = temp_tp_dir_project(dir))
        csv = project.local.file('data', 'assignment.csv').as(:csv)
        assert_empty(csv.select{|assignment| working_url? assignment['audio_url']})
+       csv.each!{|a| a['audio_uploaded'] = 'maybe'}
        assert_all_assets_have_upload_status(csv, ['audio'], 'maybe')
        begin
-         tp_assign(dir, good_config_path)
+         tp_assign(dir)
          sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
          assert_equal(csv.count, sandbox_csv.count)
-         assert_equal(sandbox_csv.count, sandbox_csv.select{|assignment| working_url? assignment['audio_url'] }.count)
+         assert_equal(sandbox_csv.count, sandbox_csv.select{|assignment| working_url_eventually? assignment['audio_url'] }.count)
         assert_all_assets_have_upload_status(csv, ['audio'], 'yes')
        ensure
-         tp_finish(dir, good_config_path)
+         tp_finish(dir)
        end #begin
-     end # in_temp_tp_dir do...
+     end #with_temp_readymade_project do...
    end
 
 def test_fixing_failed_assignment_html_upload
   skip_if_no_amazon_credentials('tp-assign failed assignment upload integration test')
   skip_if_no_s3_credentials('tp-assign failed assignment upload integration test')
-  in_temp_tp_dir do |dir|
+  with_temp_readymade_project do |dir|
     good_config_path = setup_s3_config(dir)
+    reconfigure_readymade_project_in(good_config_path)
+    project = temp_tp_dir_project(dir, Typingpool::Config.file(good_config_path))
+    csv = project.local.file('data', 'assignment.csv').as(:csv)
+    csv.each!{|a| a['audio_uploaded'] = 'maybe'}
+    tp_make(dir, good_config_path)
+    assert_all_assets_have_upload_status(csv, ['audio'], 'yes')
     bad_config_path = setup_s3_config_with_bad_password(dir)
-    tp_make(dir, good_config_path, 'mp3')
     begin
-      assert(project = temp_tp_dir_project(dir, Typingpool::Config.file(good_config_path)))
       assert(project.local)
       get_assignment_urls = lambda{|csv| csv.map{|assignment| assignment['assignment_url'] }.select{|url| url } }
-      assert_empty(get_assignment_urls.call(project.local.file('data', 'assignment.csv').as(:csv)))
+      assert_empty(get_assignment_urls.call(csv))
       exception = assert_raises(Typingpool::Error::Shell) do
         tp_assign(dir, bad_config_path)
       end #assert_raises...
       assert_match(/s3 operation fail/i, exception.message)
       sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
       refute_empty(get_assignment_urls.call(sandbox_csv))
-      check_assignment_urls = lambda{ get_assignment_urls.call(sandbox_csv).map{|url| Typingpool::Utility.working_url? url } }
-      check_assignment_urls.call.each{|checked_out| refute(checked_out) }
+      get_assignment_urls.call(sandbox_csv).each{|url| refute(working_url? url) }
       assert_all_assets_have_upload_status(sandbox_csv, ['assignment'], 'maybe')
       tp_assign(dir, good_config_path)
-      check_assignment_urls.call.each{|checked_out| assert(checked_out) }
+      get_assignment_urls.call(sandbox_csv).each{|url| assert(working_url_eventually? url) }
       assert_all_assets_have_upload_status(sandbox_csv, ['assignment'], 'yes')
     ensure
       tp_finish(dir, good_config_path)
     end #begin
-  end #in_temp_tp_dir do...
+  end #with_temp_readymade_project do...
 end
 
 def test_abort_on_config_mismatch
   skip_if_no_s3_credentials('tp-assign abort on config mismatch test')
-  in_temp_tp_dir do |dir|
+  with_temp_readymade_project do |dir|
     config = config_from_dir(dir)
     good_config_path = setup_s3_config(dir, config, '.config_s3_good')
-    tp_make(dir, good_config_path)
+    reconfigure_readymade_project_in(good_config_path)
+    assert(config.amazon.bucket)
+    new_bucket = 'configmismatch-test'
+    refute_equal(new_bucket, config.amazon.bucket)
+    config.amazon.bucket = new_bucket
+    bad_config_path = setup_s3_config(dir, config, '.config_s3_bad')
+    success = false
     begin
-      tp_finish_outside_sandbox(dir, good_config_path)
-      assert(config.amazon.bucket)
-      new_bucket = 'configmismatch-test'
-      refute_equal(new_bucket, config.amazon.bucket)
-      config.amazon.bucket = new_bucket
-      bad_config_path = setup_s3_config(dir, config, '.config_s3_bad')
       exception = assert_raises(Typingpool::Error::Shell) do
         tp_assign(dir, bad_config_path)
       end #assert_raises...
       assert_match(/\burls don't look right\b/i, exception.message)
+      success = true
     ensure
-      tp_finish(dir, good_config_path)
+      tp_finish(dir, good_config_path) unless success
     end #begin
-  end #in_temp_tp_dir do...
+  end #with_temp_readymade_project do...
 end
 
 end #TestTpAssign

data/test/test_integration_script_4_tp_review.rb

@@ -1,21 +1,21 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 
 class TestTpReview < Typingpool::Test::Script
 
   def test_tp_review
-    in_temp_tp_dir do |dir|
+    with_temp_readymade_project do |dir|
       skip_if_no_upload_credentials('tp-review integration test')
       skip_if_no_amazon_credentials('tp-review integration test')
-      tp_make(dir)
       copy_fixtures_to_temp_tp_dir(dir, 'tp_review_')
       assert(File.exists? File.join(temp_tp_dir_project_dir(dir), 'data','sandbox-assignment.csv'))
       project = temp_tp_dir_project(dir)
-        assert_equal(7, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
+      assert_equal(7, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
       begin
         output = nil
         output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-1'), %w(a r a r s q))
@@ -55,9 +55,8 @@ class TestTpReview < Typingpool::Test::Script
         assert_assignment_csv_has_transcription_count(3, project, 'sandbox-assignment.csv')
       ensure
         rm_fixtures_from_temp_tp_dir(dir, 'tp_review_')
-        tp_finish(dir)
       end #begin
-    end #in_temp_tp_dir
+    end #with_temp_readymade_project do...
   end
 
   def split_reviews(output)

data/test/test_integration_script_5_tp_collect.rb

@@ -1,18 +1,17 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 
 class TestTpCollect < Typingpool::Test::Script
-  require 'fileutils'
 
   def test_tp_collect
-    in_temp_tp_dir do |dir|
+    with_temp_readymade_project do |dir|
       skip_if_no_upload_credentials('tp-collect integration test')
       skip_if_no_amazon_credentials('tp-collect integration test')
-      tp_make(dir)
       copy_fixtures_to_temp_tp_dir(dir, 'tp_collect_')
       begin
         project = temp_tp_dir_project(dir)
@@ -30,9 +29,8 @@ class TestTpCollect < Typingpool::Test::Script
 #        assert_assignment_csv_has_transcription_count(7, project, 'sandbox-assignment.csv')
       ensure
         rm_fixtures_from_temp_tp_dir(dir, 'tp_collect_')
-        tp_finish(dir)
       end #begin
-    end #in_temp_tp_dir
+    end #with_temp_readymade_project do...
   end
 
 end #TestTpCollect

data/test/test_integration_script_6_tp_finish.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 
@@ -9,23 +10,22 @@ class TestTpFinish < Typingpool::Test::Script
   def tp_finish_on_audio_files_with(dir, config_path)
     skip_if_no_amazon_credentials('tp-finish audio test')
     skip_if_no_upload_credentials('tp-finish audio test')
+    simulate_failed_audio_upload_in(config_path)
     tp_make(dir, config_path)
     project = temp_tp_dir_project(dir, Typingpool::Config.file(config_path))
     csv = project.local.file('data', 'assignment.csv').as(:csv)
     urls = csv.map{|assignment| assignment['audio_url'] }
     refute_empty(urls)
     assert_all_assets_have_upload_status(csv, ['audio'], 'yes')
-    sleep 3 #pause before checking URLs so remote server has time to fully upload
-    assert_equal(urls.size, urls.select{|url| working_url? url}.size)
+    assert_equal(urls.count, urls.select{|url| working_url_eventually? url}.count)
     tp_finish_outside_sandbox(dir, config_path)
-    sleep 3 #pause before checking URLs so remote server has time to fully delete 
-    assert_empty(urls.select{|url| working_url? url })
+    assert_equal(urls.count, urls.select{|url| broken_url_eventually? url }.count)
     assert_all_assets_have_upload_status(csv, ['audio'], 'no')
   end
 
   def test_tp_finish_on_audio_files_with_sftp
     skip_if_no_sftp_credentials('tp-finish sftp test')
-    in_temp_tp_dir do |dir|
+    with_temp_readymade_project do |dir|
       config_path = self.config_path(dir)
       tp_finish_on_audio_files_with(dir, config_path)
     end 
@@ -33,10 +33,11 @@ class TestTpFinish < Typingpool::Test::Script
 
   def test_tp_finish_on_audio_files_with_s3
     skip_if_no_s3_credentials('tp-finish sftp test')
-    in_temp_tp_dir do |dir|
+    with_temp_readymade_project do |dir|
       config = config_from_dir(dir)
       config.to_hash.delete('sftp')
       config_path = write_config(config, dir)
+      reconfigure_readymade_project_in(config_path)
       tp_finish_on_audio_files_with(dir, config_path)
     end
   end
@@ -44,12 +45,13 @@ class TestTpFinish < Typingpool::Test::Script
   def test_tp_finish_on_amazon_hits
     skip_if_no_amazon_credentials('tp-finish Amazon test')
     skip_if_no_upload_credentials('tp-finish Amazon test')
-    in_temp_tp_dir do |dir|
-      tp_make(dir)
+    with_temp_readymade_project do |dir|
       tp_assign(dir)
       project = temp_tp_dir_project(dir)
+      csv = project.local.file('data', 'assignment.csv').as(:csv)
       sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
-      assert_all_assets_have_upload_status(sandbox_csv, ['audio', 'assignment'], 'yes')
+      assert_all_assets_have_upload_status(sandbox_csv, ['assignment'], 'yes')
+      assert_all_assets_have_upload_status(csv, ['audio'], 'yes')
       setup_amazon(dir)
       results = Typingpool::Amazon::HIT.all_for_project(project.local.id)
       refute_empty(results)
@@ -67,21 +69,22 @@ class TestTpFinish < Typingpool::Test::Script
         end #begin
       end #results.each...
       refute(File.exists? sandbox_csv)
-      assert_all_assets_have_upload_status(project.local.file('data', 'assignment.csv').as(:csv), ['audio'], 'no')
-    end #in_temp_tp_dir
+      assert_all_assets_have_upload_status(csv, ['audio'], 'no')
+    end #with_temp_readymade_project do...
   end
 
   def test_tp_finish_with_missing_files
     skip_if_no_amazon_credentials('tp-finish missing files test')
     skip_if_no_upload_credentials('tp-finish missing files test')
-    in_temp_tp_dir do |dir|
+    with_temp_readymade_project do |dir|
       project = nil
+      simulate_failed_audio_upload_in(config_path(dir))
       tp_make(dir)
       begin
         project = temp_tp_dir_project(dir)
         assignments = project.local.file('data', 'assignment.csv').as(:csv).read
         urls = assignments.map{|assignment| assignment['audio_url'] }
-        assert_empty(urls.reject{|url| working_url? url })
+        assert_equal(urls.count, urls.select{|url| working_url_eventually? url }.count)
         bogus_url = urls.first.sub(/\.mp3/, '.foo.mp3')
         refute_equal(urls.first, bogus_url)
         refute(working_url? bogus_url)
@@ -89,21 +92,23 @@ class TestTpFinish < Typingpool::Test::Script
         bogus_assignment['audio_url'] = bogus_url
         assignments.insert(1, bogus_assignment)
         project.local.file('data', 'assignment.csv').as(:csv).write(assignments)
-        assert_equal(1, project.local.file('data', 'assignment.csv').as(:csv).reject{|assignment| working_url? assignment['audio_url'] }.count)
+        assignments = project.local.file('data', 'assignment.csv').as(:csv).read
+        refute(working_url? assignments[1]['audio_url'])
       ensure
         tp_finish_outside_sandbox(dir)
       end #begin
-      assert_empty(project.local.file('data', 'assignment.csv').as(:csv).select{|assignment| working_url? assignment['audio_url'] })
-    end #in_temp_tp_dir...
+      urls = project.local.file('data', 'assignment.csv').as(:csv).map{|assignment| assignment['audio_url'] }
+      assert_equal(urls.count, urls.select{|url| broken_url_eventually? url }.count)
+    end #with_temp_readymade_project do...
   end
 
-def test_abort_on_config_mismatch
-  skip_if_no_s3_credentials('tp-finish abort on config mismatch test')
-  in_temp_tp_dir do |dir|
-    config = config_from_dir(dir)
-    good_config_path = setup_s3_config(dir, config, '.config_s3_good')
-    tp_make(dir, good_config_path)
-    begin
+  def test_abort_on_config_mismatch
+    skip_if_no_s3_credentials('tp-finish abort on config mismatch test')
+    with_temp_readymade_project do |dir|
+      config = config_from_dir(dir)
+      good_config_path = setup_s3_config(dir, config, '.config_s3_good')
+      reconfigure_readymade_project_in(good_config_path)
+      simulate_failed_audio_upload_in(good_config_path)
       assert(config.amazon.bucket)
       new_bucket = 'configmismatch-test'
       refute_equal(new_bucket, config.amazon.bucket)
@@ -113,11 +118,7 @@ def test_abort_on_config_mismatch
         tp_finish_outside_sandbox(dir, bad_config_path)
       end #assert_raises...
       assert_match(/\burls don't look right\b/i, exception.message)
-    ensure
-      tp_finish_outside_sandbox(dir, good_config_path)
-    end #begin
-  end #in_temp_tp_dir do...
-
-end
+    end #with_temp_readymade_project do...
+  end
 
 end #TestTpFinish

data/test/test_unit_amazon.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 require 'uri'
@@ -137,7 +138,8 @@ class TestAmazon < Typingpool::Test
     with_dummy_typingpool_hit_or_skip('test_handles_hits_with_broken_external_question', url) do |hit, config|
       assert_equal(hit.full.external_question_url, url)
       refute(hit.full.external_question)
-    end #with_dummy....
+      refute(hit.full.external_question_param(hit.class.url_at))
+   end #with_dummy....
   end
 
   #Lacks test for HIT::Assignment - needs VCR fixture (TODO)

data/test/test_unit_config.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 

data/test/test_unit_filer.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 require 'fileutils'

data/test/test_unit_project.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
-require 'tmpdir'
-require 'fileutils'
 require 'uri'
 
 class TestProject < Typingpool::Test

data/test/test_unit_project_local.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 

data/test/test_unit_project_remote.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 require 'stringio'
 require 'aws-sdk'
-require 'securerandom'
 
 class TestProjectRemote < Typingpool::Test
   def test_project_remote_from_config
@@ -101,7 +101,6 @@ 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 = {
@@ -116,7 +115,6 @@ class TestProjectRemote < Typingpool::Test
                                     )
                     )
 
-    sleep 5
     #now using remove_urls for removal
     put_remove_test(
                     base_args.merge(
@@ -125,7 +123,6 @@ class TestProjectRemote < Typingpool::Test
                                     )
                     )
 
-    sleep 5
     #now with stringio streams
     put_remove_test(
                     base_args.merge( 
@@ -164,14 +161,12 @@ class TestProjectRemote < Typingpool::Test
     assert(urls = args[:remote].put(*put_args))
     begin
       assert_equal(args[:streams].count, urls.count)
-      sleep 10
-      urls.each{|url| assert(working_url?(url)) }
+      urls.each{|url| assert(working_url_eventually?(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.each{|url| assert(broken_url_eventually?(url)) }
     urls
   end
 

data/test/test_unit_template.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 require 'fileutils'

data/test/test_unit_test.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
+
+require 'minitest/autorun'
+require 'typingpool'
+require 'typingpool/test'
+require 'set'
+
+class TestTest < Typingpool::Test::Script
+
+  def test_readymade_project
+    in_temp_tp_dir do |dir|
+      tp_make(dir, config_path(dir), 'mp3', true)
+      assert_is_proper_tp_dir(dir)
+      assert_has_proper_assignment_csv(dir)
+    end
+    with_temp_readymade_project do |dir|
+      assert_is_proper_tp_dir(dir)
+      assert_has_proper_assignment_csv(dir)
+    end
+    with_temp_readymade_project do |dir|
+      with_temp_readymade_project do |dir2|
+        projects = [temp_tp_dir_project(dir), temp_tp_dir_project(dir2)]
+        refute_equal(projects[0].local.id, projects[1].local.id)
+        ['audio_url', 'project_id'].each do |csv_param|
+          param_set = projects.map{|project| Set.new project.local.file('data', 'assignment.csv').as(:csv).select{|a| a[csv_param] } }
+          assert_empty(param_set[0].intersection(param_set[1]))
+        end #['audio_url', 'project_id'].each do...
+      end #with_temp_readymade_project do...
+    end #with_temp_readymade_project do...
+  end
+
+  def assert_is_proper_tp_dir(dir)
+    assert(File.exists? temp_tp_dir_project_dir(dir))
+    assert(File.directory? temp_tp_dir_project_dir(dir))
+    assert(project = temp_tp_dir_project(dir))
+    assert(project.local)
+    assert_equal(3, project.local.subdir('audio', 'originals').files.count)
+    assert_in_delta(6, project.local.subdir('audio', 'chunks').files.count, 1)
+  end
+
+  def assert_has_proper_assignment_csv(dir)
+    assert(project = temp_tp_dir_project(dir))
+    assert(File.exists? project.local.file('data', 'assignment.csv').path)
+    assert(assignments = project.local.file('data', 'assignment.csv').as(:csv).read)
+    assert_equal(project.local.subdir('audio', 'chunks').files.count, assignments.count)
+    assert_equal(assignments.count, assignments.select{|a| a['audio_url']}.count)
+    assignments.each{|a| assert_match(/^https?:\/\/\w+/i, a['audio_url']) }
+  end
+
+end #class TestTest

data/test/test_unit_transcript.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(File.dirname(__FILE__)), 'lib')
 
+require 'minitest/autorun'
 require 'typingpool'
 require 'typingpool/test'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typingpool
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Ryan Tate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rturk
@@ -155,6 +155,7 @@ files:
 - lib/typingpool/app/cli.rb
 - lib/typingpool/app/cli/formatter.rb
 - lib/typingpool/app/friendlyexceptions.rb
+- lib/typingpool/app/test.rb
 - lib/typingpool/config.rb
 - lib/typingpool/config/root.rb
 - lib/typingpool/error.rb
@@ -252,6 +253,7 @@ files:
 - test/test_unit_project_local.rb
 - test/test_unit_project_remote.rb
 - test/test_unit_template.rb
+- test/test_unit_test.rb
 - test/test_unit_transcript.rb
 - typingpool.gemspec
 homepage: http://github.com/ryantate/typingpool