wistia-uploader 0.1.4 → 1.0.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.3-p392@wistia-uploader --create

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem 'json'
 gem 'multipart-post', '>= 1.1.5'
@@ -6,8 +6,11 @@ gem 'multipart-post', '>= 1.1.5'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.4"
-  gem "jeweler", "~> 1.8.4"
+  gem 'shoulda', '>= 0'
+  gem 'rdoc', '~> 3.12'
+  gem 'jeweler', '~> 1.8.4'
+end
+
+group :test do
+  gem 'rspec'
 end

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    diff-lcs (1.2.4)
     git (1.2.5)
     i18n (0.6.1)
     jeweler (1.8.4)
@@ -17,6 +18,14 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     shoulda (3.1.1)
       shoulda-context (~> 1.0)
       shoulda-matchers (~> 1.2)
@@ -28,9 +37,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1.4)
   jeweler (~> 1.8.4)
   json
   multipart-post (>= 1.1.5)
   rdoc (~> 3.12)
+  rspec
   shoulda

data/README.md

@@ -1,11 +1,14 @@
-wistia-uploader
-===============
+# wistia-uploader
 
-A simple command line media upload client for Wistia users.
+A command line media upload client for Wistia users.
 
 Run 'bin/wistia-uploader -h' for additional information.
 
-Configuration
+## Requirements
+
+wistia-uploader works with Ruby 1.8.7 and 1.9.3. Earlier versions of 1.8 and 1.9 may work but have not been tested.
+
+## Configuration
 -------------
 
 While not required for use, defaults for various required parameters may be
@@ -18,8 +21,3 @@ key/value pairs. Example:
 
 A Wistia 'contact_id' may also be specified, otherwise the account owner will
 be inferred from the project.
-
-Copyright
----------
-
-Copyright (c) 2012 Jason Lawrence of Wistia, Inc.

data/Rakefile

@@ -14,25 +14,22 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "wistia-uploader"
-  gem.homepage = "http://github.com/wistia/wistia-uploader"
-  gem.license = "MIT"
-  gem.summary = %Q{A simple CLI uploader for Wistia users.}
-  gem.description = %Q{A simple CLI uploader for Wistia users.}
-  gem.email = "jason@wistia.com"
-  gem.authors = ["Jason Lawrence"]
+  gem.name = 'wistia-uploader'
+  gem.homepage = 'http://github.com/wistia/wistia-uploader'
+  gem.license = 'MIT'
+  gem.summary = 'A simple CLI uploader for Wistia users.'
+  gem.description = 'A simple CLI uploader for Wistia users.'
+  gem.email = 'dev@wistia.com'
+  gem.authors = ['Robby Grossman', 'Jason Lawrence', 'Brendan Schwartz']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
+desc 'Run specs'
+RSpec::Core::RakeTask.new
 
-task :default => :test
+task default: :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.4
+1.0.0

data/bin/wistia-uploader

@@ -3,10 +3,9 @@
 # A simple CLI media uploader for Wistia.
 
 require 'set'
-require 'json'
 require 'optparse'
 
-require_relative '../lib/wistia-uploader'
+require File.expand_path('../../lib/wistia-uploader', __FILE__)
 
 options = {}
 
@@ -15,57 +14,57 @@ required = Set.new [:api_password, :media_file]
 loadable = Set.new([:contact_id, :project_id]) + required
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: wistia-uploader [options]"
-
-  opts.separator ""
-  opts.separator "Description:"
-  opts.separator "  Upload media files to a Wistia project."
-  opts.separator ""
-  opts.separator "Configuration:"
-  opts.separator "  Default values for required options may be specified as"
-  opts.separator "  newline separated key=value pairs in '~/.wistia.conf'."
-  opts.separator ""
-  opts.separator "  Options provided in this manner will be overridden if"
-  opts.separator "  specified on the command line."
-  opts.separator ""
-
-  opts.separator "General options:"
-
-  opts.on("-q", "--quiet", "Silence output") do |q|
+  opts.banner = 'Usage: wistia-uploader [options]'
+
+  opts.separator ''
+  opts.separator 'Description:'
+  opts.separator '  Upload media files to a Wistia project.'
+  opts.separator ''
+  opts.separator 'Configuration:'
+  opts.separator '  Default values for required options may be specified as'
+  opts.separator '  newline separated key=value pairs in \'~/.wistia.conf\'.'
+  opts.separator ''
+  opts.separator '  Options provided in this manner will be overridden if'
+  opts.separator '  specified on the command line.'
+  opts.separator ''
+
+  opts.separator 'General options:'
+
+  opts.on('-q', '--quiet', 'Silence output') do |q|
     options[:quiet] = q
   end
 
-  opts.on("-j", "--json", "Output JSON") do |j|
+  opts.on('-j', '--json', 'Output JSON') do |j|
     options[:json] = j
   end
 
-  opts.separator ""
-  opts.separator "Required options:"
+  opts.separator ''
+  opts.separator 'Required options:'
 
-  opts.on("-k", "--api-password API_PASSWORD", "The Wistia API password.") do |api_password|
+  opts.on('-k', '--api-password API_PASSWORD', 'The Wistia API password.') do |api_password|
     options[:api_password] = api_password
   end
 
-  opts.on("-f", "--media-file MEDIA_FILE", "The local path of the media file to be", "uploaded.") do |media_file|
+  opts.on('-f', '--media-file MEDIA_FILE', 'The local/remote path of the media file', 'to be uploaded/imported.') do |media_file|
     options[:media_file] = media_file
   end
 
-  opts.separator ""
-  opts.separator "Optional:"
+  opts.separator ''
+  opts.separator 'Optional:'
 
-  opts.on("-p", "--project-id PROJECT_ID", "The hashed id of the Wistia project to", "upload to.") do |project_id|
+  opts.on('-p', '--project-id PROJECT_ID', 'The hashed id of the Wistia project to', 'upload to.') do |project_id|
     options[:project_id] = project_id
   end
 
-  opts.on("-n", "--media-name MEDIA_NAME", "Set the display name of the media in the", "Wistia project. If unspecified, this will", "default to the filename.") do |media_name|
+  opts.on('-n', '--media-name MEDIA_NAME', 'Set the display name of the media in the', 'Wistia project. If unspecified, this will', 'default to the filename.') do |media_name|
     options[:media_name] = media_name
   end
 
-  opts.on("-c", "--contact-id CONTACT_ID", "The numeric id of the Wistia contact.", "If this is unspecified, the account will", "be inferred from the project_id.") do |contact_id|
+  opts.on('-c', '--contact-id CONTACT_ID', 'The numeric id of the Wistia contact.', 'If this is unspecified, the account will', 'be inferred from the project_id.') do |contact_id|
     options[:contact_id] = contact_id
   end
 
-  opts.on_tail("-h", "--help", "Show this message") do
+  opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit
   end
@@ -80,9 +79,9 @@ end
 
 # Load defaults from ~/.wistia.conf, if present. Only valid loadable options
 # not already specified on the CLI will be initialized in this manner.
-if File.exists? File.expand_path("~/.wistia.conf")
-  puts "Found ~/.wistia.conf, loading defaults!" if !options[:quiet]
-  File.open(File.expand_path("~/.wistia.conf")) do |conf|
+if File.exists? File.expand_path('~/.wistia.conf')
+  puts 'Found ~/.wistia.conf, loading defaults!' if !options[:quiet]
+  File.open(File.expand_path('~/.wistia.conf')) do |conf|
     conf.readlines.reject{|l|l.strip.start_with?('#')}.each do |line|
       k, v = line.split("=").map { |i| i.strip }
       next if (k.empty? || v.empty?)
@@ -95,14 +94,14 @@ end
 
 # Ensure that we have all required parameters.
 unless options.keys.to_set.superset?(required)
-  puts "ERROR: You're missing some required options! Please specify:"
-  puts ""
+  puts 'ERROR: You\'re missing some required options! Please specify:'
+  puts ''
   missing = required - options.keys.to_set
   missing.to_a.sort.each do |m|
     puts "  --#{m.to_s.gsub(/_/,"-")}"
   end
-  puts ""
-  puts "Use '-h' to see the help documentation."
+  puts ''
+  puts 'Use \'-h\' to see the help documentation.'
   exit
 end
 
@@ -119,48 +118,52 @@ begin
     paths = [options[:media_file]]
   end
 
-  paths.each do |local_media|
-
-    puts "Uploading '#{local_media}'..." if !options[:quiet]
-    # Find the proper expansion of the path.
-    unless File.exists?(local_media) && !File.directory?(local_media)
-      puts "Detected possible shell glob. Computing paths."
-      paths = Dir.glob local_media
-      exit
-    end
-
-    unless File.exists? local_media
-      puts "ERROR: The file '#{local_media}' doesn't seem to exist."
-      exit
+  paths.each do |original_media_path|
+    if File.exists?(original_media_path)
+      puts "Uploading local file: '#{original_media_path}'..." if !options[:quiet]
+      original_media_is_local = true
+    else
+      if original_media_path =~ /^(#{(WistiaUploader::SUPPORTED_SCHEMES.join('|'))}):\/\//
+        puts "Importing remote file: '#{original_media_path}'..." if !options[:quiet]
+        original_media_is_local = false
+      else
+        puts "Local file #{original_media_path} does not exist."
+        exit
+      end
     end
 
     thread = WistiaUploader.upload_media(
       options[:api_password], options[:project_id],
-      local_media, options[:media_name], options[:contact_id])
+      original_media_path, options[:media_name], options[:contact_id])
 
     $stdout.sync
 
-    phases = ["-", "\\", "|", "/"]
-    phase = 0
-    while (!thread[:upload_status])
-      if thread[:progress] == nil
-        comp = 0
-      else
-        comp = (thread[:progress] * 50).round
-      end
-      if thread[:samples] && (thread[:samples].length > 0)
-        bps = (thread[:samples].inject{|sum,x| sum + x[0] }) / thread[:samples].length
-      else
-        bps = 0.0
+    if original_media_is_local
+      phases = ["-", "\\", "|", "/"]
+      phase = 0
+      while (thread[:upload_status].nil?)
+        if thread[:progress] == nil
+          comp = 0
+        else
+          comp = (thread[:progress] * 50).round
+        end
+        if thread[:samples] && (thread[:samples].length > 0)
+          bps = (thread[:samples].inject{|sum,x| sum + x[0] }) / thread[:samples].length
+        else
+          bps = 0.0
+        end
+        unless options[:quiet]
+          $stdout.write("\r")
+          $stdout.write(" #{'%3d' % (2*comp)}% [#{'=' * comp}>#{' ' * (50 - comp)}] #{phases[phase]} #{thread[:last_pos]} bytes")
+          $stdout.flush if RUBY_VERSION =~ /^1.8/
+        end
+        phase = (phase + 1) % 4
+        sleep 0.2
       end
-      unless options[:quiet]
-        $stdout.write("\r")
-        $stdout.write(" #{'%3d' % (2*comp)}% [#{'=' * comp}>#{' ' * (50 - comp)}] #{phases[phase]} #{thread[:last_pos]} bytes")
-      end
-      phase = (phase + 1) % 4
-      sleep 0.2
+      $stdout.write("\n") unless options[:quiet]
+    else
+      thread.join
     end
-    $stdout.write("\n") unless options[:quiet]
 
     if thread[:upload_status] == :success
       data = JSON.parse(thread[:body])
@@ -170,11 +173,11 @@ begin
       puts data if options[:json]
     else
       # Error state.
-      puts "An error occurred during upload!" unless options[:quiet]
+      puts 'An error occurred during upload!' unless options[:quiet]
       exit 1
     end
   end
 rescue
   puts "ERROR! Upload failed. Msg: #{$!}"
-  puts "\t" + $!.backtrace.join("\n\t")
+  puts "\t#{$!.backtrace.join("\n\t")}"
 end

data/lib/wistia-uploader.rb

@@ -1,8 +1,12 @@
+# Setup environment via bundler
+require 'rubygems'
+require 'bundler/setup'
+
+require 'json'
 require 'net/http'
+require 'net/https' if RUBY_VERSION =~ /^1.8/
 require 'net/http/post/multipart'
 
-UPLOAD_URL = "https://upload.wistia.com/"
-
 # Hacktacular mostly-accurate patch for upload monitoring.
 class WFile < File
   def set_thread(thread)
@@ -10,8 +14,13 @@ class WFile < File
   end
   def read(*args)
     if @thread
-      @thread[:progress] = ((1.0 * self.pos()) / self.size()).round(2)
-      @thread[:last_pos] = self.pos()
+      rounded_file_size = if RUBY_VERSION =~ /^1.8/
+                            (File.size(self.path) * 100).round / 100.0
+                          else
+                            self.size.round(2)
+                          end
+      @thread[:progress] = 1.0 * self.pos / rounded_file_size
+      @thread[:last_pos] = self.pos
     end
     super(*args)
   end
@@ -19,54 +28,97 @@ end
 
 
 class WistiaUploader
+  UPLOAD_URL = 'https://upload.wistia.com/'
+  SUPPORTED_SCHEMES = %w(ftp http https)
 
   def self.upload_media(api_pass, project, file, name=nil, contact=nil)
     params = { :api_password => api_pass, :project_id => project }
     params[:contact_id] = contact if contact
     params[:name] = name if name
 
-    return self.post_file_to_wistia('', params, file)
+    self.post_file_to_wistia('', params, file)
   end
-  
-  def self.post_file_to_wistia(path, data, file, timeout=nil)
-    Thread.new do
-      thread = Thread.current
-      thread[:progress] = 0.0
-      thread[:last_pos] = 0
 
+
+  def self.post_file_to_wistia(path, data, file, timeout=nil)
+    data.reject! { |k,v| v.nil? || v.to_s.empty? } # Sanitize the params hash.
+    thread = Thread.new do
+      Thread.current[:progress] = 0.0
+      Thread.current[:last_pos] = 0
       uri = URI(UPLOAD_URL + path)
+      http_client = self.get_http_client(uri, timeout)
+      response = self.perform_http_post(file, data, uri, http_client)
+      self.set_thread_status_from_response(response)
+    end
+    thread
+  end
 
-      # Sanitize the params hash.
-      data.reject! { |k,v| (v == nil) || v.empty? }
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if (uri.scheme == 'https')
+  private
 
-      # Set the connection timeouts, if specified
-      if timeout
-        http.ssl_timeout = 10
-        http.open_timeout = 10
-        http.read_timeout = 10
+  def self.perform_http_post(file, data, uri, http_client)
+    if self.file_is_local?(file)
+      self.upload_local_file(file, data, uri, http_client)
+    else
+      self.import_remote_file(file, data, uri, http_client)
+    end
+  end
+
+
+  def self.get_http_client(uri, timeout)
+    http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      if RUBY_VERSION =~ /^1.8/
+        http.cert_store = OpenSSL::X509::Store.new.set_default_paths
       end
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
+
+    # Set the connection timeouts, if specified
+    if timeout
+      http.ssl_timeout = 10
+      http.open_timeout = 10
+      http.read_timeout = 10
+    end
 
-      media = WFile.open(file)
-      media.set_thread(thread)
+    http
+  end
 
-      req = Net::HTTP::Post::Multipart.new uri.request_uri, data.merge({
-        'file' => UploadIO.new(media, 'application/octet-stream', File.basename(file))
-      })
-      res = http.request(req)
-      media.close
 
-      thread[:code] = res.code
-      thread[:body] = res.body
+  def self.upload_local_file(file, data, uri, http)
+    media = WFile.open(file)
+    media.set_thread(Thread.current)
+    req = Net::HTTP::Post::Multipart.new uri.request_uri, data.merge({
+      'file' => UploadIO.new(media, 'application/octet-stream', File.basename(file))
+    })
+    response = http.request(req)
+    media.close
+    response
+  end
 
-      if res.code == '200'
-        thread[:upload_status] = :success
-      else
-        thread[:upload_status] = :failed
-      end
-    end
+
+  def self.import_remote_file(file, data, uri, http)
+    req = Net::HTTP::Post.new(uri.request_uri)
+    req.set_form_data(data.merge(:url => file))
+    http.request(req)
+  end
+
+
+  def self.file_is_local?(file_path)
+    !self.file_is_remote?(file_path)
+  end
+
+
+  def self.file_is_remote?(file_path)
+    file_path =~ /^(#{(SUPPORTED_SCHEMES.join('|'))}):\/\//
   end
 
+
+  def self.set_thread_status_from_response(response)
+    Thread.current[:code] = response.code
+    Thread.current[:body] = response.body
+
+    Thread.current[:upload_status] = (response.code == '200') ? :success : :failed
+  end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'wistia-uploader.rb')
+
+RSpec.configure do |config|
+  config.color_enabled = true
+end

data/spec/wistia-uploader_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+describe WistiaUploader do
+  describe 'public class methods' do
+    describe '#upload_media' do
+      it 'posts the specified file to Wistia when given optional params' do
+        password = mock('password')
+        project = mock('project')
+        file = mock('file')
+        name = mock('name')
+        contact = mock('contact')
+
+        WistiaUploader.should_receive(:post_file_to_wistia).with('',
+          hash_including({
+            api_password: password,
+            project_id: project,
+            contact_id: contact,
+            name: name,
+          }), file
+        )
+        WistiaUploader.upload_media(password, project, file, name, contact)
+      end
+      it 'posts the specified file to Wistia when given only required params' do
+        password = mock('password')
+        project = mock('project')
+        file = mock('file')
+
+        WistiaUploader.should_receive(:post_file_to_wistia).with('',
+          hash_including({
+            api_password: password,
+            project_id: project,
+          }), file
+        )
+        WistiaUploader.upload_media(password, project, file)
+      end
+    end
+    describe '#post_file_to_wistia' do
+      describe 'given a local file' do
+        it 'uploads the file' do
+          file = mock('file')
+          file.stub :set_thread
+          WFile.should_receive(:open).with('/var/tmp/dummy.mov').and_return(file)
+
+          upload_io = mock('upload io')
+          UploadIO.should_receive(:new).and_return(upload_io)
+
+          request = mock('request')
+          Net::HTTP::Post::Multipart.should_receive(:new).and_return(request)
+
+          http = mock('net_http')
+          Net::HTTP.should_receive(:new).and_return(http)
+
+          http.stub :use_ssl=
+          http.stub :verify_mode=
+
+          response = mock('response')
+          http.should_receive(:request).and_return(response)
+          file.stub :close
+
+          response.should_receive(:code).exactly(2).and_return('200')
+          response.should_receive(:body).and_return('OK')
+
+          thread = WistiaUploader.post_file_to_wistia('', {api_password: 'pass', project_id: 5}, '/var/tmp/dummy.mov')
+          thread.join
+        end
+      end
+      describe 'for remote files' do
+        before do
+          request = mock('request')
+          Net::HTTP::Post.should_receive(:new).and_return(request)
+          request.stub :set_form_data
+
+          http = mock('net_http')
+          Net::HTTP.should_receive(:new).and_return(http)
+
+          http.stub :use_ssl=
+          http.stub :verify_mode=
+
+          response = mock('response')
+          http.should_receive(:request).and_return(response)
+
+          response.should_receive(:code).exactly(2).and_return('200')
+          response.should_receive(:body).and_return('OK')
+        end
+        it 'web file: imports the file' do
+          thread = WistiaUploader.post_file_to_wistia('', {api_password: 'pass', project_id: 5}, 'http://fakedomain.cc/dummy.mov')
+          thread.join
+        end
+        it 'ssl web file: imports the file' do
+          thread = WistiaUploader.post_file_to_wistia('', {api_password: 'pass', project_id: 5}, 'https://fakedomain.cc/dummy.mov')
+          thread.join
+        end
+        it 'ftp file: imports the file' do
+          thread = WistiaUploader.post_file_to_wistia('', {api_password: 'pass', project_id: 5}, 'ftp://fakedomain.cc/dummy.mov')
+          thread.join
+        end
+      end
+    end
+  end
+
+  describe 'private class methods' do
+    describe '#perform_http_post' do
+      describe 'with local file' do
+        it 'performs upload' do
+          WistiaUploader.stub(:file_is_local?).and_return(true)
+          WistiaUploader.should_receive(:upload_local_file).exactly(1)
+          WistiaUploader.send :perform_http_post, nil, nil, nil, nil
+        end
+      end
+      describe 'with remote file' do
+        it 'performs import' do
+          WistiaUploader.stub(:file_is_local?).and_return(false)
+          WistiaUploader.should_receive(:import_remote_file).exactly(1)
+          WistiaUploader.send :perform_http_post, nil, nil, nil, nil
+        end
+      end
+    end
+    describe '#file_is_local? and #file_is_remote?' do
+      it 'works for http (non-ssl) files' do
+        file_path = 'http://example.com/movie.mov'
+        WistiaUploader.send(:file_is_local?, file_path).should be_false
+        WistiaUploader.send(:file_is_remote?, file_path).should be_true
+      end
+      it 'works for http (ssl) files' do
+        file_path = 'https://example.com/movie.mov'
+        WistiaUploader.send(:file_is_local?, file_path).should be_false
+        WistiaUploader.send(:file_is_remote?, file_path).should be_true
+      end
+      it 'works for ftp files' do
+        file_path = 'ftp://example.com/movie.mov'
+        WistiaUploader.send(:file_is_local?, file_path).should be_false
+        WistiaUploader.send(:file_is_remote?, file_path).should be_true
+      end
+      it 'works for local files' do
+        file_path = '/var/www/movie.mov'
+        WistiaUploader.send(:file_is_local?, file_path).should be_true
+        WistiaUploader.send(:file_is_remote?, file_path).should be_false
+      end
+    end
+  end
+end

data/wistia-uploader.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "wistia-uploader"
-  s.version = "0.1.4"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jason Lawrence"]
-  s.date = "2012-12-06"
+  s.authors = ["Robby Grossman", "Jason Lawrence", "Brendan Schwartz"]
+  s.date = "2013-08-19"
   s.description = "A simple CLI uploader for Wistia users."
-  s.email = "jason@wistia.com"
+  s.email = "dev@wistia.com"
   s.executables = ["wistia-uploader"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,14 +28,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/wistia-uploader",
     "lib/wistia-uploader.rb",
-    "test/helper.rb",
-    "test/test_wistia-uploader.rb",
+    "spec/spec_helper.rb",
+    "spec/wistia-uploader_spec.rb",
     "wistia-uploader.gemspec"
   ]
   s.homepage = "http://github.com/wistia/wistia-uploader"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "A simple CLI uploader for Wistia users."
 
   if s.respond_to? :specification_version then
@@ -45,14 +46,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multipart-post>, [">= 1.1.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<multipart-post>, [">= 1.1.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
@@ -60,7 +59,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multipart-post>, [">= 1.1.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: wistia-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
+- Robby Grossman
 - Jason Lawrence
+- Brendan Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -75,22 +77,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.4
 description: A simple CLI uploader for Wistia users.
-email: jason@wistia.com
+email: dev@wistia.com
 executables:
 - wistia-uploader
 extensions: []
@@ -117,6 +103,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -125,8 +112,8 @@ files:
 - VERSION
 - bin/wistia-uploader
 - lib/wistia-uploader.rb
-- test/helper.rb
-- test/test_wistia-uploader.rb
+- spec/spec_helper.rb
+- spec/wistia-uploader_spec.rb
 - wistia-uploader.gemspec
 homepage: http://github.com/wistia/wistia-uploader
 licenses:
@@ -143,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3095705562316825160
+      hash: 4405734978225036635
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple CLI uploader for Wistia users.

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'wistia-uploader'
-
-class Test::Unit::TestCase
-end

data/test/test_wistia-uploader.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestWistiaUploader < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end