From 8ee2f5ce237063ccf548feb30bb7ec6cf001fd95 Mon Sep 17 00:00:00 2001
From: Joe Ferris <jferris@thoughtbot.com>
Date: Fri, 30 Sep 2011 16:28:56 -0500
Subject: [PATCH] Move development dependencies into the gemspec

---
 Gemfile                 | 6 +-----
 Gemfile.lock            | 8 +++++++-
 capybara-webkit.gemspec | 6 +++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index e5258eb9..1aa98e4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,2 @@
 source "http://rubygems.org"
-gem "rspec", '~> 2.6.0', :require => false
-gem "capybara"
-gem "sinatra", :require => false
-gem "mini_magick", :require => false
-gem 'rake'
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 71240a70..c088cdea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    capybara-webkit (0.6.1)
+      capybara (< 1.2, >= 1.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -47,7 +53,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
+  capybara-webkit!
   mini_magick
   rake
   rspec (~> 2.6.0)
diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec
index fb1c1448..54e9d838 100644
--- a/capybara-webkit.gemspec
+++ b/capybara-webkit.gemspec
@@ -13,7 +13,11 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.rubygems_version = "1.3.5"
   s.summary = "Headless Webkit driver for Capybara"
-  s.add_runtime_dependency "capybara", "~> 1.0.0"
+  s.add_runtime_dependency "capybara", [">= 1.0.0", "< 1.2"]
+  s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "sinatra"
+  s.add_development_dependency "mini_magick"
+  s.add_development_dependency "rake"
   s.extensions = "extconf.rb"
 end