Skip to content

Commit

Permalink
remove spring because it frequently conflicts with foreman
Browse files Browse the repository at this point in the history
  • Loading branch information
cantino committed Aug 15, 2015
1 parent 16e9504 commit ffe9626
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ group :development do
gem 'rspec-rails', '~> 3.1'
gem 'rspec-html-matchers', '~> 0.7'
gem 'shoulda-matchers'
gem 'spring', '~> 1.3.0'
gem 'spring-commands-rspec'
gem 'vcr'
gem 'webmock', '~> 1.17.4', require: false
end
Expand Down
7 changes: 1 addition & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@ GEM
slop (3.6.0)
spectrum-rails (1.3.4)
railties (>= 3.1)
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.1)
Expand Down Expand Up @@ -562,8 +559,6 @@ DEPENDENCIES
shoulda-matchers
slack-notifier (~> 1.0.0)
spectrum-rails
spring (~> 1.3.0)
spring-commands-rspec
string-scrub
therubyracer (~> 0.12.2)
tumblr_client
Expand All @@ -582,4 +577,4 @@ DEPENDENCIES
xmpp4r (~> 0.5.6)

BUNDLED WITH
1.10.5
1.10.6
2 changes: 1 addition & 1 deletion Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ guard 'livereload' do
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
end

guard :rspec, cmd: 'bundle exec spring rspec' do
guard :rspec, cmd: 'bundle exec rspec' do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
Expand Down
15 changes: 0 additions & 15 deletions bin/spring

This file was deleted.

0 comments on commit ffe9626

Please sign in to comment.