From 54daa629583d4fa8940d83805397e569470a588c Mon Sep 17 00:00:00 2001
From: Joshua Clayton <jclayton@thoughtbot.com>
Date: Wed, 29 Jun 2011 12:09:19 -0400
Subject: [PATCH] Use Gemfile correctly

---
 Gemfile                    | 7 ++-----
 Gemfile.lock               | 9 +++++++++
 factory_girl_rails.gemspec | 3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 677e276..c80ee36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,3 @@
 source "http://rubygems.org"
-gem "cucumber"
-gem "aruba"
-gem "rake"
-gem "rspec"
-gem 'rails', '3.0.7'
+
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c85668..7390795 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+PATH
+  remote: .
+  specs:
+    factory_girl_rails (1.1.beta1)
+      factory_girl (~> 2.0.0.beta)
+      railties (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -43,6 +50,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    factory_girl (2.0.0.beta3)
     gherkin (2.2.8)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
@@ -96,6 +104,7 @@ PLATFORMS
 DEPENDENCIES
   aruba
   cucumber
+  factory_girl_rails!
   rails (= 3.0.7)
   rake
   rspec
diff --git a/factory_girl_rails.gemspec b/factory_girl_rails.gemspec
index 393012a..d0f68a5 100644
--- a/factory_girl_rails.gemspec
+++ b/factory_girl_rails.gemspec
@@ -17,6 +17,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   s.add_development_dependency('cucumber')
+  s.add_development_dependency('aruba')
+  s.add_development_dependency('rails', '3.0.7')
+
   s.platform = Gem::Platform::RUBY
   s.rubygems_version = %q{1.2.0}
 end