1
0
Fork 0
mirror of https://github.com/thoughtbot/factory_bot_rails.git synced 2022-11-09 11:49:18 -05:00

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.
This commit is contained in:
Dan Croak 2014-05-26 20:40:49 -07:00
parent 00cb2eabb1
commit 311605a825
4 changed files with 22 additions and 27 deletions

14
.gitignore vendored
View file

@ -1,9 +1,9 @@
*.swp *.swp
test.db
factory_girl_rails-*.gem
tmp
rdoc
coverage
pkg
.bundle .bundle
Gemfile.lock gemfiles/
coverage
factory_girl_rails-*.gem
pkg
rdoc
test.db
tmp

View file

@ -1,4 +1,4 @@
source "https://rubygems.org" source 'https://rubygems.org'
gemspec gemspec

View file

@ -17,6 +17,9 @@ GEM
activesupport (= 4.1.1) activesupport (= 4.1.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activesupport (4.1.1) activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
@ -47,7 +50,7 @@ GEM
gherkin (~> 2.12) gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0) multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1) multi_test (>= 0.1.1)
diff-lcs (1.1.3) diff-lcs (1.2.5)
erubis (2.7.0) erubis (2.7.0)
execjs (2.0.2) execjs (2.0.2)
factory_girl (4.4.0) factory_girl (4.4.0)
@ -72,19 +75,18 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
rspec (2.11.0) rspec-core (2.14.8)
rspec-core (~> 2.11.0) rspec-expectations (2.14.5)
rspec-expectations (~> 2.11.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (~> 2.11.0) rspec-mocks (2.14.6)
rspec-core (2.11.1) rspec-rails (2.14.2)
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
rspec-rails (2.11.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 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) sqlite3 (1.3.9)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.3) thread_safe (0.3.3)
@ -105,7 +107,6 @@ DEPENDENCIES
factory_girl_rails! factory_girl_rails!
jquery-rails jquery-rails
rake rake
rspec (~> 2.11.0)
rspec-rails rspec-rails
sqlite3 sqlite3
uglifier uglifier

View file

@ -11,17 +11,11 @@ Gem::Specification.new do |s|
loading)} loading)}
s.files = `git ls-files`.split("\n") 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.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"] s.require_paths = ["lib"]
s.license = "MIT" s.license = "MIT"
s.add_runtime_dependency('railties', '>= 3.0.0') s.add_runtime_dependency('railties', '>= 3.0.0')
s.add_runtime_dependency('factory_girl', '~> 4.4.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 end