cleanup & update gemspec, Rakefile

 - remove "date" and "rubyforge" fields from gemspec
 - remove obsolete "test:live" task
 - bring the file list in gemspec up to date
 - remove dumb validation task for gemspec

Rakefile

@@ -1,12 +1,9 @@
-#!/usr/bin/env rake
-
 require 'date'
+require 'rake/testtask'
+
+task :default => :test
 
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
+## helper functions
 
 def name
   @name ||= Dir['*.gemspec'].first.split('.').first
@@ -17,14 +14,6 @@ def version
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
 def gemspec_file
   "#{name}.gemspec"
 end
@@ -37,29 +26,14 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
+## standard tasks
 
-task :default => :test
-
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
-TEST_SERVER = 'http://faradaylive.heroku.com'
-
-desc "Run tests including live tests against #{TEST_SERVER}"
-task :"test:live" do
-  ENV['LIVE'] = TEST_SERVER
-  Rake::Task[:test].invoke
-end
-
 desc "Run tests including live tests against a local server on port 4567"
 task :"test:local" do
   ENV['LIVE'] = '1'
@@ -71,25 +45,12 @@ task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"
 end
 
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
+## release management tasks
 
 desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
+  unless `git symbolic-ref HEAD` =~ /\/master$/
+    abort "You must be on the master branch to release!"
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
@@ -106,17 +67,14 @@ task :build => :gemspec do
 end
 
 desc "Generate #{gemspec_file}"
-task :gemspec => :validate do
+task :gemspec do
   # read spec file and split out manifest section
   spec = File.read(gemspec_file)
   head, manifest, tail = spec.split("  # = MANIFEST =\n")
 
   # replace name version and date
   replace_header(head, :name)
   replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
 
   # determine file list from git ls-files
   files = `git ls-files`.
@@ -133,16 +91,3 @@ task :gemspec => :validate do
   File.open(gemspec_file, 'w') { |io| io.write(spec) }
   puts "Updated #{gemspec_file}"
 end
-
-desc "Validate #{gemspec_file}"
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end

faraday.gemspec

@@ -1,45 +1,22 @@
-## This is the rakegem gemspec template. Make sure you read and understand
-## all of the comments. Some sections require modification, and others can
-## be deleted if you don't need them. Once you understand the contents of
-## this file, feel free to delete any comments that begin with two hash marks.
-## You can find comprehensive Gem::Specification documentation, at
-## http://docs.rubygems.org/read/chapter/20
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
-  ## Leave these as is they will be modified for you by the rake gemspec task.
-  ## If your rubyforge_project name is different, then edit it and comment out
-  ## the sub! line in the Rakefile
-  s.name              = 'faraday'
-  s.version           = '0.7.5'
-  s.date              = '2011-10-04'
-  s.rubyforge_project = 'faraday'
+  s.name    = 'faraday'
+  s.version = '0.7.5'
 
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
   s.summary     = "HTTP/REST API client library."
-  s.description = "HTTP/REST API client library."
+  # TODO: s.description
 
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["Rick Olson"]
   s.email    = 'technoweenie@gmail.com'
-  s.homepage = 'http://github.com/technoweenie/faraday'
-
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
-  s.require_paths = %w[lib]
+  s.homepage = 'https://github.com/technoweenie/faraday'
 
   s.add_dependency 'multipart-post', '~> 1.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'webmock'
 
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
     Gemfile
@@ -52,6 +29,7 @@ Gem::Specification.new do |s|
     lib/faraday/adapter.rb
     lib/faraday/adapter/action_dispatch.rb
     lib/faraday/adapter/em_synchrony.rb
+    lib/faraday/adapter/em_synchrony/parallel_manager.rb
     lib/faraday/adapter/excon.rb
     lib/faraday/adapter/net_http.rb
     lib/faraday/adapter/patron.rb
@@ -62,8 +40,10 @@ Gem::Specification.new do |s|
     lib/faraday/error.rb
     lib/faraday/middleware.rb
     lib/faraday/request.rb
-    lib/faraday/request/json.rb
+    lib/faraday/request/basic_authentication.rb
     lib/faraday/request/multipart.rb
+    lib/faraday/request/retry.rb
+    lib/faraday/request/token_authentication.rb
     lib/faraday/request/url_encoded.rb
     lib/faraday/response.rb
     lib/faraday/response/logger.rb
@@ -74,17 +54,18 @@ Gem::Specification.new do |s|
     test/adapters/logger_test.rb
     test/adapters/net_http_test.rb
     test/adapters/test_middleware_test.rb
+    test/adapters/typhoeus_test.rb
+    test/authentication_middleware_test.rb
     test/connection_test.rb
     test/env_test.rb
     test/helper.rb
     test/live_server.rb
+    test/middleware/retry_test.rb
     test/middleware_stack_test.rb
     test/request_middleware_test.rb
     test/response_middleware_test.rb
   ]
   # = MANIFEST =
 
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ %r{^test/*/.+\.rb} }
 end