From c560a54377fba064cf90a1c5a6b68f7dfc0d169b Mon Sep 17 00:00:00 2001
From: Hiroshi Nakamura <nahi@ruby-lang.org>
Date: Wed, 17 Aug 2011 13:52:54 +0900
Subject: [PATCH] Use bundler as a part of build system

Preparing for Travis CI.
---
 Rakefile           | 20 +++++++-------------
 httpclient.gemspec |  4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Rakefile b/Rakefile
index b541a3df..c19c4d90 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,18 +1,12 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 
-task :default => :gem
+task :default => :test
 
-begin
-  require 'rake/gempackagetask'
-  load 'httpclient.gemspec'
-  Rake::GemPackageTask.new(SPEC) do |pkg|
-    pkg.need_zip = true
-    pkg.need_tar = true
-  end
-rescue LoadError
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 begin
   require 'rcov/rcovtask'
@@ -25,8 +19,8 @@ end
 
 Rake::TestTask.new("test") do |test|
   test.libs << 'lib'
-  test.warning = true
-  test.pattern = 'test/test_*.rb'
+  test.verbose = true
+  test.test_files = Dir.glob('test/test_*.rb')
 end
 
 Rake::RDocTask.new("doc") do |rdoc|
diff --git a/httpclient.gemspec b/httpclient.gemspec
index aa695876..121d5106 100644
--- a/httpclient.gemspec
+++ b/httpclient.gemspec
@@ -1,5 +1,5 @@
 require 'rubygems'
-SPEC = Gem::Specification.new do |s|
+Gem::Specification.new { |s|
   s.name = "httpclient"
   s.version = "2.2.1"
   s.date = "2011-06-02"
@@ -10,4 +10,4 @@ SPEC = Gem::Specification.new do |s|
   s.summary = "gives something like the functionality of libwww-perl (LWP) in Ruby"
   s.files = Dir.glob("{lib,sample,test}/**/*")
   s.require_path = "lib"
-end
+}