twurl 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336916fbbbadbe16fb87bf13c19ae8732622b664
-  data.tar.gz: 9f25b1d4a66e6ba287db425a56f32ee3b1a44c50
+  metadata.gz: 7e7d92fe7658f9a73363898ecd95200cc63a87f8
+  data.tar.gz: 2130791a02fb9f2d44647b545a38d9db69c4e507
 SHA512:
-  metadata.gz: f25af63121f3a5020fc228428b441de5ecb14b7e6c6cc621375779ef88802f773bc2b224a5220946c6429b8005699003beada4a3fdd4f6f34f8f6636a941a539
-  data.tar.gz: ad77f67ebe91b6db3890ceb9a5af474a1bafb775a84ec2fecb1641d6c5cc00df00c7f57f8360cdb939e555bddff358603f25cf8fbd5d5bdfe53bc36071353fc3
+  metadata.gz: c340de22153f5d19dd058644f5e54f9ac5f8a77b6daa7a126d715335c758f5a665bba41a75edbc3864f9a45b929a60d1a8a57afcd96d1b4160207b905df90f7e
+  data.tar.gz: e8f0da68afdb20e93704b826beb3247b1e11c9533b2fd33c4bb375f5d98da3e4916a24b70d9e33906ce1fcda22c8a82aa38b7112f78fea17a4176e1a7595aaae

data/.travis.yml

@@ -1,8 +1,6 @@
 bundler_args: --without development
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-head
@@ -13,3 +11,4 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
   fast_finish: true
+sudo: false

data/Gemfile

@@ -4,11 +4,10 @@ gem 'jruby-openssl', :platforms => :jruby
 gem 'rake'
 
 group :test do
-  gem 'coveralls', :require => false
-  gem 'mime-types', '~> 1.25', :platforms => :ruby_18
+  gem 'coveralls'
   gem 'minitest', '>= 5'
   gem 'rr', '>= 1.1'
-  gem 'simplecov', :require => false
+  gem 'simplecov', '>= 0.9'
 end
 
 gemspec

data/INSTALL

@@ -4,12 +4,17 @@
 
   sudo gem i twurl --source http://rubygems.org
 
++---------------------+
+| Build from source   |
++---------------------+
+
+  rake build
+
 +---------------------+
 | Install from source |
 +---------------------+
 
-  rake dist:gem
-  sudo gem i pkg/twurl*gem
+  rake install
 
 +--------------+
 | Dependencies |

data/README

@@ -18,7 +18,7 @@ applications and Twitter accounts.
 The first thing you have to do is register an OAuth application
 to get a consumer key and secret.
 
-  http://dev.twitter.com/apps/new
+  https://apps.twitter.com/app/new
 
 When you have your consumer key and its secret you authorize
 your Twitter account to make API requests with your consumer key
@@ -29,7 +29,7 @@ and secret.
 
 This will return an URL that you should open up in your browser.
 Authenticate to Twitter, and then enter the returned PIN back into
-the terminal.  Assuming all that works well, you will beauthorized
+the terminal.  Assuming all that works well, you will be authorized
 to make requests with the API. Twurl will tell you as much.
 
 If your consumer application has xAuth enabled, then you can use

data/lib/twurl/cli.rb

@@ -76,6 +76,7 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
           o.section "Common options:" do
             trace
             data
+            raw_data
             headers
             host
             quiet
@@ -236,6 +237,14 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         end
       end
 
+      def raw_data
+        on('-r', '--raw-data [data]', 'Sends the specified data as it is in a POST request to the HTTP server.') do |data|
+          CGI::parse(data).each_pair do |key, value|
+            options.data[key] = value.first
+          end
+        end
+      end
+
       def headers
         on('-A', '--header [header]', 'Adds the specified header to the request to the HTTP server.') do |header|
           key, value = header.split(': ')
@@ -296,20 +305,20 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         on('-f', '--file [path_to_file]', 'Specify the path to the file to upload') do |file|
           if File.file?(file)
             options.upload['file'] << file
-          else 
+          else
             CLI.puts "ERROR: File not found"
             exit
           end
         end
       end
-      
-      def filefield 
+
+      def filefield
         on('-F', '--file-field [field_name]', 'Specify the POST parameter name for the file upload data (default: media)') do |filefield|
           options.upload['filefield'] = filefield
         end
       end
-      
-      def base64 
+
+      def base64
         on('-b', '--base64', 'Encode the uploaded file as base64 (default: false)') do |base64|
           options.upload['base64'] = base64
         end
@@ -317,7 +326,6 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
     end
   end
 
-    
   class Options < OpenStruct
     DEFAULT_REQUEST_METHOD = 'get'
     DEFAULT_HOST           = 'api.twitter.com'

data/lib/twurl/oauth_client.rb

@@ -99,15 +99,17 @@ module Twurl
           if options.upload['base64']
             enc = Base64.encode64(File.read(filename))
             multipart_body << enc
-          else 
+          else
             multipart_body << File.read(filename)
           end
         }
 
         multipart_body << "\r\n--#{boundary}--\r\n"
-        
+
         request.body = multipart_body.join
-        request['Content-Type'] = "multipart/form-data, boundary=\"#{boundary}\""
+        request.content_type = "multipart/form-data, boundary=\"#{boundary}\""
+      elsif request.content_type && options.data
+        request.body = options.data.keys.first
       elsif options.data
         request.set_form_data(options.data)
       end

data/lib/twurl/version.rb

@@ -2,13 +2,13 @@ module Twurl
   class Version
     MAJOR = 0 unless defined? Twurl::Version::MAJOR
     MINOR = 9 unless defined? Twurl::Version::MINOR
-    PATCH = 2 unless defined? Twurl::Version::PATCH
-    BETA = nil unless defined? Twurl::Version::BETA # Time.now.to_i.to_s
+    PATCH = 3 unless defined? Twurl::Version::PATCH
+    PRE = nil unless defined? Twurl::Version::PRE # Time.now.to_i.to_s
 
     class << self
       # @return [String]
       def to_s
-        [MAJOR, MINOR, PATCH, BETA].compact.join('.')
+        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
       end
     end
   end

data/twurl.gemspec

@@ -11,15 +11,15 @@ Gem::Specification.new do |spec|
   spec.email = ['marcel@twitter.com']
   spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.extra_rdoc_files = %w(COPYING INSTALL README)
-  spec.files = `git ls-files`.split("\n")
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('test/') }
   spec.homepage = 'http://github.com/twitter/twurl'
   spec.licenses = ['MIT']
   spec.name = 'twurl'
   spec.rdoc_options = ['--title', 'twurl -- OAuth-enabled curl for the Twitter API', '--main', 'README', '--line-numbers', '--inline-source']
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.5'
   spec.rubyforge_project = 'twurl'
   spec.summary = spec.description
-  spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.version = Twurl::Version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Marcel Molina
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -50,7 +50,6 @@ extra_rdoc_files:
 - INSTALL
 - README
 files:
-- ".gemtest"
 - ".gitignore"
 - ".travis.yml"
 - COPYING
@@ -70,16 +69,6 @@ files:
 - lib/twurl/rcfile.rb
 - lib/twurl/request_controller.rb
 - lib/twurl/version.rb
-- test/account_information_controller_test.rb
-- test/alias_controller_test.rb
-- test/authorization_controller_test.rb
-- test/cli_options_test.rb
-- test/cli_test.rb
-- test/configuration_controller_test.rb
-- test/oauth_client_test.rb
-- test/rcfile_test.rb
-- test/request_controller_test.rb
-- test/test_helper.rb
 - twurl.gemspec
 homepage: http://github.com/twitter/twurl
 licenses:
@@ -99,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -107,18 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: twurl
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Curl for the Twitter API
-test_files:
-- test/account_information_controller_test.rb
-- test/alias_controller_test.rb
-- test/authorization_controller_test.rb
-- test/cli_options_test.rb
-- test/cli_test.rb
-- test/configuration_controller_test.rb
-- test/oauth_client_test.rb
-- test/rcfile_test.rb
-- test/request_controller_test.rb
-- test/test_helper.rb
+test_files: []

data/test/account_information_controller_test.rb

@@ -1,61 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::AccountInformationController::DispatchWithNoAuthorizedAccountsTest < Minitest::Test
-  attr_reader :options, :client, :controller
-  def setup
-    @options    = Twurl::Options.new
-    @client     = Twurl::OAuthClient.load_new_client_from_options(options)
-    @controller = Twurl::AccountInformationController.new(client, options)
-    mock(Twurl::OAuthClient.rcfile).empty? { true }
-  end
-
-  def test_message_indicates_when_no_accounts_are_authorized
-    mock(Twurl::CLI).puts(Twurl::AccountInformationController::NO_AUTHORIZED_ACCOUNTS_MESSAGE).times(1)
-
-    controller.dispatch
-  end
-end
-
-class Twurl::AccountInformationController::DispatchWithOneAuthorizedAccountTest < Minitest::Test
-  attr_reader :options, :client, :controller
-  def setup
-    @options    = Twurl::Options.test_exemplar
-    @client     = Twurl::OAuthClient.load_new_client_from_options(options)
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-    Twurl::OAuthClient.rcfile << client
-    @controller = Twurl::AccountInformationController.new(client, options)
-  end
-
-  def test_authorized_account_is_displayed_and_marked_as_the_default
-    mock(Twurl::CLI).puts(client.username).times(1).ordered
-    mock(Twurl::CLI).puts("  #{client.consumer_key} (default)").times(1).ordered
-
-    controller.dispatch
-  end
-end
-
-class Twurl::AccountInformationController::DispatchWithOneUsernameThatHasAuthorizedMultipleAccountsTest < Minitest::Test
-  attr_reader :default_client_options, :default_client, :other_client_options, :other_client, :controller
-  def setup
-    @default_client_options = Twurl::Options.test_exemplar
-    @default_client         = Twurl::OAuthClient.load_new_client_from_options(default_client_options)
-
-    @other_client_options             = Twurl::Options.test_exemplar
-    other_client_options.consumer_key = default_client_options.consumer_key.reverse
-    @other_client                     = Twurl::OAuthClient.load_new_client_from_options(other_client_options)
-    mock(Twurl::OAuthClient.rcfile).save.times(2)
-
-    Twurl::OAuthClient.rcfile << default_client
-    Twurl::OAuthClient.rcfile << other_client
-
-    @controller = Twurl::AccountInformationController.new(other_client, other_client_options)
-  end
-
-  def test_authorized_account_is_displayed_and_marked_as_the_default
-    mock(Twurl::CLI).puts(default_client.username).times(1)
-    mock(Twurl::CLI).puts("  #{default_client.consumer_key} (default)").times(1)
-    mock(Twurl::CLI).puts("  #{other_client.consumer_key}").times(1)
-
-    controller.dispatch
-  end
-end

data/test/alias_controller_test.rb

@@ -1,53 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::AliasesController::DispatchTest < Minitest::Test
-  attr_reader :options, :client
-  def setup
-    @options = Twurl::Options.test_exemplar
-    @client  = Twurl::OAuthClient.test_exemplar
-
-    # Clean slate
-    if Twurl::OAuthClient.rcfile.aliases
-      Twurl::OAuthClient.rcfile.aliases.clear
-    end
-
-    stub(Twurl::OAuthClient.rcfile).save
-  end
-
-  def test_when_no_subcommands_are_provided_and_no_aliases_exist_nothing_is_displayed
-    assert options.subcommands.empty?
-    mock(Twurl::CLI).puts(Twurl::AliasesController::NO_ALIASES_MESSAGE).times(1)
-
-    controller = Twurl::AliasesController.new(client, options)
-    controller.dispatch
-  end
-
-  def test_when_no_subcommands_are_provided_and_aliases_exist_they_are_displayed
-    assert options.subcommands.empty?
-
-    Twurl::OAuthClient.rcfile.alias('h', '/1.1/statuses/home_timeline.json')
-    mock(Twurl::CLI).puts("h: /1.1/statuses/home_timeline.json").times(1)
-
-    controller = Twurl::AliasesController.new(client, options)
-    controller.dispatch
-  end
-
-  def test_when_alias_and_value_are_provided_they_are_added
-    options.subcommands = ['h']
-    options.path        = '/1.1/statuses/home_timeline.json'
-    mock(Twurl::OAuthClient.rcfile).alias('h', '/1.1/statuses/home_timeline.json').times(1)
-
-    controller = Twurl::AliasesController.new(client, options)
-    controller.dispatch
-  end
-
-  def test_when_no_path_is_provided_nothing_happens
-    options.subcommands = ['a']
-    assert_nil options.path
-
-    mock(Twurl::CLI).puts(Twurl::AliasesController::NO_PATH_PROVIDED_MESSAGE).times(1)
-
-    controller = Twurl::AliasesController.new(client, options)
-    controller.dispatch
-  end
-end

data/test/authorization_controller_test.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::AuthorizationController::DispatchTest < Minitest::Test
-  attr_reader :options, :client, :controller
-  def setup
-    @options    = Twurl::Options.new
-    @client     = Twurl::OAuthClient.load_new_client_from_options(options)
-    @controller = Twurl::AuthorizationController.new(client, options)
-  end
-
-  def test_successful_authentication_saves_retrieved_access_token
-    mock(client).exchange_credentials_for_access_token.times(1)
-    mock(client).save.times(1)
-    mock(controller).raise(Twurl::Exception, Twurl::AuthorizationController::AUTHORIZATION_FAILED_MESSAGE).never
-    mock(Twurl::CLI).puts(Twurl::AuthorizationController::AUTHORIZATION_SUCCEEDED_MESSAGE).times(1)
-
-    controller.dispatch
-  end
-
-  module ErrorCases
-    def test_failed_authorization_does_not_save_client
-      mock(client).exchange_credentials_for_access_token { raise OAuth::Unauthorized }
-      mock(client).save.never
-      mock(controller).raise(Twurl::Exception, Twurl::AuthorizationController::AUTHORIZATION_FAILED_MESSAGE).times(1)
-
-      controller.dispatch
-    end
-  end
-  include ErrorCases
-end

data/test/cli_options_test.rb

@@ -1,23 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::Options::Test < Minitest::Test
-  attr_reader :options
-  def setup
-    @options = Twurl::Options.new
-  end
-
-  def test_base_url_is_built_from_protocol_and_host
-    options.protocol = 'http'
-    options.host     = 'api.twitter.com'
-
-    assert_equal 'http://api.twitter.com', options.base_url
-  end
-
-  def test_ssl_is_enabled_if_the_protocol_is_https
-    options.protocol = 'http'
-    assert !options.ssl?
-
-    options.protocol = 'https'
-    assert options.ssl?
-  end
-end

data/test/cli_test.rb

@@ -1,192 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::CLI::OptionParsingTest < Minitest::Test
-  TEST_PATH = '/1.1/url/does/not/matter.json'
-
-  module CommandParsingTests
-    def test_no_command_specified_falls_to_default_command
-      options = Twurl::CLI.parse_options([TEST_PATH])
-      assert_equal Twurl::CLI::DEFAULT_COMMAND, options.command
-    end
-
-    def test_supported_command_specified_extracts_the_command
-      expected_command = Twurl::CLI::SUPPORTED_COMMANDS.first
-      options = Twurl::CLI.parse_options([expected_command])
-      assert_equal expected_command, options.command
-    end
-
-    def test_unsupported_command_specified_sets_default_command
-      unsupported_command = 'unsupported'
-      options = Twurl::CLI.parse_options([TEST_PATH, unsupported_command])
-      assert_equal Twurl::CLI::DEFAULT_COMMAND, options.command
-    end
-  end
-  include CommandParsingTests
-
-  module PathParsingTests
-    def test_missing_path_throws_no_path_found
-      stub(Twurl::CLI).puts
-      assert_raises Twurl::CLI::NoPathFound do
-        Twurl::CLI.parse_options([])
-      end
-    end
-
-    def test_uri_params_are_encoded
-      options = Twurl::CLI.parse_options(["/1.1/url?baz=bamf:rofl"])
-      assert_equal options.path, "/1.1/url?baz=bamf%3Arofl"
-    end
-  end
-  include PathParsingTests
-
-  module RequestMethodParsingTests
-    def test_request_method_is_default_if_unspecified
-      options = Twurl::CLI.parse_options([TEST_PATH])
-      assert_equal Twurl::Options::DEFAULT_REQUEST_METHOD, options.request_method
-    end
-
-    def test_specifying_a_request_method_extracts_and_normalizes_request_method
-      variations = [%w[-X put], %w[-X PUT], %w[--request-method PUT], %w[--request-method put]]
-      variations.each do |option_variation|
-        order_variant_1 = [option_variation, TEST_PATH].flatten
-        order_variant_2 = [TEST_PATH, option_variation].flatten
-        [order_variant_1, order_variant_2].each do |args|
-          options = Twurl::CLI.parse_options(args)
-          assert_equal 'put', options.request_method
-        end
-      end
-    end
-
-    def test_specifying_unsupported_request_method_returns_an_error
-      Twurl::CLI.parse_options([TEST_PATH, '-X', 'UNSUPPORTED'])
-    end
-  end
-  include RequestMethodParsingTests
-
-  module OAuthClientOptionParsingTests
-    def test_extracting_the_consumer_key
-      mock(Twurl::CLI).prompt_for('Consumer key').never
-
-      options = Twurl::CLI.parse_options([TEST_PATH, '-c', 'the-key'])
-      assert_equal 'the-key', options.consumer_key
-    end
-
-    def test_consumer_key_option_with_no_value_prompts_user_for_value
-      mock(Twurl::CLI).prompt_for('Consumer key').times(1) { 'inputted-key'}
-      options = Twurl::CLI.parse_options([TEST_PATH, '-c'])
-      assert_equal 'inputted-key', options.consumer_key
-    end
-  end
-  include OAuthClientOptionParsingTests
-
-  module DataParsingTests
-    def test_extracting_a_single_key_value_pair
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value'])
-      assert_equal({'key' => 'value'}, options.data)
-
-      options = Twurl::CLI.parse_options([TEST_PATH, '--data', 'key=value'])
-      assert_equal({'key' => 'value'}, options.data)
-    end
-
-    def test_passing_data_and_no_explicit_request_method_defaults_request_method_to_post
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value'])
-      assert_equal 'post', options.request_method
-    end
-
-    def test_passing_data_and_an_explicit_request_method_uses_the_specified_method
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value', '-X', 'DELETE'])
-      assert_equal({'key' => 'value'}, options.data)
-      assert_equal 'delete', options.request_method
-    end
-
-    def test_multiple_pairs_when_option_is_specified_multiple_times_on_command_line_collects_all
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value', '-d', 'another=pair'])
-      assert_equal({'key' => 'value', 'another' => 'pair'}, options.data)
-    end
-
-    def test_multiple_pairs_separated_by_ampersand_are_all_captured
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value&another=pair'])
-      assert_equal({'key' => 'value', 'another' => 'pair'}, options.data)
-    end
-
-    def test_extracting_an_empty_key_value_pair
-      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key='])
-      assert_equal({'key' => ''}, options.data)
-
-      options = Twurl::CLI.parse_options([TEST_PATH, '--data', 'key='])
-      assert_equal({'key' => ''}, options.data)
-    end
-  end
-  include DataParsingTests
-
-  module HeaderParsingTests
-    def test_extracting_a_single_header
-      options = Twurl::CLI.parse_options([TEST_PATH, '-A', 'Key: Value'])
-      assert_equal({'Key' => 'Value'}, options.headers)
-
-      options = Twurl::CLI.parse_options([TEST_PATH, '--header', 'Key: Value'])
-      assert_equal({'Key' => 'Value'}, options.headers)
-    end
-
-    def test_multiple_headers_when_option_is_specified_multiple_times_on_command_line_collects_all
-      options = Twurl::CLI.parse_options([TEST_PATH, '-A', 'Key: Value', '-A', 'Another: Pair'])
-      assert_equal({'Key' => 'Value', 'Another' => 'Pair'}, options.headers)
-    end
-  end
-  include HeaderParsingTests
-
-  module SSLDisablingTests
-    def test_ssl_is_on_by_default
-      options = Twurl::CLI.parse_options([TEST_PATH])
-      assert options.ssl?
-    end
-
-    def test_passing_no_ssl_option_disables_ssl
-      ['-U', '--no-ssl'].each do |switch|
-        options = Twurl::CLI.parse_options([TEST_PATH, switch])
-        assert !options.ssl?
-      end
-    end
-  end
-  include SSLDisablingTests
-
-  module HostOptionTests
-    def test_not_specifying_host_sets_it_to_the_default
-      options = Twurl::CLI.parse_options([TEST_PATH])
-      assert_equal Twurl::Options::DEFAULT_HOST, options.host
-    end
-
-    def test_setting_host_updates_to_requested_value
-      custom_host = 'localhost:3000'
-      assert Twurl::Options::DEFAULT_HOST != custom_host
-
-      [[TEST_PATH, '-H', custom_host], [TEST_PATH, '--host', custom_host]].each do |option_combination|
-        options = Twurl::CLI.parse_options(option_combination)
-        assert_equal custom_host, options.host
-      end
-    end
-
-    def test_protocol_is_stripped_from_host
-      custom_host = 'localhost:3000'
-      options = Twurl::CLI.parse_options([TEST_PATH, '-H', "https://"+custom_host])
-      assert_equal custom_host, options.host
-    end
-  end
-  include HostOptionTests
-
-  module ProxyOptionTests
-    def test_not_specifying_proxy_sets_it_to_nil
-      options = Twurl::CLI.parse_options([TEST_PATH])
-      assert_equal nil, options.proxy
-    end
-
-    def test_setting_proxy_updates_to_requested_value
-      custom_proxy = 'localhost:80'
-
-      [[TEST_PATH, '-P', custom_proxy], [TEST_PATH, '--proxy', custom_proxy]].each do |option_combination|
-        options = Twurl::CLI.parse_options(option_combination)
-        assert_equal custom_proxy, options.proxy
-      end
-    end
-  end
-  include ProxyOptionTests
-end

data/test/configuration_controller_test.rb

@@ -1,44 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::ConfigurationController::DispatchTest < Minitest::Test
-  def test_error_message_is_displayed_if_setting_is_unrecognized
-    options = Twurl::Options.test_exemplar
-    client  = Twurl::OAuthClient.test_exemplar
-
-    options.subcommands = ['unrecognized', 'value']
-
-    mock(Twurl::CLI).puts(Twurl::ConfigurationController::UNRECOGNIZED_SETTING_MESSAGE % 'unrecognized').times(1)
-    mock(Twurl::OAuthClient.rcfile).save.times(0)
-
-    controller = Twurl::ConfigurationController.new(client, options)
-    controller.dispatch
-  end
-end
-
-class Twurl::ConfigurationController::DispatchDefaultSettingTest < Minitest::Test
-  def test_setting_default_profile_just_by_username
-    options = Twurl::Options.test_exemplar
-    client  = Twurl::OAuthClient.test_exemplar
-
-    options.subcommands = ['default', client.username]
-    mock(Twurl::OAuthClient).load_client_for_username(client.username).times(1) { client }
-    mock(Twurl::OAuthClient.rcfile).default_profile = client
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-
-    controller = Twurl::ConfigurationController.new(client, options)
-    controller.dispatch
-  end
-
-  def test_setting_default_profile_by_username_and_consumer_key
-    options = Twurl::Options.test_exemplar
-    client  = Twurl::OAuthClient.test_exemplar
-
-    options.subcommands = ['default', client.username, client.consumer_key]
-    mock(Twurl::OAuthClient).load_client_for_username_and_consumer_key(client.username, client.consumer_key).times(1) { client }
-    mock(Twurl::OAuthClient.rcfile).default_profile = client
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-
-    controller = Twurl::ConfigurationController.new(client, options)
-    controller.dispatch
-  end
-end

data/test/oauth_client_test.rb

@@ -1,165 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::OAuthClient::AbstractOAuthClientTest < Minitest::Test
-  attr_reader :client, :options
-  def setup
-    Twurl::OAuthClient.instance_variable_set(:@rcfile, nil)
-
-    @options                = Twurl::Options.test_exemplar
-    @client                 = Twurl::OAuthClient.test_exemplar
-    options.base_url        = 'api.twitter.com'
-    options.request_method  = 'get'
-    options.path            = '/path/does/not/matter.json'
-    options.data            = {}
-    options.headers         = {}
-
-    Twurl.options           = options
-  end
-
-  def teardown
-    super
-    Twurl.options = Twurl::Options.new
-    # Make sure we don't do any disk IO in these tests
-    assert !File.exists?(Twurl::RCFile.file_path)
-  end
-
-  def test_nothing
-    # Appeasing test/unit
-  end
-end
-
-class Twurl::OAuthClient::BasicRCFileLoadingTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_rcfile_is_memoized
-    mock.proxy(Twurl::RCFile).new.times(1)
-
-    Twurl::OAuthClient.rcfile
-    Twurl::OAuthClient.rcfile
-  end
-
-  def test_forced_reloading
-    mock.proxy(Twurl::RCFile).new.times(2)
-
-    Twurl::OAuthClient.rcfile
-    Twurl::OAuthClient.rcfile(:reload)
-    Twurl::OAuthClient.rcfile
-  end
-end
-
-class Twurl::OAuthClient::ClientLoadingFromOptionsTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_if_username_is_supplied_and_no_profile_exists_for_username_then_new_client_is_created
-    mock(Twurl::OAuthClient).load_client_for_username(options.username).never
-    mock(Twurl::OAuthClient).load_new_client_from_options(options).times(1)
-    mock(Twurl::OAuthClient).load_default_client.never
-
-    Twurl::OAuthClient.load_from_options(options)
-  end
-
-  def test_if_username_is_supplied_and_profile_exists_for_username_then_client_is_loaded
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-    Twurl::OAuthClient.rcfile << client
-
-    mock(Twurl::OAuthClient).load_client_for_username_and_consumer_key(options.username, options.consumer_key).times(1)
-    mock(Twurl::OAuthClient).load_new_client_from_options(options).never
-    mock(Twurl::OAuthClient).load_default_client.never
-
-    Twurl::OAuthClient.load_from_options(options)
-  end
-
-  def test_if_username_is_not_provided_then_the_default_client_is_loaded
-    options.username = nil
-
-    mock(Twurl::OAuthClient).load_client_for_username(options.username).never
-    mock(Twurl::OAuthClient).load_new_client_from_options(options).never
-    mock(Twurl::OAuthClient).load_default_client.times(1)
-
-    Twurl::OAuthClient.load_from_options(options)
-  end
-end
-
-class Twurl::OAuthClient::ClientLoadingForUsernameTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_attempting_to_load_a_username_that_is_not_in_the_file_fails
-    assert_nil Twurl::OAuthClient.rcfile[client.username]
-
-    assert_raises Twurl::Exception do
-      Twurl::OAuthClient.load_client_for_username_and_consumer_key(client.username, client.consumer_key)
-    end
-  end
-
-  def test_loading_a_username_that_exists
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-
-    Twurl::OAuthClient.rcfile << client
-
-    client_from_file = Twurl::OAuthClient.load_client_for_username_and_consumer_key(client.username, client.consumer_key)
-    assert_equal client.to_hash, client_from_file.to_hash
-  end
-end
-
-class Twurl::OAuthClient::DefaultClientLoadingTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_loading_default_client_when_there_is_none_fails
-    assert_nil Twurl::OAuthClient.rcfile.default_profile
-
-    assert_raises Twurl::Exception do
-      Twurl::OAuthClient.load_default_client
-    end
-  end
-
-  def test_loading_default_client_from_file
-    mock(Twurl::OAuthClient.rcfile).save.times(1)
-
-    Twurl::OAuthClient.rcfile << client
-    assert_equal [client.username, client.consumer_key], Twurl::OAuthClient.rcfile.default_profile
-
-    client_from_file = Twurl::OAuthClient.load_default_client
-
-    assert_equal client.to_hash, client_from_file.to_hash
-  end
-end
-
-class Twurl::OAuthClient::NewClientLoadingFromOptionsTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  attr_reader :new_client
-  def setup
-    super
-    @new_client = Twurl::OAuthClient.load_new_client_from_options(options)
-  end
-
-  def test_password_is_included
-    assert_equal options.password, new_client.password
-  end
-
-  def test_oauth_options_are_passed_through
-    assert_equal client.to_hash, new_client.to_hash
-  end
-end
-
-class Twurl::OAuthClient::PerformingRequestsFromOptionsTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_request_is_made_using_request_method_and_path_and_data_in_options
-    client = Twurl::OAuthClient.test_exemplar
-    mock(client.consumer.http).request(satisfy { |req|
-                                         req.is_a?(Net::HTTP::Get) && (req.path == options.path)
-                                       })
-
-    client.perform_request_from_options(options)
-  end
-end
-
-class Twurl::OAuthClient::CredentialsForAccessTokenExchangeTest < Twurl::OAuthClient::AbstractOAuthClientTest
-  def test_successful_exchange_parses_token_and_secret_from_response_body
-    parsed_response = {:oauth_token        => "123456789",
-                       :oauth_token_secret => "abcdefghi",
-                       :user_id            => "3191321",
-                       :screen_name        => "noradio",
-                       :x_auth_expires     => "0"}
-
-    mock(client.consumer).
-      token_request(:post,
-                    client.consumer.access_token_path,
-                    nil,
-                    {},
-                    client.client_auth_parameters) { parsed_response }
-
-   assert client.needs_to_authorize?
-   client.exchange_credentials_for_access_token
-   assert !client.needs_to_authorize?
-  end
-end

data/test/rcfile_test.rb

@@ -1,147 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::RCFile::PathConstructionTest < Minitest::Test
-  def test_file_path_appends_file_to_directory
-    assert_equal File.join(Twurl::RCFile.directory, Twurl::RCFile::FILE), Twurl::RCFile.file_path
-  end
-end
-
-class Twurl::RCFile::LoadingTest < Minitest::Test
-  def test_load_parses_and_loads_file_if_it_exists
-    mock(YAML).load_file(Twurl::RCFile.file_path).times(1)
-    mock(Twurl::RCFile).default_rcfile_structure.never
-
-    Twurl::RCFile.load
-  end
-
-  def test_load_returns_default_file_structure_if_file_does_not_exist
-    mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
-    mock(Twurl::RCFile).default_rcfile_structure.times(1)
-
-    Twurl::RCFile.load
-  end
-end
-
-class Twurl::RCFile::InitializationTest < Minitest::Test
-  def test_initializing_when_the_file_does_not_exist_loads_default_rcfile_structure
-    mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
-
-    rcfile = Twurl::RCFile.new
-    assert_equal Twurl::RCFile.default_rcfile_structure, rcfile.data
-  end
-
-  def test_initializing_when_the_file_does_exists_loads_content_of_file
-    mock_content_of_rcfile = {'this data' => 'does not matter'}
-    mock(YAML).load_file(Twurl::RCFile.file_path) { mock_content_of_rcfile }.times(1)
-    mock(Twurl::RCFile).default_rcfile_structure.never
-
-    rcfile = Twurl::RCFile.new
-    assert_equal mock_content_of_rcfile, rcfile.data
-  end
-end
-
-class Twurl::RCFile::DefaultProfileFromDefaultRCFileTest < Minitest::Test
-  attr_reader :rcfile
-  def setup
-    mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
-    mock.proxy(Twurl::RCFile).default_rcfile_structure.times(any_times)
-
-    @rcfile = Twurl::RCFile.new
-  end
-
-  def test_default_rcfile_structure_has_no_default_profile
-    assert_nil rcfile.default_profile
-  end
-
-  def test_rcfile_is_considered_empty_at_first
-    assert rcfile.empty?
-  end
-
-  def test_setting_default_profile
-    options  = Twurl::Options.test_exemplar
-
-    client = Twurl::OAuthClient.load_new_client_from_options(options)
-    rcfile.default_profile = client
-    assert_equal [options.username, options.consumer_key], rcfile.default_profile
-  end
-end
-
-class Twurl::RCFile::UpdatingTest < Minitest::Test
-  attr_reader :rcfile
-  def setup
-    mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
-
-    @rcfile = Twurl::RCFile.new
-    assert rcfile.profiles.empty?
-    assert_nil rcfile.default_profile
-    mock(rcfile).save.times(any_times)
-  end
-
-  def test_adding_the_first_client_sets_it_as_default_profile
-    client = Twurl::OAuthClient.test_exemplar
-
-    rcfile << client
-    assert_equal [client.username, client.consumer_key], rcfile.default_profile
-    assert rcfile.has_oauth_profile_for_username_with_consumer_key?(client.username, client.consumer_key)
-    assert_equal({client.username => {client.consumer_key => client.to_hash}}, rcfile.profiles)
-  end
-
-  def test_adding_additional_clients_does_not_change_default_profile
-    first_client = Twurl::OAuthClient.test_exemplar
-
-    rcfile << first_client
-    assert_equal [first_client.username, first_client.consumer_key], rcfile.default_profile
-    assert rcfile.has_oauth_profile_for_username_with_consumer_key?(first_client.username, first_client.consumer_key)
-
-    additional_client = Twurl::OAuthClient.test_exemplar(:username => 'additional_exemplar_username')
-
-    rcfile << additional_client
-    assert_equal [first_client.username, first_client.consumer_key], rcfile.default_profile
-    assert rcfile.has_oauth_profile_for_username_with_consumer_key?(additional_client.username, additional_client.consumer_key)
-
-    expected_profiles = {
-      first_client.username      => {first_client.consumer_key      => first_client.to_hash},
-      additional_client.username => {additional_client.consumer_key => additional_client.to_hash}
-    }
-
-    assert_equal expected_profiles, rcfile.profiles
-  end
-end
-
-class Twurl::RCFile::SavingTest < Minitest::Test
-  attr_reader :rcfile
-  def setup
-    delete_rcfile
-    assert !rcfile_exists?
-    @rcfile = Twurl::RCFile.new
-    assert !rcfile_exists?
-  end
-
-  def teardown
-    super
-    delete_rcfile
-  end
-
-  def test_save_writes_profiles_to_disk
-    client = Twurl::OAuthClient.test_exemplar
-    rcfile << client
-    assert rcfile_exists?
-  end
-
-  def test_file_is_not_world_readable
-    client = Twurl::OAuthClient.test_exemplar
-    rcfile << client
-    assert_equal 33152, File.stat(Twurl::RCFile.file_path).mode
-  end
-
-  private
-    def rcfile_exists?
-      File.exists?(Twurl::RCFile.file_path)
-    end
-
-    def delete_rcfile
-      File.unlink(Twurl::RCFile.file_path)
-    rescue Errno::ENOENT
-      # Do nothing
-    end
-end

data/test/request_controller_test.rb

@@ -1,58 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Twurl::RequestController::AbstractTestCase < Minitest::Test
-  attr_reader :options, :client, :controller
-  def setup
-    Twurl::CLI.output = StringIO.new
-    @options    = Twurl::Options.test_exemplar
-    @client     = Twurl::OAuthClient.test_exemplar
-    @controller = Twurl::RequestController.new(client, options)
-  end
-
-  def teardown
-    super
-    Twurl::CLI.output = STDOUT
-  end
-
-  def test_nothing
-    # Appeasing test/unit
-  end
-end
-
-class Twurl::RequestController::DispatchTest < Twurl::RequestController::AbstractTestCase
-  def test_request_will_be_made_if_client_is_authorized
-    mock(client).needs_to_authorize? { false }.times(1)
-    mock(controller).perform_request.times(1)
-
-    controller.dispatch
-  end
-
-  def test_request_will_not_be_made_if_client_is_not_authorized
-    mock(client).needs_to_authorize? { true }.times(1)
-    mock(controller).perform_request.never
-
-    assert_raises Twurl::Exception do
-      controller.dispatch
-    end
-  end
-end
-
-class Twurl::RequestController::RequestTest < Twurl::RequestController::AbstractTestCase
-  def test_request_response_is_written_to_output
-    expected_body = 'this is a fake response body'
-    response      = Object.new
-    mock(response).read_body { |block| block.call expected_body }
-    mock(client).perform_request_from_options(options).times(1) { |options, block| block.call(response) }
-
-    controller.perform_request
-
-    assert_equal expected_body, Twurl::CLI.output.string
-  end
-
-  def test_invalid_or_unspecified_urls_report_error
-    mock(Twurl::CLI).puts(Twurl::RequestController::NO_URI_MESSAGE).times(1)
-    mock(client).perform_request_from_options(options).times(1) { raise URI::InvalidURIError }
-
-    controller.perform_request
-  end
-end

data/test/test_helper.rb

@@ -1,44 +0,0 @@
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start
-
-require 'twurl'
-require 'minitest/autorun'
-require 'rr'
-
-Twurl::RCFile.directory = ENV['TMPDIR']
-
-module Twurl
-  class Options
-    class << self
-      def test_exemplar
-        options                 = new
-        options.username        = 'exemplar_user_name'
-        options.password        = 'secret'
-        options.consumer_key    = '123456789'
-        options.consumer_secret = '987654321'
-        options.subcommands     = []
-        options
-      end
-    end
-  end
-
-  class OAuthClient
-    class << self
-      def test_exemplar(overrides = {})
-        options = Twurl::Options.test_exemplar
-
-        overrides.each do |attribute, value|
-          options.send("#{attribute}=", value)
-        end
-
-        load_new_client_from_options(options)
-      end
-    end
-  end
-end