From 5a42699f475c678ecff2453fbe9f41073f92bc48 Mon Sep 17 00:00:00 2001
From: echarp <echarpentier@april.org>
Date: Sat, 24 Oct 2015 17:14:47 +0200
Subject: [PATCH] Configured guard and livereload to use rack-livereload

---
 Gemfile                            | 15 ++++++++-------
 Gemfile.lock                       |  5 ++++-
 config/environments/development.rb |  4 ++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index baff1b54..aa39acb9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,17 +96,18 @@ gem 'twitter'
 
 group :development do
   gem 'sqlite3'
-  gem 'guard-livereload'
-  gem 'guard-migrate'
-  gem 'guard-bundler'
-  gem 'guard-minitest'
+  gem 'webrick'
   gem 'quiet_assets'
-  gem 'guard-rubocop'
+  gem 'guard-migrate', require: false
+  gem 'guard-bundler', require: false
+  gem 'guard-rubocop', require: false
+  gem 'guard-minitest', require: false
+  gem 'guard-livereload', require: false
+  gem 'rack-livereload'
   gem 'haml-lint'
-  gem 'webrick', '>= 1.3.1'
   # Security checks
   gem 'brakeman', require: false
-  gem 'guard-brakeman'
+  gem 'guard-brakeman', require: false
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3365a084..0f883b7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,6 +289,8 @@ GEM
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
+    rack-livereload (0.3.16)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.4)
@@ -470,6 +472,7 @@ DEPENDENCIES
   mysql2 (~> 0.3.18)
   paper_trail (~> 4.0.0.rc)
   quiet_assets
+  rack-livereload
   rails
   rails-i18n
   redcarpet
@@ -488,7 +491,7 @@ DEPENDENCIES
   twitter
   uglifier
   web-console (~> 2.0)
-  webrick (>= 1.3.1)
+  webrick
   webshims-rails
 
 BUNDLED WITH
diff --git a/config/environments/development.rb b/config/environments/development.rb
index cd391aca..2392a9c1 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,4 +39,8 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Add Rack::LiveReload to the bottom of the middleware stack with the default
+  # options.
+  config.middleware.insert_after ActionDispatch::Static, Rack::LiveReload
 end