typingpool 0.8.1 → 0.8.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eb6abdc9b9f07ff9c24adaa0304a9aed90619e3b
+  data.tar.gz: a6d2d4f6de6ea82bec54e8a026b899257979d2d8
+SHA512:
+  metadata.gz: 75c33b151d88e38bfb12b37751c3a8a8deaa9de91ed40971927e5d095a56d905c1841f160148b9f4f55000921e860436b198dd07240c7ca850ebe64b20ab12cd
+  data.tar.gz: c1593d3a0aeb1755723bf4d8f1289a8803b69d985f7675a1eeef74d568f8acabdffa37e754bbb6e275923889c07049e2ff53ed4a79174cab2d723aa17095164f

data/lib/typingpool.rb

@@ -487,13 +487,13 @@
 # license. See LICENSE for details.
 
 module Typingpool
+  require 'typingpool/utility'
+  require 'typingpool/filer'
+  require 'typingpool/project'
   require 'typingpool/version'
   require 'typingpool/error'
-  require 'typingpool/utility'
   require 'typingpool/config'
-  require 'typingpool/filer'
   require 'typingpool/amazon'
-  require 'typingpool/project'
   require 'typingpool/transcript'
   require 'typingpool/template'
   require 'typingpool/app'

data/lib/typingpool/test.rb

@@ -1,14 +1,10 @@
 module Typingpool
-  require 'test/unit' 
+  require 'minitest/autorun' 
 
-  class Test < ::Test::Unit::TestCase 
+  class Test < Minitest::Test 
     require 'nokogiri'
     require 'fileutils'
 
-    def MiniTest.filter_backtrace(bt)
-      bt
-    end
-
     def self.app_dir
       File.dirname(File.dirname(File.dirname(__FILE__)))
     end

data/lib/typingpool/test/script.rb

@@ -284,10 +284,10 @@ module Typingpool
       end
 
       def assert_shell_error_match(regex)
-        exception = assert_raise(Typingpool::Error::Shell) do
+        exception = assert_raises(Typingpool::Error::Shell) do
           yield
         end
-        assert_match(exception.message, regex)
+        assert_match(regex, exception.message)
       end
 
       def assert_script_abort_match(args, regex)

data/lib/typingpool/version.rb

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

data/test/test_integration_script_1_tp_config.rb

@@ -8,34 +8,34 @@ require 'typingpool/test'
 class TestTpConfig < Typingpool::Test::Script
 
 def test_abort_with_invalid_file
-  exception = assert_raise(Typingpool::Error::Shell) do
+  exception = assert_raises(Typingpool::Error::Shell) do
     tp_config(File.join(fixtures_dir, 'not_yaml.txt'))
   end
-  assert_match(exception.message, /not valid yaml/i)
+  assert_match(/not valid yaml/i, exception.message)
 end
 
 def test_abort_with_directory_path
   dir = File.join(fixtures_dir, 'vcr')
   assert(File.exists? dir)
   assert(File.directory? dir)
-  exception = assert_raise(Typingpool::Error::Shell) do
+  exception = assert_raises(Typingpool::Error::Shell) do
     tp_config(dir)
   end
-  assert_match(exception.message, /not a file/i)
+  assert_match(/not a file/i, exception.message)
 end
 
 def test_abort_with_invalid_path
   path = '/jksdljs/euwiroeuw'
   refute(File.exists? path)
-  exception = assert_raise(Typingpool::Error::Shell) do
+  exception = assert_raises(Typingpool::Error::Shell) do
     tp_config(path)
   end
-  assert_match(exception.message, /valid path/i)
+  assert_match(/valid path/i, exception.message)
 end
 
 def test_usage_message
   assert(output = tp_config('--help'))
-  assert_match(output, /\bUSAGE:/)
+  assert_match(/\bUSAGE:/, output)
 end
 
 def test_new_config_creation
@@ -46,7 +46,7 @@ def test_new_config_creation
     }
     path.values.each{|path| refute(File.exists? path) }
     assert(output = tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))
-    assert_match(output[:err], /wrote config to/i)
+    assert_match(/wrote config to/i, output[:err])
     path.values.each{|path| assert(File.exists? path) }
     assert(File.file? path[:config] )
     assert(File.directory? path[:transcript_dir] )
@@ -99,7 +99,7 @@ def test_skips_bucket_when_sftp_params_exist
     assert(original_config = Typingpool::Config.file(path[:config]))
     assert_empty(original_config.amazon.bucket.to_s)
     assert(output = tp_config_with_input([path[:config], '--test'], ['keykey', 'secretsecret', path[:transcript_dir]]))
-    assert_match(output[:err], /wrote config to/i)
+    assert_match(/wrote config to/i, output[:err])
     assert(edited_config = Typingpool::Config.file(path[:config]))
     assert_empty(edited_config.amazon.bucket.to_s)
   end #in_temp_dir do |dir|

data/test/test_integration_script_2_tp_make.rb

@@ -34,8 +34,8 @@ class TestTpMake < Typingpool::Test::Script
     begin
       tp_make(dir, config_path, subdir)
       assert(project = temp_tp_dir_project(dir, Typingpool::Config.file(config_path)))
-      assert_not_nil(project.local)
-      assert_not_nil(project.local.id)
+      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)
@@ -44,7 +44,7 @@ class TestTpMake < Typingpool::Test::Script
       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_not_nil(assignment['audio_url'])
+        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])

data/test/test_integration_script_3_tp_assign.rb

@@ -10,7 +10,7 @@ class TestTpAssign < Typingpool::Test::Script
   #(or at least some xml parsing) since rturk doesn't provide an
   #easy way to look at HIT qualifications)
   def test_abort_with_no_input
-    assert_raise(Typingpool::Error::Shell){call_tp_assign}
+    assert_raises(Typingpool::Error::Shell){call_tp_assign}
   end
 
   def test_abort_with_no_template
@@ -59,7 +59,7 @@ class TestTpAssign < Typingpool::Test::Script
         sandbox_csv = project.local.file('data', 'sandbox-assignment.csv').as(:csv)
         refute_empty(assignment_urls = sandbox_csv.map{|assignment| assignment['assignment_url'] })
         assert(assignment_html = fetch_url(assignment_urls.first).body)
-        assert_match(assignment_html, /\b20[\s-]+second\b/)
+        assert_match(/\b20[\s-]+second\b/, assignment_html)
         assert_all_assets_have_upload_status(sandbox_csv, ['assignment'], 'yes')
       ensure
         tp_finish(dir)
@@ -111,7 +111,7 @@ def test_fixing_failed_assignment_html_upload
       exception = assert_raises(Typingpool::Error::Shell) do
         tp_assign(dir, bad_config_path)
       end #assert_raises...
-      assert_match(exception.message, /s3 operation fail/i)
+      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 } }
@@ -142,7 +142,7 @@ def test_abort_on_config_mismatch
       exception = assert_raises(Typingpool::Error::Shell) do
         tp_assign(dir, bad_config_path)
       end #assert_raises...
-      assert_match(exception.message, /\burls don't look right\b/i)
+      assert_match(/\burls don't look right\b/i, exception.message)
     ensure
       tp_finish(dir, good_config_path)
     end #begin

data/test/test_integration_script_4_tp_review.rb

@@ -18,43 +18,38 @@ class TestTpReview < Typingpool::Test::Script
         assert_equal(7, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
       begin
         output = nil
-        assert_nothing_raised do
-          output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-1'), %w(a r a r s q))
-        end
+        output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-1'), %w(a r a r s q))
         assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
         assert_equal(5, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
         reviews = split_reviews(output[:out])
-        assert_match(reviews[1], /Interview\.00\.00/)
+        assert_match(/Interview\.00\.00/, reviews[1])
         #we can't specify leading \b boundaries because the ansi
         #escape sequences mess that up
-        assert_match(reviews[1], /Approved\b/i)
-        assert_match(reviews[2], /Interview\.00\.20/)
-        assert_match(reviews[2], /reason\b/i)
-        assert_match(reviews[2], /Rejected\b/i)
-        assert_match(reviews[3], /Interview\.00\.40/)
-        assert_match(reviews[3], /Approved\b/i)
-        assert_match(reviews[4], /Interview\.01\.00/)
-        assert_match(reviews[4], /reason\b/i)
-        assert_match(reviews[4], /Rejected\b/i)
-        assert_match(reviews[5], /Interview\.01\.20/)
-        assert_match(reviews[5], /Skipping\b/i)
-        assert_match(reviews[6], /Interview\.02\.00/)
-        assert_match(reviews[6], /Quitting\b/i)
+        assert_match(/Approved\b/i, reviews[1])
+        assert_match(/Interview\.00\.20/, reviews[2])
+        assert_match(/reason\b/i, reviews[2])
+        assert_match(/Rejected\b/i, reviews[2])
+        assert_match(/Interview\.00\.40/, reviews[3])
+        assert_match(/Approved\b/i, reviews[3])
+        assert_match(/Interview\.01\.00/, reviews[4])
+        assert_match(/reason\b/i, reviews[4])
+        assert_match(/Rejected\b/i, reviews[4])
+        assert_match(/Interview\.01\.20/, reviews[5])
+        assert_match(/Skipping\b/i, reviews[5])
+        assert_match(/Interview\.02\.00/, reviews[6])
+        assert_match(/Quitting\b/i, reviews[6])
         transcript = assert_has_partial_transcript(dir)
         assert_html_has_audio_count(2, transcript)
         assert_assignment_csv_has_transcription_count(2, project, 'sandbox-assignment.csv')
-
-        assert_nothing_raised do
-          output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-2'), %w(a r))
-        end
+        output = tp_review_with_fixture(dir, File.join(fixtures_dir, 'vcr', 'tp-review-2'), %w(a r))
         assert_equal(0, output[:status].to_i, "Bad exit code: #{output[:status]} err: #{output[:err]}")
         assert_equal(4, project.local.file('data','sandbox-assignment.csv').as(:csv).reject{|assignment| assignment['hit_id'].to_s.empty? }.count)
         reviews = split_reviews(output[:out])
-        assert_match(reviews[1], /Interview\.01\.20/)
-        assert_match(reviews[1], /Approved\b/i)
-        assert_match(reviews[2], /Interview\.02\.00/)
-        assert_match(reviews[2], /reason\b/i)
-        assert_match(reviews[2], /Rejected\b/i)
+        assert_match(/Interview\.01\.20/, reviews[1])
+        assert_match(/Approved\b/i, reviews[1])
+        assert_match(/Interview\.02\.00/, reviews[2])
+        assert_match(/reason\b/i, reviews[2])
+        assert_match(/Rejected\b/i, reviews[2])
         transcript = assert_has_partial_transcript(dir)
         assert_html_has_audio_count(3, transcript)
         assert_assignment_csv_has_transcription_count(3, project, 'sandbox-assignment.csv')

data/test/test_integration_script_5_tp_collect.rb

@@ -16,21 +16,15 @@ class TestTpCollect < Typingpool::Test::Script
       copy_fixtures_to_temp_tp_dir(dir, 'tp_collect_')
       begin
         project = temp_tp_dir_project(dir)
-        assert_nothing_raised do
-          tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-1'))
-        end
+        tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-1'))
         transcript = assert_has_partial_transcript(dir)
         assert_html_has_audio_count(2, transcript)
         assert_assignment_csv_has_transcription_count(2, project, 'sandbox-assignment.csv')
-        assert_nothing_raised do
-          tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-2'))
-        end
+        tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-2'))
         transcript = assert_has_partial_transcript(dir)
         assert_html_has_audio_count(4, transcript)
         assert_assignment_csv_has_transcription_count(4, project, 'sandbox-assignment.csv')
-        assert_nothing_raised do
-          tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-3'))
-        end
+        tp_collect_with_fixture(dir, File.join(vcr_dir, 'tp-collect-3'))
 #       transcript = assert_has_transcript(dir) || assert_has_partial_transcript(dir)
 #        assert_html_has_audio_count(7, transcript)
 #        assert_assignment_csv_has_transcription_count(7, project, 'sandbox-assignment.csv')

data/test/test_integration_script_6_tp_finish.rb

@@ -17,9 +17,7 @@ class TestTpFinish < Typingpool::Test::Script
     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_nothing_raised do
-      tp_finish_outside_sandbox(dir, config_path)
-    end
+    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_all_assets_have_upload_status(csv, ['audio'], 'no')
@@ -55,9 +53,7 @@ class TestTpFinish < Typingpool::Test::Script
       setup_amazon(dir)
       results = Typingpool::Amazon::HIT.all_for_project(project.local.id)
       refute_empty(results)
-      assert_nothing_raised do
-        tp_finish(dir)
-      end
+      tp_finish(dir)
       assert_empty(Typingpool::Amazon::HIT.all_for_project(project.local.id))
       results.each do |result|
         #The original HIT might be gone, or there and marked
@@ -65,9 +61,9 @@ class TestTpFinish < Typingpool::Test::Script
         #dead HITs yet
         begin 
           hit = RTurk::Hit.find(result.id)
-          assert_match(hit.status, /^dispos/i)
+          assert_match(/^dispos/i, hit.status)
         rescue RTurk::InvalidRequest => exception
-          assert_match(exception.message, /HITDoesNotExist/i)
+          assert_match(/HITDoesNotExist/i, exception.message)
         end #begin
       end #results.each...
       refute(File.exists? sandbox_csv)
@@ -116,7 +112,7 @@ def test_abort_on_config_mismatch
       exception = assert_raises(Typingpool::Error::Shell) do
         tp_finish_outside_sandbox(dir, bad_config_path)
       end #assert_raises...
-      assert_match(exception.message, /\burls don't look right\b/i)
+      assert_match(/\burls don't look right\b/i, exception.message)
     ensure
       tp_finish_outside_sandbox(dir, good_config_path)
     end #begin

data/test/test_unit_amazon.rb

@@ -11,7 +11,7 @@ class TestAmazon < Typingpool::Test
 
   def test_amazon_base
     setup_result = Typingpool::Amazon.setup(:sandbox => true, :config => dummy_config)
-    assert_match(setup_result, /amazonaws/)
+    assert_match(/amazonaws/, setup_result)
     assert(Typingpool::Amazon.cache)
     assert_instance_of(PStore, Typingpool::Amazon.cache)
     assert_equal(dummy_config.cache, Typingpool::Amazon.cache.path)
@@ -24,13 +24,13 @@ class TestAmazon < Typingpool::Test
     assert_instance_of(Typingpool::Amazon::Question, question)
     assert_equal(question_url, question.url)
     assert_equal(question_html, question.html)
-    assert_match(question.title, /Transcribe MP3 of/i)
-    assert_match(question.description, /telephone conversation/i)
-    assert_match(question.annotation, /\S/)
+    assert_match(/Transcribe MP3 of/i, question.title)
+    assert_match(/telephone conversation/i, question.description)
+    assert_match(/\S/, question.annotation)
     assert(decoded_annotation = URI.decode_www_form(CGI.unescapeHTML(question.annotation)))
     decoded_annotation = Hash[*decoded_annotation.flatten]
-    assert_match(decoded_annotation[Typingpool::Amazon::HIT.url_at], /^http/i)
-    assert_match(decoded_annotation[Typingpool::Amazon::HIT.id_at], /\S/)
+    assert_match(/^http/i, decoded_annotation[Typingpool::Amazon::HIT.url_at])
+    assert_match(/\S/, decoded_annotation[Typingpool::Amazon::HIT.id_at])
   end
 
   def test_amazon_hit_create
@@ -67,10 +67,10 @@ class TestAmazon < Typingpool::Test
   def test_amazon_hit_base
     with_dummy_hit_or_skip('test_amazon_hit_base') do |hit, config|
       assert_instance_of(Typingpool::Amazon::HIT, hit)
-      assert_match(hit.id, /\S/)
-      assert_match(hit.url, /^http/i)
-      assert_match(hit.project_id, /\S/)
-      assert_match(hit.project_title_from_url, /\S/)
+      assert_match(/\S/, hit.id)
+      assert_match(/^http/i, hit.url)
+      assert_match(/\S/, hit.project_id)
+      assert_match(/\S/, hit.project_title_from_url)
       assert(not(hit.approved?))
       assert(not(hit.rejected?))
       assert(not(hit.submitted?))
@@ -87,16 +87,16 @@ class TestAmazon < Typingpool::Test
     with_dummy_hit_or_skip('test_amazon_hit_full') do |hit, config|
       assert(full = hit.full)
       assert_instance_of(Typingpool::Amazon::HIT::Full, full)
-      [:id, :type_id].each{|attr| assert_match(full.send(attr), /\S/) }
+      [:id, :type_id].each{|attr| assert_match(/\S/, full.send(attr)) }
       assert(not(full.expired?))
       assert(not(full.expired_and_overdue?))
       assert_equal('Assignable', full.status)
-      assert_match(full.external_question_url, /^http/i)
-      [:assignments_completed, :assignments_pending].each{|attr| assert_match(full.send(attr).to_s, /^\d+$/) }
+      assert_match(/^http/i, full.external_question_url)
+      [:assignments_completed, :assignments_pending].each{|attr| assert_match(/^\d+$/, full.send(attr).to_s) }
       assert_kind_of(Time, full.expires_at)
       assert_instance_of(Hash, full.annotation)
-      assert_match(full.annotation[Typingpool::Amazon::HIT.url_at], /^http/i)
-      assert_match(full.annotation[Typingpool::Amazon::HIT.id_at], /\S/)
+      assert_match(/^http/i, full.annotation[Typingpool::Amazon::HIT.url_at])
+      assert_match(/\S/, full.annotation[Typingpool::Amazon::HIT.id_at])
     end #with_dummy_hit_or_skip
   end
 

data/test/test_unit_config.rb

@@ -10,13 +10,13 @@ class TestConfig < Typingpool::Test
   def test_config_regular_file
     assert(config = Typingpool::Config.file(File.join(fixtures_dir, 'config-1')))
     assert_equal('~/Documents/Transcripts/', config['transcripts'])
-    assert_match(config.transcripts, /Transcripts$/)
-    refute_match(config.transcripts, /~/)
+    assert_match(/Transcripts$/, config.transcripts)
+    refute_match(/~/, config.transcripts)
     %w(key secret).each do |param| 
       regex = /test101010/
-      assert_match(config.amazon.send(param), regex) 
-      assert_match(config.amazon[param], regex)
-      assert_match(config.amazon.to_hash[param], regex)
+      assert_match(regex, config.amazon.send(param)) 
+      assert_match(regex, config.amazon[param])
+      assert_match(regex, config.amazon.to_hash[param])
     end
     assert_equal(0.75, config.assign.reward.to_f)
     assert_equal(3*60*60, config.assign.deadline.to_i)
@@ -45,25 +45,25 @@ class TestConfig < Typingpool::Test
     exception = assert_raises(Typingpool::Error::Argument) do 
       config.assign.qualify
     end
-    assert_match(exception.message, /Unknown qualification type/i)
+    assert_match(/Unknown qualification type/i, exception.message)
 
     config.assign['qualify'] = [config.assign['qualify'].pop]
     exception = assert_raises(Typingpool::Error::Argument) do 
       config.assign.qualify
     end
-    assert_match(exception.message, /Unknown comparator/i)
+    assert_match(/Unknown comparator/i, exception.message)
 
     assert_equal('3z', config.assign['deadline'])
     exception = assert_raises(Typingpool::Error::Argument::Format) do
       config.assign.deadline
     end
-    assert_match(exception.message, /can't convert/i)
+    assert_match(/can't convert/i, exception.message)
 
     config.assign['reward'] = 'foo'
     exception = assert_raises(Typingpool::Error::Argument::Format) do
       config.assign.reward
     end
-    assert_match(exception.message, /\bformat should\b/i)
+    assert_match(/\bformat should\b/i, exception.message)
   end
 
   def test_config_regular_input
@@ -83,12 +83,12 @@ class TestConfig < Typingpool::Test
     exception = assert_raises(Typingpool::Error::Argument::Format) do
       config.assign.reward = 'foo'
     end
-    assert_match(exception.message, /\bformat should\b/i)
+    assert_match(/\bformat should\b/i, exception.message)
 
     exception = assert_raises(Typingpool::Error::Argument::Format) do
       config.assign.approval = '11f'
     end
-    assert_match(exception.message, /can't convert/i)
+    assert_match(/can't convert/i, exception.message)
 
   end
 end #TestConfig

data/test/test_unit_filer.rb

@@ -13,9 +13,9 @@ class TestFiler < Typingpool::Test
     assert(filer = Typingpool::Filer.new(path))
     assert_equal(path, "#{filer}")
     assert(text = filer.read)
-    assert_match(text, /^amazon:\n/)
-    assert_match(text, /transcripts: ~\/Documents\/Transcripts\//)
-    assert_match(text, /- mp3\s*$/)
+    assert_match(/^amazon:\n/, text)
+    assert_match(/transcripts: ~\/Documents\/Transcripts\//, text)
+    assert_match(/- mp3\s*$/, text)
     assert_equal(fixtures_dir, filer.dir.path)
     in_temp_dir do |dir|
       path = File.join(dir, 'filer-temp')
@@ -43,7 +43,7 @@ class TestFiler < Typingpool::Test
     assert_respond_to(filer, :map)
     assert_respond_to(filer, :select)
     assert(data.first['audio_url'])
-    assert_match(data.first['audio_url'], /^https?:\/\/\w/)
+    assert_match(/^https?:\/\/\w/, data.first['audio_url'])
     assert(filer.select{|r| r['audio_url'] }.count > 0)
     in_temp_dir do |dir|
       path = File.join(dir, 'filer-temp')
@@ -111,8 +111,8 @@ class TestFiler < Typingpool::Test
       assert_equal(3, chunks.count)
       chunks.each{|chunk| assert(File.exists? chunk) }
       assert(chunks.first.offset)
-      assert_match(chunks.first.offset, /0\.00\b/)
-      assert_match(chunks.to_a[1].offset, /0\.25\b/)
+      assert_match(/0\.00\b/, chunks.first.offset)
+      assert_match(/0\.25\b/, chunks.to_a[1].offset)
     end #in_temp_dir
   end
 

data/test/test_unit_project.rb

@@ -14,7 +14,7 @@ class TestProject < Typingpool::Test
     assert_instance_of(Typingpool::Project, project)
     assert_equal(project_default[:title], project.name)
     assert_equal(dummy_config.to_hash.to_s, project.config.to_hash.to_s)
-    assert_raise(Typingpool::Error::Argument::Format) do 
+    assert_raises(Typingpool::Error::Argument::Format) do 
       Typingpool::Project.new('one/two', dummy_config)
     end #assert_raise...
   end
@@ -152,7 +152,7 @@ class TestProject < Typingpool::Test
 
   def test_local_basename_from_url
     url = ['http://example.com/dir/', URI.escape('Example Title With Spaces & Ampersand.html')].join
-    assert_match(url, /%20/)
+    assert_match(/%20/, url)
 #assert(basename = Typingpool::Project.local_basename_from_url.u)
   end
 

data/test/test_unit_project_local.rb

@@ -38,7 +38,7 @@ class TestProjectLocal < Typingpool::Test
     in_temp_dir do |dir|
       assert(local = create_project_local(dir))
       refute_nil(local.id)
-      assert_raise(Typingpool::Error) do
+      assert_raises(Typingpool::Error) do
         local.create_id
       end
       assert_nil(local.subtitle)

data/test/test_unit_project_remote.rb

@@ -39,7 +39,7 @@ class TestProjectRemote < Typingpool::Test
     assert_equal(21,Typingpool::Project::Remote::S3.random_bucket_name(10).size)
     assert_equal(28,Typingpool::Project::Remote::S3.random_bucket_name(10, 'testing-typingpool').size)
     assert_equal(34,Typingpool::Project::Remote::S3.random_bucket_name(16, 'testing-typingpool').size)
-    assert_match(Typingpool::Project::Remote::S3.random_bucket_name(16, ''), /^[a-z]/)
+    assert_match(/^[a-z]/, Typingpool::Project::Remote::S3.random_bucket_name(16, ''))
   end
 
   def test_project_remote_s3_networked

data/test/test_unit_template.rb

@@ -13,9 +13,9 @@ class TestTemplate < Typingpool::Test
     assert(template2 = Typingpool::Template.new('template.html.erb', [fixtures_dir]))
     has_template_in_fixtures_dir_test(template2)
     signature = 'ffffffffff'
-    assert_match(template1.render({:title => signature}), /#{signature}/)
-    refute_match(template1.read, /#{signature}/)
-    assert_match(template1.read, /<h1><%= title/i)
+    assert_match(/#{signature}/, template1.render({:title => signature}))
+    refute_match(/#{signature}/, template1.read)
+    assert_match(/<h1><%= title/i, template1.read)
     in_temp_dir do |dir1|
       assert(template = Typingpool::Template.new('template', [dir1, fixtures_dir]))
       assert(template.look_in.detect{|path| path == dir1})
@@ -24,9 +24,9 @@ class TestTemplate < Typingpool::Test
         copy_template_fixture_into(dir2, '-2') do |path|
           assert(template = Typingpool::Template.new('template', [dir1, dir2, fixtures_dir]))
           assert_equal(path, template.full_path)
-          assert_match(template.render({:title => signature}), /#{signature}/)
-          refute_match(template.read, /#{signature}/)
-          assert_match(template.read, /<h2><%= title/i)
+          assert_match(/#{signature}/, template.render({:title => signature}))
+          refute_match(/#{signature}/, template.read)
+          assert_match(/<h2><%= title/i, template.read)
         end #copy_template_fixture_into do...
       end #in_temp_dir do |dir2|
     end #in_temp_dir do |dir1|
@@ -40,12 +40,12 @@ class TestTemplate < Typingpool::Test
           config.templates = dir2
           assert(template = Typingpool::Template.from_config('template', config))
           assert_equal(path, template.full_path)
-          assert_match(template.read, /<h2><%= title/i)
+          assert_match(/<h2><%= title/i, template.read)
           config.templates = dir1
-          exception = assert_raise(Typingpool::Error) do 
+          exception = assert_raises(Typingpool::Error) do 
             template = Typingpool::Template.from_config('template', config)
           end #assert_raises() do...
-          assert_match(exception.message, /could not find/i)
+          assert_match(/could not find/i, exception.message)
         end #copy_template_into do...
       end #in_temp_dir do |dir2|
     end #in_temp_dir do |dir1|
@@ -61,7 +61,7 @@ class TestTemplate < Typingpool::Test
           config.templates = dir
           assert(template = Typingpool::Template::Assignment.from_config('template', config))
           assert_equal(assignment_path, template.full_path)
-          assert_match(template.read, /<h2><%= title/i)
+          assert_match(/<h2><%= title/i, template.read)
         end #copy_template_fixture_into(assignment_subdir) do...
       end #copy_template_fixture_into(dir, '') do...
     end #in_temp_dir do...
@@ -71,9 +71,9 @@ class TestTemplate < Typingpool::Test
     assert(template = Typingpool::Template.new('template-3', [fixtures_dir]))
     signatures = [('g' * 9), ('h' * 11)]
     assert(rendered = template.render(:title => signatures[0], :new_title => signatures[1]))
-    assert_match(rendered, /<h1><%= title/i)
-    assert_match(rendered, /<h1>#{signatures[0]}/i)
-    assert_match(rendered, /<h1>#{signatures[1]}/i)
+    assert_match(/<h1><%= title/i, rendered)
+    assert_match(/<h1>#{signatures[0]}/i, rendered)
+    assert_match(/<h1>#{signatures[1]}/i, rendered)
     in_temp_dir do |dir|
       copy_template_fixture_into(dir) do |template_path|
         subdir = File.join(dir, 'closer')
@@ -83,12 +83,12 @@ class TestTemplate < Typingpool::Test
           FileUtils.cp(File.join(fixtures_dir, 'template-2.html.erb'), subdir)
           look_in = [dir, subdir]
           assert(template = Typingpool::Template.new('template', look_in))
-          assert_match(template.read, /<h1><%= title/i)
-          refute_match(template.read, /<h2><%= title/i)
+          assert_match(/<h1><%= title/i, template.read)
+          refute_match(/<h2><%= title/i, template.read)
           assert(calling_template = Typingpool::Template.new('template-3', look_in))
           assert(rendered = calling_template.render(:title => signatures[0], :new_title => signatures[1]))
-          assert_match(rendered, /<h2>/)
-          refute_match(rendered, /<h1>/)
+          assert_match(/<h2>/, rendered)
+          refute_match(/<h1>/, rendered)
         end #copy_template_fixture_into do...
       end #copy_template_fixture_into do...
     end #in_temp_dir do...

data/test/test_unit_transcript.rb

@@ -49,12 +49,12 @@ class TestTranscript < Typingpool::Test
       refute_equal(chunk.filename, chunk.filename_local)
       original_newline_count = chunk.body_as_text.scan(/\n/).count
       chunk.body = chunk.body + "\n\r\f" + ('foo bar baz' * 100) 
-      refute_match(chunk.body_as_text, /\r/) unless $/.match(/\r/)
+      refute_match(/\r/, chunk.body_as_text) unless $/.match(/\r/)
       assert_equal(original_newline_count + 2, chunk.body_as_text.scan(/\n/).count)
       original_p_count = chunk.body_as_html.scan(/<p>/i).count
       chunk.body = chunk.body + "One & two\n\n...and 3 < 4."
-      refute_match(chunk.body_as_html, /\s&\s/)
-      refute_match(chunk.body_as_html, /\s<\s/)
+      refute_match(/\s&\s/, chunk.body_as_html)
+      refute_match(/\s<\s/, chunk.body_as_html)
       assert_equal(original_p_count + 1, chunk.body_as_html.scan(/<p>/i).count)
     end
   end

data/typingpool.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
    s.add_runtime_dependency('nokogiri', '>= 1.5')
    s.add_runtime_dependency('aws-sdk', '~> 1.8.0')
    s.add_runtime_dependency('net-sftp', '>= 2.0.5')
-   s.add_runtime_dependency('vcr')
-   s.add_runtime_dependency('webmock')
+   s.add_development_dependency('minitest', '~> 5.0')
+   s.add_development_dependency('vcr')
+   s.add_development_dependency('webmock')
    s.require_path = 'lib'
    s.executables = ['tp-config',
                     'tp-make',

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: typingpool
 version: !ruby/object:Gem::Version
-  version: 0.8.1
-  prerelease: 
+  version: 0.8.2
 platform: ruby
 authors:
 - Ryan Tate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rturk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,49 +69,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An app for transcribing audio using Mechanical Turk
@@ -256,20 +255,19 @@ files:
 - typingpool.gemspec
 homepage: http://github.com/ryantate/typingpool
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
@@ -277,9 +275,9 @@ requirements:
 - mp3splt
 - mp3wrap
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An app for transcribing audio using Mechanical Turk
 test_files:
 - test/test_unit_amazon.rb