signet 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.3
+
+* Request objects no longer recreated during processing
+* Faraday middleware now supported
+* Streamed requests now supported
+* Fixed assertion profiles; client ID/secret omission no longer an error
+
 # 0.3.2
 
 * Added audience security check for ID tokens

data/Gemfile

@@ -0,0 +1,20 @@
+source :rubygems
+
+gem 'addressable', '>= 2.2.3'
+gem 'faraday', '~> 0.7.0'
+gem 'multi_json', '>= 1.3.0'
+gem 'jwt', '>= 0.1.4'
+gem 'extlib', '>= 0.9.15'
+gem 'jruby-openssl', :platforms => :jruby
+
+group :development do
+  gem 'launchy'
+  gem 'yard'
+  gem 'redcarpet'
+end
+
+group :test, :development do
+  gem 'rake', '>= 0.9.0'
+  gem 'rspec', '~> 1.2.9'
+  gem 'rcov', '>= 0.9.9', :platform => :mri_18
+end

data/Gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.8)
+    extlib (0.9.15)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    json (1.7.3)
+    jwt (0.1.4)
+      json (>= 1.2.4)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    multi_json (1.3.5)
+    multipart-post (1.1.5)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    rcov (1.0.0)
+    redcarpet (2.1.1)
+    rspec (1.2.9)
+    yard (0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  addressable (>= 2.2.3)
+  extlib (>= 0.9.15)
+  faraday (~> 0.7.0)
+  jruby-openssl
+  jwt (>= 0.1.4)
+  launchy
+  multi_json (>= 1.3.0)
+  rake (>= 0.9.0)
+  rcov (>= 0.9.9)
+  redcarpet
+  rspec (~> 1.2.9)
+  yard

data/README.md

@@ -7,6 +7,9 @@
   <dt>License</dt><dd>Apache 2.0</dd>
 </dl>
 
+[![Build Status](https://secure.travis-ci.org/google/signet.png)](http://travis-ci.org/google/signet)
+[![Dependency Status](https://gemnasium.com/google/signet.png)](https://gemnasium.com/google/signet)
+
 ## Description
 
 Signet is an OAuth 1.0 / OAuth 2.0 implementation.

data/Rakefile

@@ -4,11 +4,6 @@ $:.uniq!
 
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 
 begin
   require 'spec/rake/spectask'
@@ -27,14 +22,9 @@ PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME       = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = PKG_NAME
-RUBY_FORGE_USER    = "sporkmonger"
-RUBY_FORGE_PATH    = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
-RUBY_FORGE_URL     = "http://#{RUBY_FORGE_PROJECT}.rubyforge.org/"
-
 PKG_AUTHOR         = "Bob Aman"
 PKG_AUTHOR_EMAIL   = "bobaman@google.com"
-PKG_HOMEPAGE       = RUBY_FORGE_URL
+PKG_HOMEPAGE       = "http://code.google.com/p/oauth-signet/"
 PKG_SUMMARY        = "Package Summary"
 PKG_DESCRIPTION    = <<-TEXT
 Signet is an OAuth 1.0 / OAuth 2.0 implementation.

data/lib/signet/oauth_1/client.rb

@@ -849,93 +849,90 @@ module Signet
         end
         options = {
           :signature_method => 'HMAC-SHA1',
-          :realm => nil
+          :realm => nil,
+          :connection => Faraday.default_connection
         }.merge(options)
-        if options[:request]
+        
+        if options[:request].kind_of?(Faraday::Request)
+          request = options[:request]
+        else
           if options[:request].kind_of?(Array)
             method, uri, headers, body = options[:request]
-          elsif options[:request].kind_of?(Faraday::Request)
-            options[:connection] ||= Faraday.default_connection
-            method = options[:request].method.to_s.downcase.to_sym
-            uri = options[:connection].build_url(
-              options[:request].path, options[:request].params
-            )
-            headers = options[:request].headers || {}
-            body = options[:request].body || ''
+          else
+            method = options[:method] || :get
+            uri = options[:uri]
+            headers = options[:headers] || []
+            body = options[:body] || ''
           end
-        else
-          method = options[:method] || :get
-          uri = options[:uri]
-          headers = options[:headers] || []
-          body = options[:body] || ''
-        end
-        headers = headers.to_a if headers.kind_of?(Hash)
-        request_components = {
-          :method => method,
-          :uri => uri,
-          :headers => headers,
-          :body => body
-        }
-        # Verify that we have all pieces required to return an HTTP request
-        request_components.each do |(key, value)|
-          unless value
-            raise ArgumentError, "Missing :#{key} parameter."
+          headers = headers.to_a if headers.kind_of?(Hash)
+          request_components = {
+            :method => method,
+            :uri => uri,
+            :headers => headers,
+            :body => body
+          }
+          # Verify that we have all pieces required to return an HTTP request
+          request_components.each do |(key, value)|
+            unless value
+              raise ArgumentError, "Missing :#{key} parameter."
+            end
           end
-        end
-        if !body.kind_of?(String) && body.respond_to?(:each)
-          # Just in case we get a chunked body
-          merged_body = StringIO.new
-          body.each do |chunk|
-            merged_body.write(chunk)
+          if !body.kind_of?(String) && body.respond_to?(:each)
+            # Just in case we get a chunked body
+            merged_body = StringIO.new
+            body.each do |chunk|
+              merged_body.write(chunk)
+            end
+            body = merged_body.string
+          end
+          if !body.kind_of?(String)
+            raise TypeError, "Expected String, got #{body.class}."
+          end
+          method = method.to_s.downcase.to_sym
+          
+          request = Faraday::Request.create(method) do |req|
+            req.url(Addressable::URI.parse(uri))
+            req.headers = Faraday::Utils::Headers.new(headers)
+            req.body = body
           end
-          body = merged_body.string
-        end
-        if !body.kind_of?(String)
-          raise TypeError, "Expected String, got #{body.class}."
         end
-        method = method.to_s.downcase.to_sym
+        
         parameters = ::Signet::OAuth1.unsigned_resource_parameters(
           :client_credential_key => self.client_credential_key,
           :token_credential_key => self.token_credential_key,
           :signature_method => options[:signature_method],
           :two_legged => self.two_legged
         )
-        media_type = nil
-        headers.each do |(header, value)|
-          if header.downcase == 'Content-Type'.downcase
-            media_type = value.gsub(/^([^;]+)(;.*?)?$/, '\1')
-          end
-        end
-        if method == :post &&
-            media_type == 'application/x-www-form-urlencoded'
-          post_parameters = Addressable::URI.form_unencode(body)
-        else
-          post_parameters = []
-        end
-        parameters = parameters.concat(post_parameters)
+        
+        env = request.to_env(options[:connection])
+        
+        content_type = request['Content-Type'].to_s
+        content_type = content_type.split(';', 2).first if content_type.index(';')
+        if request.method == :post && content_type == 'application/x-www-form-urlencoded'
+          # Serializes the body in case a hash/array was passed. Noop if already string like
+          encoder = Faraday::Request::UrlEncoded.new(lambda { |env| })
+          encoder.call(env)
+          request.body = env[:body]
+
+          post_parameters = Addressable::URI.form_unencode(env[:body])
+          parameters = parameters.concat(post_parameters)
+        end
+        
         # No need to attach URI query parameters, the .sign_parameters
         # method takes care of that automatically.
         signature = ::Signet::OAuth1.sign_parameters(
-          method,
-          uri,
+          env[:method],
+          env[:url],
           parameters,
           self.client_credential_secret,
           self.token_credential_secret
         )
+        
         parameters << ['oauth_signature', signature]
-        authorization_header = [
-          'Authorization',
-          ::Signet::OAuth1.generate_authorization_header(
-            parameters, options[:realm]
-          )
-        ]
-        headers << authorization_header
-        headers << ['Cache-Control', 'no-store']
-        return Faraday::Request.create(method.to_s.downcase.to_sym) do |req|
-          req.url(Addressable::URI.parse(uri))
-          req.headers = Faraday::Utils::Headers.new(headers)
-          req.body = body
-        end
+        request['Authorization'] =  ::Signet::OAuth1.generate_authorization_header(
+            parameters, options[:realm])
+        request['Cache-Control'] = 'no-store'
+        return request
       end
 
       ##

data/lib/signet/oauth_2/client.rb

@@ -656,12 +656,7 @@ module Signet
         if self.token_credential_uri == nil
           raise ArgumentError, 'Missing token endpoint URI.'
         end
-        if self.client_id == nil
-          raise ArgumentError, 'Missing client identifier.'
-        end
-        if self.client_secret == nil
-          raise ArgumentError, 'Missing client secret.'
-        end
+
         method = 'POST'
         parameters = {"grant_type" => self.grant_type}
         case self.grant_type
@@ -679,9 +674,10 @@ module Signet
             # the presence of the redirect URI.
             raise ArgumentError, 'Missing authorization code.'
           end
+          parameters.merge!(self.extension_parameters)
         end
-        parameters['client_id'] = self.client_id
-        parameters['client_secret'] = self.client_secret
+        parameters['client_id'] = self.client_id unless self.client_id.nil?
+        parameters['client_secret'] = self.client_secret unless self.client_secret.nil?
         headers = [
           ['Cache-Control', 'no-store'],
           ['Content-Type', 'application/x-www-form-urlencoded']
@@ -752,7 +748,7 @@ module Signet
       #   - <code>:realm</code> —
       #     The Authorization realm.  See RFC 2617.
       #
-      # @return [Array] The request object.
+      # @return [Faraday::Request] The request object.
       def generate_authenticated_request(options={})
         if self.access_token == nil
           raise ArgumentError, 'Missing access token.'
@@ -760,62 +756,44 @@ module Signet
         options = {
           :realm => nil
         }.merge(options)
-        if options[:request]
+        if options[:request].kind_of?(Faraday::Request)
+          request = options[:request]
+        else
           if options[:request].kind_of?(Array)
             method, uri, headers, body = options[:request]
-          elsif options[:request].kind_of?(Faraday::Request)
-            options[:connection] ||= Faraday.default_connection
-            method = options[:request].method.to_s.downcase.to_sym
-            uri = options[:connection].build_url(
-              options[:request].path, options[:request].params
-            )
-            headers = options[:request].headers || {}
-            body = options[:request].body || ''
+          else
+            method = options[:method] || :get
+            uri = options[:uri]
+            headers = options[:headers] || []
+            body = options[:body] || ''
           end
-        else
-          method = options[:method] || :get
-          uri = options[:uri]
-          headers = options[:headers] || []
-          body = options[:body] || ''
-        end
-        headers = headers.to_a if headers.kind_of?(Hash)
-        request_components = {
-          :method => method,
-          :uri => uri,
-          :headers => headers,
-          :body => body
-        }
-        # Verify that we have all pieces required to return an HTTP request
-        request_components.each do |(key, value)|
-          unless value
-            raise ArgumentError, "Missing :#{key} parameter."
+          headers = headers.to_a if headers.kind_of?(Hash)
+          request_components = {
+            :method => method,
+            :uri => uri,
+            :headers => headers,
+            :body => body
+          }
+          # Verify that we have all pieces required to return an HTTP request
+          request_components.each do |(key, value)|
+            unless value
+              raise ArgumentError, "Missing :#{key} parameter."
+            end
           end
-        end
-        if !body.kind_of?(String) && body.respond_to?(:each)
-          # Just in case we get a chunked body
-          merged_body = StringIO.new
-          body.each do |chunk|
-            merged_body.write(chunk)
+          method = method.to_s.downcase.to_sym
+          request = Faraday::Request.create(method.to_s.downcase.to_sym) do |req|
+            req.url(Addressable::URI.parse(uri))
+            req.headers = Faraday::Utils::Headers.new(headers)
+            req.body = body
           end
-          body = merged_body.string
-        end
-        if !body.kind_of?(String)
-          raise TypeError, "Expected String, got #{body.class}."
-        end
-        method = method.to_s.downcase.to_sym
-        headers << [
-          'Authorization',
-          ::Signet::OAuth2.generate_bearer_authorization_header(
-            self.access_token,
-            options[:realm] ? [['realm', options[:realm]]] : nil
-          )
-        ]
-        headers << ['Cache-Control', 'no-store']
-        return Faraday::Request.create(method.to_s.downcase.to_sym) do |req|
-          req.url(Addressable::URI.parse(uri))
-          req.headers = Faraday::Utils::Headers.new(headers)
-          req.body = body
         end
+        
+        request['Authorization'] = ::Signet::OAuth2.generate_bearer_authorization_header(
+          self.access_token,
+          options[:realm] ? [['realm', options[:realm]]] : nil
+        )
+        request['Cache-Control'] = 'no-store'
+        return request
       end
 
       ##

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 3
-      TINY  = 2
+      TINY  = 3
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/signet/oauth_1/client_spec.rb

@@ -690,4 +690,92 @@ describe Signet::OAuth1::Client, 'configured' do
       parameters['oauth_version'].should == '1.0'
     end
   end
+
+  describe 'with Faraday requests' do
+
+    it 'should correctly get the protected resource' do
+      # Repeat this because signatures change from test to test
+      10.times do
+        original_request = Faraday::Request.create(:get) do |req|
+          req.url(Addressable::URI.parse('https://photos.example.net/photos?file=vacation.jpg&size=original'))
+          req.headers = Faraday::Utils::Headers.new([['Host', 'photos.example.net']])
+          req.body = ''
+        end
+
+        signed_request = @client.generate_authenticated_request(
+          :request => original_request
+        )
+
+        # Should be same request object
+        original_request['Authorization'].should == signed_request['Authorization']
+
+        signed_request.method.should == :get
+        signed_request.path.should ===
+          'https://photos.example.net/photos?file=vacation.jpg&size=original'
+        authorization_header = signed_request.headers['Authorization']
+        signed_request.body.should == ''
+        parameters = ::Signet::OAuth1.parse_authorization_header(
+          authorization_header
+        ).inject({}) { |h,(k,v)| h[k]=v; h }
+        parameters.should_not have_key('oauth_client_credential_key')
+        parameters.should_not have_key('oauth_temporary_credential_key')
+        parameters.should_not have_key('oauth_token_credential_key')
+        parameters.should_not have_key('oauth_callback')
+        parameters['oauth_nonce'].should =~ /^\w+$/
+        parameters['oauth_timestamp'].should =~ /^\d+$/
+        parameters['oauth_signature_method'].should == 'HMAC-SHA1'
+        parameters['oauth_consumer_key'].should == @client.client_credential_key
+        parameters['oauth_token'].should == @client.token_credential_key
+        parameters['oauth_signature'].should =~ /^[a-zA-Z0-9\=\/\+]+$/
+        parameters['oauth_version'].should == '1.0'
+      end
+    end
+
+    it 'should correctly post the protected resource' do
+      # Repeat this because signatures change from test to test
+      10.times do
+        original_request = Faraday::Request.create(:post) do |req|
+          req.url(Addressable::URI.parse('https://photos.example.net/photos'))
+          req.headers = Faraday::Utils::Headers.new([
+            ['Host', 'photos.example.net'],
+            ['Content-Type', 'application/x-www-form-urlencoded; charset=utf-8'],
+            ['Content-Length', '31'],
+          ])
+          req.body = {
+            'size' => 'original',
+            'file' => 'vacation.jpg'
+          }
+        end
+
+        signed_request = @client.generate_authenticated_request(
+          :request => original_request
+        )
+
+        # Should be same request object
+        original_request['Authorization'].should == signed_request['Authorization']
+
+        signed_request.method.should == :post
+        signed_request.path.should ===
+          'https://photos.example.net/photos'
+        authorization_header = signed_request.headers['Authorization']
+        # Can't rely on the order post parameters are encoded in.
+        signed_request.body.should include('file=vacation.jpg')
+        signed_request.body.should include('size=original')
+        parameters = ::Signet::OAuth1.parse_authorization_header(
+          authorization_header
+        ).inject({}) { |h,(k,v)| h[k]=v; h }
+        parameters.should_not have_key('oauth_client_credential_key')
+        parameters.should_not have_key('oauth_temporary_credential_key')
+        parameters.should_not have_key('oauth_token_credential_key')
+        parameters.should_not have_key('oauth_callback')
+        parameters['oauth_nonce'].should =~ /^\w+$/
+        parameters['oauth_timestamp'].should =~ /^\d+$/
+        parameters['oauth_signature_method'].should == 'HMAC-SHA1'
+        parameters['oauth_consumer_key'].should == @client.client_credential_key
+        parameters['oauth_token'].should == @client.token_credential_key
+        parameters['oauth_signature'].should =~ /^[a-zA-Z0-9\=\/\+]+$/
+        parameters['oauth_version'].should == '1.0'
+      end
+    end
+  end
 end

data/spec/signet/oauth_2/client_spec.rb

@@ -191,6 +191,16 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     end).should raise_error(TypeError)
   end
 
+  it 'should include extension parameters in token request' do
+    @client.grant_type = 'urn:ietf:params:oauth:grant-type:saml2-bearer'
+    @client.extension_parameters['assertion'] =
+      'PEFzc2VydGlvbiBJc3N1ZUluc3RhbnQ9IjIwMTEtMDU'
+      
+    request = @client.generate_access_token_request
+    params = Addressable::URI.form_unencode(request.body)
+    params.should include(['assertion', 'PEFzc2VydGlvbiBJc3N1ZUluc3RhbnQ9IjIwMTEtMDU'])
+  end
+  
   it 'should allow the token to be updated' do
     issued_at = Time.now
     @client.update_token!(
@@ -248,20 +258,6 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     end).should raise_error(ArgumentError)
   end
 
-  it 'should raise an error if client ID is missing' do
-    @client.client_secret = 'secret-12345'
-    (lambda do
-      @client.fetch_access_token!
-    end).should raise_error(ArgumentError)
-  end
-
-  it 'should raise an error if client secret is missing' do
-    @client.client_id = 'client-12345'
-    (lambda do
-      @client.fetch_access_token!
-    end).should raise_error(ArgumentError)
-  end
-
   it 'should raise an error if unauthorized' do
     @client.client_id = 'client-12345'
     @client.client_secret = 'secret-12345'
@@ -488,20 +484,6 @@ JSON
     end).should raise_error(ArgumentError)
   end
 
-  it 'should raise an error if a bogus request body is supplied' do
-    @client.client_id = 'client-12345'
-    @client.client_secret = 'secret-12345'
-    @client.access_token = '12345'
-    (lambda do
-      @client.generate_authenticated_request(
-        :realm => 'Example',
-        :method => 'POST',
-        :uri => 'http://www.example.com/',
-        :body => :bogus
-      )
-    end).should raise_error(TypeError)
-  end
-
   it 'should raise an error if the client does not have an access token' do
     @client.client_id = 'client-12345'
     @client.client_secret = 'secret-12345'

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-require "rake/gempackagetask"
+require "rubygems/package_task"
 
 namespace :gem do
   GEM_SPEC = Gem::Specification.new do |s|
@@ -14,7 +14,6 @@ namespace :gem do
     s.homepage = PKG_HOMEPAGE
     s.summary = PKG_SUMMARY
     s.description = PKG_DESCRIPTION
-    s.rubyforge_project = RUBY_FORGE_PROJECT
 
     s.files = PKG_FILES.to_a
 
@@ -30,12 +29,11 @@ namespace :gem do
     s.add_development_dependency("rake", "~> 0.8.3")
     s.add_development_dependency("rspec", "~> 1.1.11")
     s.add_development_dependency("launchy", "~> 2.0.0")
-    s.add_development_dependency("diff-lcs", "~> 1.1.2")
 
     s.require_path = "lib"
   end
 
-  Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  Gem::PackageTask.new(GEM_SPEC) do |p|
     p.gem_spec = GEM_SPEC
     p.need_tar = true
     p.need_zip = true

data/tasks/wiki.rake

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift(
 $LOAD_PATH.unshift(File.expand_path('.'))
 $LOAD_PATH.uniq!
 
-require 'google/api_client'
 require 'rake'
 require 'rake/clean'
 

metadata

@@ -1,162 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: signet
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.3.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-31 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160769840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.2.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160769840
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &2160769240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160769240
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &2160768620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jwt
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160768620
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: &2160768040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160768040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160767280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160767280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160766640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 1
-        - 11
+      - !ruby/object:Gem::Version
         version: 1.1.11
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160766640
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2160766000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :development
-  version_requirements: *id008
-description: |
-  Signet is an OAuth 1.0 / OAuth 2.0 implementation.
+  version_requirements: *2160766000
+description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
+'
 email: bobaman@google.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/compat/digest/hmac.rb
 - lib/compat/securerandom.rb
 - lib/signet/errors.rb
@@ -184,50 +124,40 @@ files:
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/metrics.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
 - tasks/spec.rake
 - tasks/wiki.rake
 - tasks/yard.rake
 - website/index.html
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.md
-has_rdoc: true
-homepage: http://signet.rubyforge.org/
+homepage: http://code.google.com/p/oauth-signet/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: signet
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Package Summary
 test_files: []
-

data/tasks/rdoc.rake

@@ -1,26 +0,0 @@
-require "rake/rdoctask"
-
-namespace :doc do
-  desc "Generate RDoc documentation"
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = "doc"
-    rdoc.title    = "#{PKG_NAME}-#{PKG_VERSION} Documentation"
-    rdoc.options << "--line-numbers" << "--inline-source" <<
-      "--accessor" << "cattr_accessor=object" << "--charset" << "utf-8"
-    rdoc.template = "#{ENV["template"]}.rb" if ENV["template"]
-    rdoc.rdoc_files.include("README.md", "CHANGELOG.md", "LICENSE")
-    rdoc.rdoc_files.include("lib/**/*.rb")
-  end
-
-  desc "Generate ri locally for testing"
-  task :ri do
-    sh "rdoc --ri -o ri ."
-  end
-
-  desc "Remove ri products"
-  task :clobber_ri do
-    rm_r "ri" rescue nil
-  end
-end
-
-task "clobber" => ["doc:clobber_rdoc", "doc:clobber_ri"]

data/tasks/rubyforge.rake

@@ -1,100 +0,0 @@
-namespace :gem do
-  desc 'Package and upload to RubyForge'
-  task :release => ["gem:package"] do |t|
-    require 'rubyforge'
-
-    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
-    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PKG_VERSION
-    pkg = "pkg/#{GEM_SPEC.full_name}"
-
-    rf = RubyForge.new
-    rf.configure
-    puts 'Logging in...'
-    rf.login
-
-    c = rf.userconfig
-    changelog = File.open("CHANGELOG.md") { |file| file.read }
-    c['release_changes'] = changelog
-    c['preformatted'] = true
-
-    files = ["#{pkg}.tgz", "#{pkg}.zip", "#{pkg}.gem"]
-
-    puts "Releasing #{PKG_NAME} v. #{PKG_VERSION}"
-    rf.add_release RUBY_FORGE_PROJECT, PKG_NAME, PKG_VERSION, *files
-  end
-end
-
-namespace :doc do
-  desc "Publish RDoc to RubyForge"
-  task :release => ["doc:yard"] do
-    require "rake/contrib/sshpublisher"
-    require "yaml"
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH + "/api"
-    local_dir = "doc"
-    system("mkdir -p website/api")
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-end
-
-namespace :spec do
-  desc "Publish specdoc to RubyForge"
-  task :release => ["spec:specdoc"] do
-    require "rake/contrib/sshpublisher"
-    require "yaml"
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH + "/specdoc"
-    local_dir = "specdoc"
-    system("mkdir -p website/specdoc")
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-
-  namespace :rcov do
-    desc "Publish coverage report to RubyForge"
-    task :release => ["spec:rcov"] do
-      require "rake/contrib/sshpublisher"
-      require "yaml"
-
-      config = YAML.load(
-        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-      )
-      host = "#{config['username']}@rubyforge.org"
-      remote_dir = RUBY_FORGE_PATH + "/coverage"
-      local_dir = "coverage"
-      system("mkdir -p website/coverage")
-      Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-    end
-  end
-end
-
-namespace :website do
-  desc "Publish website to RubyForge"
-  task :init do
-    require "rake/contrib/sshpublisher"
-    require "yaml"
-
-    config = YAML.load(
-      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = RUBY_FORGE_PATH
-    local_dir = "website"
-    system("mkdir -p website/api")
-    system("mkdir -p website/specdoc")
-    system("mkdir -p website/coverage")
-    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-  end
-
-  desc "Publish website to RubyForge"
-  task :release => [
-    "website:init", "doc:release", "spec:release", "spec:rcov:release"
-  ]
-end