From 75ab43c2ea6d27604b33c53e0a02cad5d600aa39 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sat, 9 Feb 2013 22:07:24 -0800
Subject: [PATCH] Move development dependencies into Gemfile

---
 .document       |  9 +++++----
 .travis.yml     | 12 +++++++-----
 Gemfile         | 34 ++++++++++++++--------------------
 faraday.gemspec |  7 ++++---
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.document b/.document
index ecf36731..1fd4b831 100644
--- a/.document
+++ b/.document
@@ -1,5 +1,6 @@
-README.rdoc
-lib/**/*.rb
+CONTRIBUTING.md
+LICENSE.md
+README.md
 bin/*
-features/**/*.feature
-LICENSE
+lib/**/*.rb
+test/**/*.rb
diff --git a/.travis.yml b/.travis.yml
index e4863623..b2f3d0f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
-script: script/test
+bundler_args: --without development
+
+env:
+  - SSL=no
+  - SSL=yes
 
 language: ruby
 
@@ -13,10 +17,6 @@ matrix:
       env: SSL=yes
     - rvm: 2.0.0
 
-env:
-  - SSL=no
-  - SSL=yes
-
 rvm:
   - rbx-18mode
   - rbx-19mode
@@ -26,3 +26,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+
+script: script/test
diff --git a/Gemfile b/Gemfile
index e06161b6..9b8ebce0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,28 +1,22 @@
 source 'https://rubygems.org'
 
-group :development do
-  gem 'sinatra', '~> 1.3'
-end
+gem 'ffi-ncurses', '~> 0.3', :platforms => :jruby
+gem 'jruby-openssl', '~> 0.7', :platforms => :jruby
+gem 'rake'
 
 group :test do
-  gem 'em-http-request', '~> 1.0', :require => 'em-http'
-  gem 'em-synchrony', '~> 1.0', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
+  gem 'em-http-request', '>= 1.0', :require => 'em-http'
+  gem 'em-synchrony', '>= 1.0', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
   gem 'excon', '>= 0.16.1'
-  gem 'httpclient', '~> 2.2'
-  gem 'net-http-persistent', '~> 2.5', :require => false
-  gem 'leftright', '~> 0.9', :require => false
-  gem 'rack-test', '~> 0.6', :require => 'rack/test'
-  gem 'minitest', '~> 4.3'
-end
-
-platforms :ruby do
-  gem 'patron', '~> 0.4', '> 0.4.1'
-  gem 'typhoeus', '~> 0.3.3'
-end
-
-platforms :jruby do
-  gem 'jruby-openssl', '~> 0.7'
-  gem 'ffi-ncurses', '~> 0.3'
+  gem 'httpclient', '>= 2.2'
+  gem 'leftright', '>= 0.9', :require => false
+  gem 'minitest', '>= 4.3'
+  gem 'net-http-persistent', '>= 2.5', :require => false
+  gem 'patron', '>= 0.4.2', :platforms => :ruby
+  gem 'rack-test', '>= 0.6', :require => 'rack/test'
+  gem 'simplecov'
+  gem 'sinatra', '~> 1.3'
+  gem 'typhoeus', '~> 0.3.3', :platforms => :ruby
 end
 
 gemspec
diff --git a/faraday.gemspec b/faraday.gemspec
index 25591b87..247bca86 100644
--- a/faraday.gemspec
+++ b/faraday.gemspec
@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.licenses = ['MIT']
 
   spec.add_dependency 'multipart-post', '~> 1.1'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'bundler', '~> 1.0'
 
-  spec.files = %w(Gemfile LICENSE.md README.md Rakefile)
+  spec.files = %w(.document CONTRIBUTING.md Gemfile LICENSE.md README.md Rakefile)
   spec.files << "#{lib}.gemspec"
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("test/**/*.rb")
@@ -30,4 +29,6 @@ Gem::Specification.new do |spec|
   dev_null    = File.exist?('/dev/null') ? '/dev/null' : 'NUL'
   git_files   = `git ls-files -z 2>#{dev_null}`
   spec.files &= git_files.split("\0") if $?.success?
+
+  spec.test_files = Dir.glob("test/**/*.rb")
 end