twurl 0.7.0 → 0.8.0

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'rake/testtask'
 require 'rubygems/package_task'
 require 'bundler'

data/lib/twurl/cli.rb

@@ -72,6 +72,7 @@ module Twurl
             request_method
             help
             version
+            proxy
           end
         end
 
@@ -247,6 +248,12 @@ module Twurl
           exit
         end
       end
+
+      def proxy
+        on('-P', '--proxy [proxy]', 'Specify HTTP proxy to forward requests to (default: No proxy)') do |proxy|
+          options.proxy = proxy
+        end
+      end
     end
   end
 
@@ -285,5 +292,9 @@ module Twurl
     def host
       super || DEFAULT_HOST
     end
+
+    def proxy
+      super || nil
+    end
   end
 end

data/lib/twurl/oauth_client.rb

@@ -164,7 +164,8 @@ module Twurl
         OAuth::Consumer.new(
           consumer_key,
           consumer_secret,
-          :site => Twurl.options.base_url
+          :site => Twurl.options.base_url,
+          :proxy => Twurl.options.proxy
         )
     end
 

data/lib/twurl/version.rb

@@ -1,8 +1,8 @@
 module Twurl
   module VERSION
-    MAJOR  = '0' unless defined? MAJOR
-    MINOR  = '7' unless defined? MINOR
-    PATCH  = '0' unless defined? PATCH
+    MAJOR  = 0 unless defined? MAJOR
+    MINOR  = 8 unless defined? MINOR
+    PATCH  = 0 unless defined? PATCH
     BETA   = nil unless defined? BETA # Time.now.to_i.to_s
   end
 

data/test/cli_test.rb

@@ -150,4 +150,21 @@ class Twurl::CLI::OptionParsingTest < MiniTest::Unit::TestCase
     end
   end
   include HostOptionTests
+
+  module ProxyOptionTests
+    def test_not_specifying_proxy_sets_it_to_nil
+      options = Twurl::CLI.parse_options([])
+      assert_equal nil, options.proxy
+    end
+
+    def test_setting_proxy_updates_to_requested_value
+      custom_proxy = 'localhost:80'
+
+      [['-P', custom_proxy], ['--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/twurl.gemspec

@@ -3,15 +3,15 @@ require File.expand_path('../lib/twurl/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.add_dependency 'oauth', '~> 0.4'
-  s.add_development_dependency 'rake', '~> 0.8'
-  s.add_development_dependency 'rr', '~> 1.0'
-  s.add_development_dependency 'simplecov', '~> 0.4'
-  s.add_development_dependency 'minitest', '~> 2.5'
+  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(CHANGELOG COPYING INSTALL README)
+  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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -33,65 +33,65 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 description: Curl for the Twitter API
 email:
 - marcel@twitter.com
@@ -99,7 +99,6 @@ executables:
 - twurl
 extensions: []
 extra_rdoc_files:
-- CHANGELOG
 - COPYING
 - INSTALL
 - README
@@ -107,7 +106,6 @@ files:
 - .gemtest
 - .gitignore
 - .travis.yml
-- CHANGELOG
 - COPYING
 - Gemfile
 - INSTALL
@@ -162,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: twurl
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Curl for the Twitter API

data/CHANGELOG

@@ -1,4 +0,0 @@
-Version: 0.6.3
---------------
-
-* Add the -A/--header command line option to support adding a header to the request. (Jake Donham)