typingpool 0.7.4 → 0.8.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Ryan Tate
+Copyright (c) 2011-2013 Ryan Tate
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -448,5 +448,5 @@ Ryan Tate - ryantate@ryantate.com
 
 ##License
 
-Copyright (c) 2011-2012 Ryan Tate. Released under the terms of the MIT
+Copyright (c) 2011-2013 Ryan Tate. Released under the terms of the MIT
 license. See LICENSE for details.

data/bin/tp-config

@@ -60,7 +60,7 @@ unless options[:testing]
 end
 
 if not(config.amazon.bucket || (config.sftp && config.sftp.user))
-  config.amazon.bucket = ['typingpool', SecureRandom.hex(8)].join('-')
+  config.amazon.bucket = Typingpool::Project::Remote::S3.random_bucket_name
 end
 
 unless config.transcripts

data/lib/typingpool.rb

@@ -483,11 +483,11 @@
 # Ryan Tate - ryantate@ryantate.com
 #
 #==License
-# Copyright (c) 2011-2012 Ryan Tate. Released under the terms of the MIT
+# Copyright (c) 2011-2013 Ryan Tate. Released under the terms of the MIT
 # license. See LICENSE for details.
 
 module Typingpool
-  VERSION = '0.7.4'
+  require 'typingpool/version'
   require 'typingpool/error'
   require 'typingpool/utility'
   require 'typingpool/config'

data/lib/typingpool/project.rb

@@ -39,7 +39,7 @@ module Typingpool
     #this Project instance. Takes an optional Config instance; default
     #is project.config.
     def remote(config=@config)
-      Remote.from_config(@name, config)
+      Remote.from_config(config)
     end
 
     #Constructs and returns a Project::Local instance associated with

data/lib/typingpool/project/remote.rb

@@ -10,29 +10,27 @@ module Typingpool
     #basenames; a 'remove' method, which takes an array of remote file
     #basenames; and the methods 'host' and 'path', which return the
     #location of the destination server and destination directory,
-    #respectively.
+    #respectively. The method 'url' returns the URL string pre-pended
+    #to each file.
     #
-    #Thus, there will always be 'put', 'remove', 'host' and 'path'
+    #Thus, there will always be 'put', 'remove', 'host', 'path', and 'url'
     #methods available, in addition to the Project::Remote methods
     #outlined below.
     class Remote
       require 'typingpool/project/remote/s3'
       require 'typingpool/project/remote/sftp'
 
-      #The project name
-      attr_accessor :name
-
-      #Constructor. Takes the project name and a Config
+      #Constructor. Takes a Config
       #instance. Returns a Project::Remote::S3 or
       #Project::Remote::SFTP instance, depending on the particulars of
       #the Config. If there are sufficient config params to return
       #EITHER an S3 or SFTP subclass, it will prefer the SFTP
       #subclass.
-      def self.from_config(name, config)
+      def self.from_config(config)
         if config.sftp
-          SFTP.new(name, config.sftp)
+          SFTP.from_config(config.sftp)
         elsif config.amazon && config.amazon.bucket
-          S3.new(name, config.amazon)
+          S3.from_config(config.amazon)
         else
           raise Error, "No valid upload params found in config file (SFTP or Amazon info)"
         end
@@ -49,7 +47,7 @@ module Typingpool
       #Given a file path, returns the URL to the file path were it to
       #be uploaded by this instance.
       def file_to_url(file)
-        "#{@url}/#{URI.escape(file)}"
+        "#{url}/#{URI.escape(file)}"
       end
 
       #Given an URL, returns the file portion of the path, given the

data/lib/typingpool/project/remote/s3.rb

@@ -5,22 +5,36 @@ module Typingpool
       #Subclass for storing remote files on Amazon Simple Storage
       #Service (S3)
       class S3 < Remote
-        require 'aws/s3'
-
-        #An Amazon Web Services "Access Key ID." Set from the
-        #Config#amazon value passed to Project::Remote::S3.new, but
-        #changeable.
-        attr_accessor :key
-
-        #An Amazon Web Services "Secret Access Key." Set from the
-        #Config#amazon value passed to Project::Remote::S3.new, but
-        #changeable.
-        attr_accessor :secret
+        require 'aws-sdk'
+
+        #Takes a Config#amazon, extracts the needed params, and
+        #returns a Project::Remote::S3 instance. Raises an exception
+        #of type Error::File::Remote::S3 if any required params (key,
+        #secret, bucket) are missing from the config.
+        def self.from_config(config_amazon)
+          key = config_amazon.key or raise Error::File::Remote::S3, "Missing Amazon key in config"
+          secret = config_amazon.secret or raise Error::File::Remote::S3, "Missing Amazon secret in config"
+          bucket_name = config_amazon.bucket or raise Error::File::Remote::S3, "Missing Amazon bucket in config"
+          url = config_amazon.url
+          new(key, secret, bucket_name, url)
+        end
 
-        #The S3 "bucket" where uploads will be stores. Set from the
-        #Config#amazon value passed to Project::Remote::S3.new, but
-        #changeable.
-        attr_accessor :bucket
+        #Takes an optional length for the random sequence, 16 by
+        #default, and an optional bucket name prefix, 'typingpool-' by
+        #default. Returns a string safe for use as both an S3 bucket
+        #and as a subdomain. Random charcters are drawn from [a-z0-9],
+        #though the first character in the returned string will always
+        #be a letter.
+        def self.random_bucket_name(length=16, prefix='typingpool-')
+          charset = [(0 .. 9).to_a, ('a' .. 'z').to_a].flatten
+          if prefix.to_s.empty? && (length > 0)
+            #ensure subdomain starts with a letter
+            prefix = ('a' .. 'z').to_a[SecureRandom.random_number(26)]
+            length -= 1
+          end
+          random_sequence = (1 .. length).map{ charset[ SecureRandom.random_number(charset.count) ] }
+          [prefix.to_s, random_sequence].join
+        end
 
         #Returns the base URL, which is prepended to the remote
         #files. This is either the 'url' attribute of the
@@ -29,16 +43,13 @@ module Typingpool
         #'default_url' (e.g. "https://bucketname.s3.amazonaws.com").
         attr_reader :url
 
-        #Constructor. Takes the project name and the result of calling
-        #the 'amazon' method on a Config instance (i.e. the amazon
-        #section of a Config file).
-        def initialize(name, amazon_config)
-          @name = name
-          @config = amazon_config
-          @key = @config.key or raise Error::File::Remote::S3, "Missing Amazon key in config"
-          @secret = @config.secret or raise Error::File::Remote::S3, "Missing Amazon secret in config"
-          @bucket = @config.bucket or raise Error::File::Remote::S3, "Missing Amazon bucket in config"
-          @url = @config.url || default_url
+        #Constructor. Takes an Amazon AWS access key id, secret access
+        #key, bucket name, and optional URL prefix.
+        def initialize(key, secret, bucket, url=nil)
+          @key = key 
+          @secret = secret
+          @bucket_name = bucket 
+          @url = url || default_url
         end
 
         #The remote host (server) name, parsed from #url
@@ -54,11 +65,15 @@ module Typingpool
         #Upload files/strings to S3, optionally changing the names in the process.
         # ==== Params
         #[io_streams] Enumerable collection of IO objects, like a File
-        #             or StringIO instance.
+        #             or StringIO instance. Each IO object must repond
+        #             to the methods rewind, read, and eof? (so no
+        #             pipes, sockets, etc)
         #[as]         Optional if the io_streams are File instances. Array of
         #             file basenames, used to name the destination
         #             files. Default is the basename of the Files
         #             passed in as io_streams.
+        #[&block]     Optional. Passed an io_stream and destination name
+        #             just before each upload
         # ==== Returns
         #Array of URLs corresponding to the uploaded files.
         def put(io_streams, as=io_streams.map{|file| File.basename(file)})
@@ -66,27 +81,29 @@ module Typingpool
             dest = as[i]
             yield(stream, dest) if block_given?
             begin
-              AWS::S3::S3Object.store(dest, stream, @bucket,  :access => :public_read)
-            rescue AWS::S3::NoSuchBucket
-              make_bucket
+              s3.buckets[@bucket_name].objects[dest].write(stream, :acl => :public_read)
+            rescue AWS::S3::Errors::NoSuchBucket
+              s3.buckets.create(@bucket_name, :acl => :public_read)
+              stream.rewind
               retry
-            end
+            end #begin
             file_to_url(dest)
           end #batch
         end
 
         #Delete objects from S3.
         # ==== Params
-        #[files] Enumerable collection of file names. Should NOT
-        #        include the bucket name (path).
+        #[files]  Enumerable collection of file names. Should NOT
+        #         include the bucket name (path).
+        #[&block] Optional. Passed a file name before each delete.
         # ==== Returns
-        #Array of booleans corresponding to whether the delete call
-        #succeeded.
+        #Nil
         def remove(files)
           batch(files) do |file, i|
             yield(file) if block_given?
-            AWS::S3::S3Object.delete(file, @bucket)
+            s3.buckets[@bucket_name].objects[file].delete
           end
+          nil
         end
 
         protected
@@ -94,40 +111,28 @@ module Typingpool
         def batch(io_streams)
           results = []
           io_streams.each_with_index do |stream, i|
-            connect if i == 0
             begin
               results.push(yield(stream, i))
-            rescue AWS::S3::S3Exception => e
-              if e.message.match(/AWS::S3::SignatureDoesNotMatch/)
-                raise Error::File::Remote::S3::Credentials, "S3 operation failed with a signature error. This likely means your AWS key or secret is wrong. Error: #{e}"
-              else
-                raise Error::File::Remote::S3, "Your S3 operation failed with an Amazon error: #{e}"
-              end #if    
+            rescue AWS::S3::Errors::InvalidAccessKeyId
+              raise Error::File::Remote::S3::Credentials, "S3 operation failed because your AWS access key ID  is wrong. Double-check your config file."
+            rescue AWS::S3::Errors::SignatureDoesNotMatch
+              raise Error::File::Remote::S3::Credentials, "S3 operation failed with a signature error. This likely means your AWS secret access key is wrong."
+            rescue AWS::Errors::Base => e
+              raise Error::File::Remote::S3, "Your S3 operation failed with an Amazon error: #{e} (#{e.class})"
             end #begin
-          end #files.each
-          disconnect unless io_streams.empty?
+          end #io_streams.each_with_index
           results
         end
 
-        def connect
-          AWS::S3::Base.establish_connection!(
-                                              :access_key_id => @key,
-                                              :secret_access_key => @secret,
-                                              :persistent => false,
-                                              :use_ssl => true
-                                              )
-        end
-
-        def disconnect
-          AWS::S3::Base.disconnect
-        end
-
-        def make_bucket
-          AWS::S3::Bucket.create(@bucket)
+        def s3
+          AWS::S3.new(
+                     :access_key_id => @key,
+                     :secret_access_key => @secret
+                     )
         end
 
         def default_url
-          "https://#{@bucket}.s3.amazonaws.com"
+          "https://#{@bucket_name}.s3.amazonaws.com"
         end
       end #S3
     end #Remote

data/lib/typingpool/project/remote/sftp.rb

@@ -9,6 +9,18 @@ module Typingpool
       class SFTP < Remote
         require 'net/sftp'
 
+        #Takes a Config#sftp, extracts the needed params, and returns
+        #a Project::Remote::SFTP instance. Raises an exception of type
+        #Error::File::Remote::SFTP if any required params (user, host,
+        #url) are missing from the config.
+        def self.from_config(config_sftp)
+          user = config_sftp.user or raise Error::File::Remote::SFTP, "No SFTP user specified in config"
+          host = config_sftp.host or raise Error::File::Remote::SFTP, "No SFTP host specified in config"
+          url = config_sftp.url or raise Error::File::Remote::SFTP, "No SFTP url specified in config"
+          path = config_sftp.path
+          new(user, host, url, path)
+        end
+
         #Returns the remote host (server) name. This is set from
         #Config#sftp#host.
         attr_reader :host
@@ -25,14 +37,14 @@ module Typingpool
         #files. This is set from Config#sftp#url.
         attr_reader :url
 
-        #Constructor. Takes the project name and a Config#sftp.
-        def initialize(name, sftp_config)
-          @name = name
-          @config = sftp_config   
-          @user = @config.user or raise Error::File::Remote::SFTP, "No SFTP user specified in config"
-          @host = @config.host or raise Error::File::Remote::SFTP, "No SFTP host specified in config"
-          @url = @config.url or raise Error::File::Remote::SFTP, "No SFTP url specified in config"
-          @path = @config.path || ''
+        #Constructor. Takes the project name, SFTP user, SFTP host,
+        #URL prefix to append to file names, and an optional SFTP path
+        #(for SFTP uploading, not appended to URL).
+        def initialize(user, host, url, path=nil)
+          @user = user 
+          @host = host 
+          @url = url 
+          @path = path || ''
         end
 
         #See docs for Project::Remote::S3#put.

data/lib/typingpool/test/fixtures/utf8-2.txt

@@ -0,0 +1,6 @@
+Star Cyrillic small letter DE (0434): д
+
+Arabic letter peheh (06A6): ڦ
+
+A Tamil letter I (0B87): இ
+

data/lib/typingpool/test/fixtures/utf8.txt

@@ -0,0 +1,8 @@
+¡Héllö, wőrld!
+
+“This text is inside ‘smart’ quotes.”
+
+Here is a white on black cross: ✞
+
+Here is a sideways heart: ❥
+

data/lib/typingpool/version.rb

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

data/test/test_integration_script_2_tp_make.rb

@@ -41,6 +41,7 @@ class TestTpMake < Typingpool::Test::Script
       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_not_nil(assignment['audio_url'])
         assert(working_url? assignment['audio_url'])
@@ -108,6 +109,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)
       ensure
         tp_finish_outside_sandbox(dir, good_config_path)

data/test/test_integration_script_6_tp_finish.rb

@@ -15,23 +15,26 @@ class TestTpFinish < Typingpool::Test::Script
     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_nothing_raised do
       tp_finish_outside_sandbox(dir, config_path)
     end
-    sleep 1 #pause before checking URLs so remote server has time to fully delete 
+    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')
   end
 
-  def test_tp_finish_on_audio_files
+  def test_tp_finish_on_audio_files_with_sftp
+    skip_if_no_sftp_credentials('tp-finish sftp test')
     in_temp_tp_dir do |dir|
       config_path = self.config_path(dir)
       tp_finish_on_audio_files_with(dir, config_path)
-    end
+    end 
   end
 
   def test_tp_finish_on_audio_files_with_s3
+    skip_if_no_s3_credentials('tp-finish sftp test')
     in_temp_tp_dir do |dir|
       config = config_from_dir(dir)
       config.to_hash.delete('sftp')

data/test/test_unit_project_remote.rb

@@ -5,37 +5,41 @@ $:.unshift File.join(File.dirname(File.dirname($0)), 'lib')
 require 'typingpool'
 require 'typingpool/test'
 require 'stringio'
+require 'aws-sdk'
+require 'securerandom'
 
 class TestProjectRemote < Typingpool::Test
   def test_project_remote_from_config
-    assert(remote = Typingpool::Project::Remote.from_config(project_default[:title], dummy_config(1)))
+    assert(remote = Typingpool::Project::Remote.from_config(dummy_config(1)))
     assert_instance_of(Typingpool::Project::Remote::S3, remote)
-    assert(remote = Typingpool::Project::Remote.from_config(project_default[:title], dummy_config(2)))
+    assert(remote = Typingpool::Project::Remote.from_config(dummy_config(2)))
     assert_instance_of(Typingpool::Project::Remote::SFTP, remote)
     config = dummy_config(2)
     config.to_hash.delete('sftp')
     assert_raises(Typingpool::Error) do
-      Typingpool::Project::Remote.from_config(project_default[:title], config)
+      Typingpool::Project::Remote.from_config(config)
     end #assert_raises
   end
 
   def test_project_remote_s3_base
     config = dummy_config(1)
-    assert(remote = Typingpool::Project::Remote::S3.new(project_default[:title], config.amazon))
-    %w(key secret bucket).each do |param|
-      refute_nil(remote.send(param.to_sym))
-      assert_equal(config.amazon.send(param.to_sym), remote.send(param.to_sym))
-    end #%w().each do...
+    assert(remote = Typingpool::Project::Remote::S3.from_config(config.amazon))
     assert_nil(config.amazon.url)
     assert_includes(remote.url, config.amazon.bucket)
     custom_url = 'http://tp.example.com/tp-test/1/2/3'
     config.amazon.url = custom_url
-    assert(remote = Typingpool::Project::Remote::S3.new(project_default[:title], config.amazon))
+    assert(remote = Typingpool::Project::Remote::S3.from_config(config.amazon))
     refute_nil(remote.url)
     refute_includes(remote.url, config.amazon.bucket)
     assert_includes(remote.url, custom_url)
     assert_equal('tp.example.com', remote.host)
     assert_equal('/tp-test/1/2/3', remote.path)
+    assert_includes(Typingpool::Project::Remote::S3.random_bucket_name, 'typingpool-')
+    assert_equal(27, Typingpool::Project::Remote::S3.random_bucket_name.size)
+    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]/)
   end
 
   def test_project_remote_s3_networked
@@ -47,9 +51,26 @@ class TestProjectRemote < Typingpool::Test
     standard_put_remove_tests(remote)
   end
 
+  def test_project_remote_s3_networked_make_new_bucket_when_needed
+    assert(config = self.config)
+    skip_if_no_s3_credentials('Project::Remote::S3 upload and delete tests', config)
+    config.to_hash.delete('sftp')
+    config.amazon.bucket = Typingpool::Project::Remote::S3.random_bucket_name(16, 'typingpool-test-')
+    assert(s3 = AWS::S3.new(:access_key_id => config.amazon.key, :secret_access_key => config.amazon.secret))
+    refute(s3.buckets[config.amazon.bucket].exists?)
+    assert(project = Typingpool::Project.new(project_default[:title], config))
+    assert_instance_of(Typingpool::Project::Remote::S3, remote = project.remote)
+    begin
+      standard_put_remove_tests(remote)
+      assert(s3.buckets[config.amazon.bucket].exists?)
+    ensure
+      s3.buckets[config.amazon.bucket].delete
+    end #begin
+  end
+
   def test_project_remote_sftp_base
     config = dummy_config(2)
-    assert(remote = Typingpool::Project::Remote::SFTP.new(project_default[:title], config.sftp))
+    assert(remote = Typingpool::Project::Remote::SFTP.from_config(config.sftp))
     %w(host path user url).each do |param|
       refute_nil(remote.send(param.to_sym))
       assert_equal(config.sftp.send(param.to_sym), remote.send(param.to_sym))
@@ -140,6 +161,7 @@ class TestProjectRemote < Typingpool::Test
     assert(urls = args[:remote].put(*put_args))
     begin
       assert_equal(args[:streams].count, urls.count)
+      sleep 4
       urls.each{|url| assert(working_url?(url)) }
       args[:test_with].call(urls) if args[:test_with]
     ensure

data/typingpool.gemspec

@@ -0,0 +1,42 @@
+ #!/usr/bin/env gem build 
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'typingpool/version'
+
+Gem::Specification.new do |s|
+   s.name = 'typingpool'
+   s.version = Typingpool::VERSION
+   s.date = Time.now.strftime("%Y-%m-%d")
+   s.description = 'An app for transcribing audio using Mechanical Turk'
+   s.summary = s.description
+   s.authors = ['Ryan Tate']
+   s.email = 'ryantate@ryantate.com'
+   s.homepage = 'http://github.com/ryantate/typingpool'
+   s.required_ruby_version = '>= 1.9.2'
+   s.requirements = ['ffmpeg', 'mp3splt', 'mp3wrap']
+   s.add_runtime_dependency('rturk', '~> 2.9')
+   s.add_runtime_dependency('highline', '>= 1.6')
+   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.require_path = 'lib'
+   s.executables = ['tp-config',
+                    'tp-make',
+                    'tp-assign',
+                    'tp-review',
+                    'tp-collect',
+                    'tp-finish']
+   s.test_files = ['test/test_unit_amazon.rb',
+                   'test/test_unit_config.rb',
+                   'test/test_unit_filer.rb',
+                   'test/test_unit_project.rb',
+                   'test/test_unit_project_local.rb',
+                   'test/test_unit_project_remote.rb',
+                   'test/test_unit_template.rb',
+                   'test/test_unit_transcript.rb']
+   s.bindir = 'bin'
+   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+   s.files = `git ls-files`.split("\n")
+ end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typingpool
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rturk
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -126,32 +126,32 @@ dependencies:
 description: An app for transcribing audio using Mechanical Turk
 email: ryantate@ryantate.com
 executables:
-- tp-config
-- tp-make
 - tp-assign
-- tp-review
 - tp-collect
+- tp-config
 - tp-finish
+- tp-make
+- tp-review
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
 - LICENSE
 - README.markdown
-- bin/tp-config
-- bin/tp-make
+- Rakefile
 - bin/tp-assign
-- bin/tp-review
 - bin/tp-collect
+- bin/tp-config
 - bin/tp-finish
+- bin/tp-make
+- bin/tp-review
 - lib/typingpool.rb
 - lib/typingpool/amazon.rb
-- lib/typingpool/amazon/question.rb
 - lib/typingpool/amazon/hit.rb
-- lib/typingpool/amazon/hit/full.rb
-- lib/typingpool/amazon/hit/full/fromsearchhits.rb
 - lib/typingpool/amazon/hit/assignment.rb
 - lib/typingpool/amazon/hit/assignment/empty.rb
+- lib/typingpool/amazon/hit/full.rb
+- lib/typingpool/amazon/hit/full/fromsearchhits.rb
+- lib/typingpool/amazon/question.rb
 - lib/typingpool/app.rb
 - lib/typingpool/app/cli.rb
 - lib/typingpool/app/cli/formatter.rb
@@ -173,12 +173,6 @@ files:
 - lib/typingpool/template.rb
 - lib/typingpool/template/assignment.rb
 - lib/typingpool/template/env.rb
-- lib/typingpool/test.rb
-- lib/typingpool/test/script.rb
-- lib/typingpool/transcript.rb
-- lib/typingpool/transcript/chunk.rb
-- lib/typingpool/utility.rb
-- lib/typingpool/utility/castable.rb
 - lib/typingpool/templates/assignment/amazon-init.js
 - lib/typingpool/templates/assignment/interview.html.erb
 - lib/typingpool/templates/assignment/interview/nameless.html.erb
@@ -205,6 +199,7 @@ files:
 - lib/typingpool/templates/project/etc/player/player.swf
 - lib/typingpool/templates/project/etc/transcript.css
 - lib/typingpool/templates/transcript.html.erb
+- lib/typingpool/test.rb
 - lib/typingpool/test/fixtures/amazon-question-html.html
 - lib/typingpool/test/fixtures/amazon-question-url.txt
 - lib/typingpool/test/fixtures/audio/mp3/interview.1.mp3
@@ -222,12 +217,20 @@ files:
 - lib/typingpool/test/fixtures/tp_review_id.txt
 - lib/typingpool/test/fixtures/tp_review_sandbox-assignment.csv
 - lib/typingpool/test/fixtures/transcript-chunks.csv
+- lib/typingpool/test/fixtures/utf8-2.txt
+- lib/typingpool/test/fixtures/utf8.txt
 - lib/typingpool/test/fixtures/utf8_transcript.txt
 - lib/typingpool/test/fixtures/vcr/tp-collect-1.yml
 - lib/typingpool/test/fixtures/vcr/tp-collect-2.yml
 - lib/typingpool/test/fixtures/vcr/tp-collect-3.yml
 - lib/typingpool/test/fixtures/vcr/tp-review-1.yml
 - lib/typingpool/test/fixtures/vcr/tp-review-2.yml
+- lib/typingpool/test/script.rb
+- lib/typingpool/transcript.rb
+- lib/typingpool/transcript/chunk.rb
+- lib/typingpool/utility.rb
+- lib/typingpool/utility/castable.rb
+- lib/typingpool/version.rb
 - test/make_amazon_question_fixture.rb
 - test/make_tp_collect_fixture_1.rb
 - test/make_tp_collect_fixture_2.rb
@@ -250,6 +253,7 @@ files:
 - test/test_unit_project_remote.rb
 - test/test_unit_template.rb
 - test/test_unit_transcript.rb
+- typingpool.gemspec
 homepage: http://github.com/ryantate/typingpool
 licenses: []
 post_install_message: