twurl 0.8.1 → 0.8.2

data/.travis.yml

@@ -1,3 +1,4 @@
+bundler_args: --without development
 language: ruby
 rvm:
   - rbx-18mode
@@ -7,4 +8,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0

data/Gemfile

@@ -1,7 +1,13 @@
 source 'https://rubygems.org'
 
-platforms :jruby do
-  gem 'jruby-openssl', '~> 0.7'
+gem 'jruby-openssl', :platforms => :jruby
+gem 'rake'
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'minitest', '>= 5'
+  gem 'rr', '>= 1.1'
+  gem 'simplecov', :require => false
 end
 
 gemspec

data/README

@@ -24,8 +24,8 @@ When you have your consumer key and its secret you authorize
 your Twitter account to make API requests with your consumer key
 and secret.
 
-  % twurl authorize --consumer-key the_key       \
-                    --consumer-secret the_secret
+  % twurl authorize --consumer-key key       \
+                    --consumer-secret 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
@@ -35,9 +35,9 @@ to make requests with the API. Twurl will tell you as much.
 If your consumer application has xAuth enabled, then you can use
 a variant of the above
 
-  % twurl authorize -u username -p password      \
-                    --consumer-key the_key       \
-                    --consumer-secret the_secret
+  % twurl authorize -u username -p password  \
+                    --consumer-key key       \
+                    --consumer-secret secret
 
 And, again assuming your username, password, key and secret is
 correct, will authorize you in one step.
@@ -49,25 +49,25 @@ correct, will authorize you in one step.
 The simplest request just requires that you specify the path you
 want to request.
 
-  % twurl /1/statuses/home_timeline.xml
+  % twurl /1.1/statuses/home_timeline.json
 
 Similar to curl, a GET request is performed by default.
 
 You can implicitly perform a POST request by passing the -d option,
 which specifies POST parameters.
 
-  % twurl -d 'status=Testing twurl' /1/statuses/update.xml
+  % twurl -d 'status=Testing twurl' /1.1/statuses/update.json
 
 You can explicitly specify what request method to perform with
 the -X (or --request-method) option.
 
-  % twurl -X DELETE /1/statuses/destroy/123456.xml
+  % twurl -X POST /1.1/statuses/destroy/1234567890.json
 
 +------------------+
 | Creating aliases |
 +------------------+
 
-  % twurl alias h /1/statuses/home_timeline.xml
+  % twurl alias h /1.1/statuses/home_timeline.json
 
 You can then use "h" in place of the full path.
 
@@ -77,7 +77,7 @@ Paths that require additional options such as request parameters for example can
 be used with aliases the same as with full explicit paths, just as you might
 expect.
 
-  % twurl alias tweet /1/statuses/update.xml
+  % twurl alias tweet /1.1/statuses/update.json
   % twurl tweet -d "status=Aliases in twurl are convenient"
 
 +-------------------------------+

data/lib/twurl/cli.rb

@@ -44,10 +44,12 @@ module Twurl
         option_parser = OptionParser.new do |o|
           o.extend AvailableOptions
 
-          o.banner = "Usage: twurl authorize -u username -p password --consumer-key HQsAGcVm5MQT3n6j7qVJw --consumer-secret asdfasd223sd2\n" +
-                     "       twurl [options] /statuses/home_timeline.xml\n"                                                                  +
-                     "\n"                                                                                                                    +
-                     "Supported Commands:\n#{SUPPORTED_COMMANDS.sort.join(', ')}"
+          o.banner = <<-BANNER
+Usage: twurl authorize --consumer-key key --consumer-secret secret
+       twurl [options] /1.1/statuses/home_timeline.json
+
+Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
+          BANNER
 
           o.section "Getting started:" do
             tutorial

data/lib/twurl/version.rb

@@ -1,10 +1,17 @@
 module Twurl
-  module VERSION
-    MAJOR  = 0 unless defined? MAJOR
-    MINOR  = 8 unless defined? MINOR
-    PATCH  = 1 unless defined? PATCH
-    BETA   = nil unless defined? BETA # Time.now.to_i.to_s
+  class Version
+    MAJOR = 0 unless defined? Twurl::Version::MAJOR
+    MINOR = 8 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
+
+    class << self
+      # @return [String]
+      def to_s
+        [MAJOR, MINOR, PATCH, BETA].compact.join('.')
+      end
+    end
   end
 
-  Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::PATCH, VERSION::BETA].compact * '.'
+  VERSION = Version.to_s
 end

data/test/account_information_controller_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::AccountInformationController::DispatchWithNoAuthorizedAccountsTest < MiniTest::Unit::TestCase
+class Twurl::AccountInformationController::DispatchWithNoAuthorizedAccountsTest < Minitest::Test
   attr_reader :options, :client, :controller
   def setup
     @options    = Twurl::Options.new
@@ -16,7 +16,7 @@ class Twurl::AccountInformationController::DispatchWithNoAuthorizedAccountsTest
   end
 end
 
-class Twurl::AccountInformationController::DispatchWithOneAuthorizedAccountTest < MiniTest::Unit::TestCase
+class Twurl::AccountInformationController::DispatchWithOneAuthorizedAccountTest < Minitest::Test
   attr_reader :options, :client, :controller
   def setup
     @options    = Twurl::Options.test_exemplar
@@ -34,7 +34,7 @@ class Twurl::AccountInformationController::DispatchWithOneAuthorizedAccountTest
   end
 end
 
-class Twurl::AccountInformationController::DispatchWithOneUsernameThatHasAuthorizedMultipleAccountsTest < MiniTest::Unit::TestCase
+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

data/test/alias_controller_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::AliasesController::DispatchTest < MiniTest::Unit::TestCase
+class Twurl::AliasesController::DispatchTest < Minitest::Test
   attr_reader :options, :client
   def setup
     @options = Twurl::Options.test_exemplar

data/test/authorization_controller_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::AuthorizationController::DispatchTest < MiniTest::Unit::TestCase
+class Twurl::AuthorizationController::DispatchTest < Minitest::Test
   attr_reader :options, :client, :controller
   def setup
     @options    = Twurl::Options.new

data/test/cli_options_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::Options::Test < MiniTest::Unit::TestCase
+class Twurl::Options::Test < Minitest::Test
   attr_reader :options
   def setup
     @options = Twurl::Options.new

data/test/cli_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::CLI::OptionParsingTest < MiniTest::Unit::TestCase
+class Twurl::CLI::OptionParsingTest < Minitest::Test
   module CommandParsingTests
     def test_no_command_specified_falls_to_default_command
       options = Twurl::CLI.parse_options(['/1.1/url/does/not/matter.json'])

data/test/configuration_controller_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::ConfigurationController::DispatchTest < MiniTest::Unit::TestCase
+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
@@ -15,7 +15,7 @@ class Twurl::ConfigurationController::DispatchTest < MiniTest::Unit::TestCase
   end
 end
 
-class Twurl::ConfigurationController::DispatchDefaultSettingTest < MiniTest::Unit::TestCase
+class Twurl::ConfigurationController::DispatchDefaultSettingTest < Minitest::Test
   def test_setting_default_profile_just_by_username
     options = Twurl::Options.test_exemplar
     client  = Twurl::OAuthClient.test_exemplar

data/test/oauth_client_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::OAuthClient::AbstractOAuthClientTest < MiniTest::Unit::TestCase
+class Twurl::OAuthClient::AbstractOAuthClientTest < Minitest::Test
   attr_reader :client, :options
   def setup
     Twurl::OAuthClient.instance_variable_set(:@rcfile, nil)
@@ -9,7 +9,7 @@ class Twurl::OAuthClient::AbstractOAuthClientTest < MiniTest::Unit::TestCase
     @client                 = Twurl::OAuthClient.test_exemplar
     options.base_url        = 'api.twitter.com'
     options.request_method  = 'get'
-    options.path            = '/path/does/not/matter.xml'
+    options.path            = '/path/does/not/matter.json'
     options.data            = {}
     options.headers         = {}
 

data/test/rcfile_test.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::RCFile::PathConstructionTest < MiniTest::Unit::TestCase
+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::Unit::TestCase
+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
@@ -22,7 +22,7 @@ class Twurl::RCFile::LoadingTest < MiniTest::Unit::TestCase
   end
 end
 
-class Twurl::RCFile::InitializationTest < MiniTest::Unit::TestCase
+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)
 
@@ -40,7 +40,7 @@ class Twurl::RCFile::InitializationTest < MiniTest::Unit::TestCase
   end
 end
 
-class Twurl::RCFile::DefaultProfileFromDefaultRCFileTest < MiniTest::Unit::TestCase
+class Twurl::RCFile::DefaultProfileFromDefaultRCFileTest < Minitest::Test
   attr_reader :rcfile
   def setup
     mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
@@ -66,7 +66,7 @@ class Twurl::RCFile::DefaultProfileFromDefaultRCFileTest < MiniTest::Unit::TestC
   end
 end
 
-class Twurl::RCFile::UpdatingTest < MiniTest::Unit::TestCase
+class Twurl::RCFile::UpdatingTest < Minitest::Test
   attr_reader :rcfile
   def setup
     mock(YAML).load_file(Twurl::RCFile.file_path) { raise Errno::ENOENT }.times(1)
@@ -108,7 +108,7 @@ class Twurl::RCFile::UpdatingTest < MiniTest::Unit::TestCase
   end
 end
 
-class Twurl::RCFile::SavingTest < MiniTest::Unit::TestCase
+class Twurl::RCFile::SavingTest < Minitest::Test
   attr_reader :rcfile
   def setup
     delete_rcfile

data/test/request_controller_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Twurl::RequestController::AbstractTestCase < MiniTest::Unit::TestCase
+class Twurl::RequestController::AbstractTestCase < Minitest::Test
   attr_reader :options, :client, :controller
   def setup
     Twurl::CLI.output = StringIO.new

data/test/test_helper.rb

@@ -1,17 +1,16 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'test'
-  end
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 require 'twurl'
 require 'minitest/autorun'
 require 'rr'
 
-class MiniTest::Unit::TestCase
-  include RR::Adapters::TestUnit
-end
-
 Twurl::RCFile.directory = ENV['TMPDIR']
 
 module Twurl

data/twurl.gemspec

@@ -1,25 +1,25 @@
-# encoding: utf-8
-require File.expand_path('../lib/twurl/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'twurl/version'
 
-Gem::Specification.new do |s|
-  s.add_dependency 'oauth', '~> 0.4'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rr'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'minitest'
-  s.authors = ["Marcel Molina", "Erik Michaels-Ober"]
-  s.description = %q{Curl for the Twitter API}
-  s.email = ['marcel@twitter.com']
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = %w(COPYING INSTALL README)
-  s.files = `git ls-files`.split("\n")
-  s.homepage = 'http://github.com/marcel/twurl'
-  s.name = 'twurl'
-  s.rdoc_options = ['--title', 'twurl -- OAuth-enabled curl for the Twitter API', '--main', 'README', '--line-numbers', '--inline-source']
-  s.require_paths = ['lib']
-  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
-  s.rubyforge_project = 'twurl'
-  s.summary = s.description
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.version = Twurl::Version
+Gem::Specification.new do |spec|
+  spec.add_dependency 'oauth', '~> 0.4'
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.authors = ["Marcel Molina", "Erik Michaels-Ober"]
+  spec.description = %q{Curl for the Twitter API}
+  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.homepage = 'http://github.com/marcel/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_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.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -29,69 +29,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Curl for the Twitter API
 email:
 - marcel@twitter.com
@@ -135,7 +87,8 @@ files:
 - test/test_helper.rb
 - twurl.gemspec
 homepage: http://github.com/marcel/twurl
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --title
@@ -157,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.5
 requirements: []
 rubyforge_project: twurl
 rubygems_version: 1.8.23