Commit a580171e authored by Jonne Haß's avatar Jonne Haß
Browse files

Replace spork with spring, update & use binstubs

Spring is the recommended application preloader for rails
parent 4cadc2d5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -3,4 +3,3 @@
--color
--tag ~performance
--order random
--drb
+4 −3
Original line number Diff line number Diff line
@@ -202,14 +202,15 @@ group :development do
  # Automatic test runs
  gem 'guard-cucumber', '1.5.1'
  gem 'guard-rspec',    '4.3.1'
  gem 'guard',          '2.8.2', :require => false
  gem 'guard',          '2.10.0', :require => false
  gem 'rb-fsevent',     '0.9.4', :require => false
  gem 'rb-inotify',     '0.9.5', :require => false

  # Preloading environment

  gem 'guard-spork', '2.0.1'
  gem 'spork',       '1.0.0rc4'
  gem 'spring', '1.2.0'
  gem 'spring-commands-rspec', '1.0.2'
  gem 'spring-commands-cucumber', '1.0.1'

  # Debugging
  gem 'pry'
+11 −10
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ GEM
      json
      multi_json
      request_store (>= 1.0.5)
    guard (2.8.2)
    guard (2.10.0)
      formatador (>= 0.2.4)
      listen (~> 2.7)
      lumberjack (~> 1.0)
@@ -257,10 +257,6 @@ GEM
    guard-rspec (4.3.1)
      guard (~> 2.1)
      rspec (>= 2.14, < 4.0)
    guard-spork (2.0.1)
      childprocess (>= 0.2.3)
      guard (~> 2.8.2)
      spork (>= 0.8.4)
    haml (4.0.5)
      tilt
    handlebars_assets (0.18)
@@ -307,7 +303,7 @@ GEM
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
    kgio (2.9.2)
    listen (2.8.1)
    listen (2.8.3)
      celluloid (>= 0.15.2)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
@@ -538,7 +534,11 @@ GEM
    sinon-rails (1.10.3)
      railties (>= 3.1)
    slop (3.6.0)
    spork (1.0.0rc4)
    spring (1.2.0)
    spring-commands-cucumber (1.0.1)
      spring (>= 0.9.1)
    spring-commands-rspec (1.0.2)
      spring (>= 0.9.1)
    sprockets (2.11.3)
      hike (~> 1.2)
      multi_json (~> 1.0)
@@ -625,10 +625,9 @@ DEPENDENCIES
  foreman (= 0.62)
  fuubar (= 2.0.0)
  gon (= 5.2.3)
  guard (= 2.8.2)
  guard (= 2.10.0)
  guard-cucumber (= 1.5.1)
  guard-rspec (= 4.3.1)
  guard-spork (= 2.0.1)
  haml (= 4.0.5)
  handlebars_assets (= 0.18.0)
  http_accept_language (= 2.0.2)
@@ -688,7 +687,9 @@ DEPENDENCIES
  simple_captcha2 (= 0.3.2)
  sinatra (= 1.4.5)
  sinon-rails (= 1.10.3)
  spork (= 1.0.0rc4)
  spring (= 1.2.0)
  spring-commands-cucumber (= 1.0.1)
  spring-commands-rspec (= 1.0.2)
  test_after_commit (= 0.4.0)
  timecop (= 0.7.1)
  twitter (= 4.8.1)
+3 −17
Original line number Diff line number Diff line
# A sample Guardfile
# More info at https://github.com/guard/guard#readme
# also, http://asciicasts.com/episodes/264-guard
guard 'rspec', :all_on_start => false, :all_after_pass => false do
guard :rspec, cmd: 'bin/spring rspec', all_on_start: false, all_after_pass: false do
  watch(%r{^spec/.+_spec\.rb$})
  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
  watch('spec/spec_helper.rb')  { "spec" }
@@ -15,23 +12,12 @@ guard 'rspec', :all_on_start => false, :all_after_pass => false do
  watch('spec/spec_helper.rb')                        { "spec" }
  watch('config/routes.rb')                           { "spec/routing" }
  watch('app/controllers/application_controller.rb')  { "spec/controllers" }

  # Capybara request specs
  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
end

guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' }, :all_on_start => false, :all_after_pass => false, :wait => 70 do
  watch('config/application.rb')
  watch('config/environment.rb')
  watch(%r{^config/environments/.+\.rb$})
  watch(%r{^config/initializers/.+\.rb$})
  watch('Gemfile')
  watch('Gemfile.lock')
  watch('spec/spec_helper.rb') { :rspec }
  watch('test/test_helper.rb') { :test_unit }
  watch(%r{features/support/}) { :cucumber }
end

guard 'cucumber', :all_on_start => false, :all_after_pass => false do
guard :cucumber, command_prefix: 'bin/spring', bundler: false, all_on_start: false, all_after_pass: false do
  watch(%r{^features/.+\.feature$})
  watch(%r{^features/support/.+$})          { 'features' }
  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+3 −3
Original line number Diff line number Diff line
web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
sidekiq: bundle exec sidekiq
xmpp: bundle exec vines start
web: bin/bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
sidekiq: bin/bundle exec sidekiq
xmpp: bin/bundle exec vines start
Loading