From 311605a825665af6b00a13abb23598bb8a81ddeb Mon Sep 17 00:00:00 2001
From: Dan Croak <dan@thoughtbot.com>
Date: Mon, 26 May 2014 20:40:49 -0700
Subject: [PATCH] Ignore gemfiles, don't ignore Gemfile.lock in git

Move dev dependencies out of gemspec and into Gemfile to gain more
control over the private API.
---
 .gitignore                 | 14 +++++++-------
 Gemfile                    |  2 +-
 Gemfile.lock               | 25 +++++++++++++------------
 factory_girl_rails.gemspec |  8 +-------
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d8ca74..9711f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 *.swp
-test.db
-factory_girl_rails-*.gem
-tmp
-rdoc
-coverage
-pkg
 .bundle
-Gemfile.lock
+gemfiles/
+coverage
+factory_girl_rails-*.gem
+pkg
+rdoc
+test.db
+tmp
diff --git a/Gemfile b/Gemfile
index 5156232..c853997 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 98c395a..19d8517 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,9 @@ GEM
       activesupport (= 4.1.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
     activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
@@ -47,7 +50,7 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.0.2)
     factory_girl (4.4.0)
@@ -72,19 +75,18 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.3)
@@ -105,7 +107,6 @@ DEPENDENCIES
   factory_girl_rails!
   jquery-rails
   rake
-  rspec (~> 2.11.0)
   rspec-rails
   sqlite3
   uglifier
diff --git a/factory_girl_rails.gemspec b/factory_girl_rails.gemspec
index 0c51fc7..baaf727 100644
--- a/factory_girl_rails.gemspec
+++ b/factory_girl_rails.gemspec
@@ -11,17 +11,11 @@ Gem::Specification.new do |s|
     loading)}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split("\n")
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.license       = "MIT"
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
   s.add_runtime_dependency('factory_girl', '~> 4.4.0')
-
-  s.add_development_dependency('appraisal', '~> 0.5.0')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.11.0')
-  s.add_development_dependency('cucumber', '~> 1.2.1')
-  s.add_development_dependency('aruba', '~> 0.5.1')
 end