From 576cd0a8d728a929551efa23c2f77f1d1949f83a Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Fri, 29 Nov 2013 09:29:12 +0100
Subject: [PATCH] Move development dependencies into Gemfile

---
 Gemfile                  | 13 +++++++++++++
 gemfiles/rails32.gemfile | 28 +++++++++++++++++++++-------
 gemfiles/rails40.gemfile | 27 +++++++++++++++++++++------
 impressionist.gemspec    | 11 +----------
 4 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index 42fe3e3..37823f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
+
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
@@ -10,4 +13,14 @@ platforms :ruby, :mswin, :mingw do
   gem 'sqlite3'
 end
 
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '>= 3.2.15'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
 gemspec
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
index 810f15f..8edb965 100644
--- a/gemfiles/rails32.gemfile
+++ b/gemfiles/rails32.gemfile
@@ -1,12 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.12'
-gem 'jquery-rails'
-gem 'json'
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
 
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-gem 'jdbc-sqlite3', :platforms => [:jruby]
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'jruby-openssl'
+end
 
-gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+platforms :ruby, :mswin, :mingw do
+  gem 'sqlite3'
+end
 
-gemspec :path => '../'
\ No newline at end of file
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '~> 3.2.15'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
+gemspec :path => '../'
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
index 3b25da9..60d8569 100644
--- a/gemfiles/rails40.gemfile
+++ b/gemfiles/rails40.gemfile
@@ -1,11 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0.0'
-gem 'jquery-rails'
-gem 'json'
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
 
-gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.rc1', :platforms => [:jruby]
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'jruby-openssl'
+end
 
-gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+platforms :ruby, :mswin, :mingw do
+  gem 'sqlite3'
+end
 
-gemspec :path => '../'
\ No newline at end of file
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '~> 4.0.1'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
+gemspec :path => '../'
diff --git a/impressionist.gemspec b/impressionist.gemspec
index d3d21f4..3fd5a9a 100644
--- a/impressionist.gemspec
+++ b/impressionist.gemspec
@@ -19,16 +19,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
 
   s.add_dependency 'httpclient', '~> 2.2'
-
   s.add_dependency 'nokogiri', '>= 1.5.0'
 
-  s.add_development_dependency 'capybara', '>= 2.0.3'
-  s.add_development_dependency 'rake', '>= 0.9'
-  s.add_development_dependency 'rails', '>= 3.2.12', '< 4.1'
-  s.add_development_dependency 'rdoc', '>= 2.4.2'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'systemu'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-rails'
+  s.add_development_dependency 'bundler', '~> 1.0'
 end