diff --git a/.gitignore b/.gitignore index b942afb..9a889e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/Gemfile-custom.rb /config/database.yml /data/ /log/*.log diff --git a/Gemfile b/Gemfile index 80f9cb1..b342d33 100644 --- a/Gemfile +++ b/Gemfile @@ -1,27 +1,16 @@ source 'http://rubygems.org' -gem 'rails', '~> 3.1' - -gem 'pg', '~> 0.11' - -gem 'haml', '~> 3.1' - -gem 'bcrypt-ruby', '~> 3.0' - -gem 'rabl', '~> 0.6' +gem 'rails', '~> 3.1' +gem 'pg', '~> 0.11' +gem 'haml', '~> 3.1' +gem 'bcrypt-ruby', '~> 3.0' +gem 'rabl', '~> 0.6' group :development, :test do - gem 'thin', '~> 1.3' - gem 'rspec-rails', '~> 2.6' - gem 'capybara', '~> 1.1' + gem 'rspec-rails', '~> 2.6' + gem 'capybara', '~> 1.1' gem 'factory_girl_rails', '~> 1.2' - gem 'spork', '~> 0.9.0.rc' - gem 'guard', '~> 0.8' - gem 'guard-rspec', '~> 0.4' - gem 'guard-spork', '~> 0.2' - if RbConfig::CONFIG['target_os'] =~ /linux/i - gem 'rb-inotify', '~> 0.8' - gem 'libnotify', '~> 0.6' - end - gem 'shoulda-matchers', '~> 1.0' + gem 'shoulda-matchers', '~> 1.0' end + +eval File.read('Gemfile-custom.rb') if File.exist?('Gemfile-custom.rb') diff --git a/Gemfile.lock b/Gemfile.lock index 56dffe2..5b680eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,10 +40,8 @@ GEM xpath (~> 0.1.4) childprocess (0.3.1) ffi (~> 1.0.6) - daemons (1.1.8) diff-lcs (1.1.3) erubis (2.7.0) - eventmachine (0.12.10) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) @@ -63,7 +61,6 @@ GEM i18n (0.6.0) journey (1.0.3) json (1.6.5) - libnotify (0.7.2) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -99,8 +96,6 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) - rb-inotify (0.8.8) - ffi (>= 0.5.0) rdoc (3.12) json (~> 1.4) rspec (2.9.0) @@ -128,10 +123,6 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thin (1.3.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) @@ -152,12 +143,9 @@ DEPENDENCIES guard-rspec (~> 0.4) guard-spork (~> 0.2) haml (~> 3.1) - libnotify (~> 0.6) pg (~> 0.11) rabl (~> 0.6) rails (~> 3.1) - rb-inotify (~> 0.8) rspec-rails (~> 2.6) shoulda-matchers (~> 1.0) spork (~> 0.9.0.rc) - thin (~> 1.3)