Merge pull request #1252 from dsander/fix-guard
Fix guard by updating to latest version, add rack-livereload
Dominik Sander
共有 3 个文件被更改，包括 34 次插入 和 38 次删除
+ 4
- 3
Gemfile
@@ -108,9 +108,10 @@ group :development do |
||
| 108 | 108 |
gem 'better_errors', '~> 1.1' |
| 109 | 109 |
gem 'binding_of_caller' |
| 110 | 110 |
gem 'quiet_assets' |
| 111 |
- gem 'guard' |
|
| 112 |
- gem 'guard-livereload', '~> 2.2' |
|
| 113 |
- gem 'guard-rspec' |
|
| 111 |
+ gem 'guard', '~> 2.13.0' |
|
| 112 |
+ gem 'guard-livereload', '~> 2.5.1' |
|
| 113 |
+ gem 'guard-rspec', '~> 4.6.4' |
|
| 114 |
+ gem 'rack-livereload', '~> 0.3.16' |
|
| 114 | 115 |
gem 'letter_opener_web' |
| 115 | 116 |
|
| 116 | 117 |
gem 'capistrano', '~> 3.4.0' |
+ 28
- 35
Gemfile.lock
@@ -131,23 +131,6 @@ GEM |
||
| 131 | 131 |
capistrano-rails (1.1.3) |
| 132 | 132 |
capistrano (~> 3.1) |
| 133 | 133 |
capistrano-bundler (~> 1.1) |
| 134 |
- celluloid (0.17.2) |
|
| 135 |
- celluloid-essentials |
|
| 136 |
- celluloid-extras |
|
| 137 |
- celluloid-fsm |
|
| 138 |
- celluloid-pool |
|
| 139 |
- celluloid-supervision |
|
| 140 |
- timers (>= 4.1.1) |
|
| 141 |
- celluloid-essentials (0.20.5) |
|
| 142 |
- timers (>= 4.1.1) |
|
| 143 |
- celluloid-extras (0.20.5) |
|
| 144 |
- timers (>= 4.1.1) |
|
| 145 |
- celluloid-fsm (0.20.5) |
|
| 146 |
- timers (>= 4.1.1) |
|
| 147 |
- celluloid-pool (0.20.5) |
|
| 148 |
- timers (>= 4.1.1) |
|
| 149 |
- celluloid-supervision (0.20.5) |
|
| 150 |
- timers (>= 4.1.1) |
|
| 151 | 134 |
chronic (0.10.2) |
| 152 | 135 |
coderay (1.1.0) |
| 153 | 136 |
coffee-rails (4.1.0) |
@@ -218,7 +201,7 @@ GEM |
||
| 218 | 201 |
feed-normalizer (1.5.2) |
| 219 | 202 |
hpricot (>= 0.6) |
| 220 | 203 |
simple-rss (>= 1.1) |
| 221 |
- ffi (1.9.5) |
|
| 204 |
+ ffi (1.9.10) |
|
| 222 | 205 |
font-awesome-sass (4.3.2.1) |
| 223 | 206 |
sass (~> 3.2) |
| 224 | 207 |
forecast_io (2.0.0) |
@@ -247,24 +230,29 @@ GEM |
||
| 247 | 230 |
retriable (>= 1.4) |
| 248 | 231 |
signet (>= 0.5.0) |
| 249 | 232 |
uuidtools (>= 2.1.0) |
| 250 |
- guard (2.6.1) |
|
| 233 |
+ guard (2.13.0) |
|
| 251 | 234 |
formatador (>= 0.2.4) |
| 252 |
- listen (~> 2.7) |
|
| 235 |
+ listen (>= 2.7, <= 4.0) |
|
| 253 | 236 |
lumberjack (~> 1.0) |
| 237 |
+ nenv (~> 0.1) |
|
| 238 |
+ notiffany (~> 0.0) |
|
| 254 | 239 |
pry (>= 0.9.12) |
| 240 |
+ shellany (~> 0.0) |
|
| 255 | 241 |
thor (>= 0.18.1) |
| 256 |
- guard-livereload (2.2.0) |
|
| 242 |
+ guard-compat (1.2.1) |
|
| 243 |
+ guard-livereload (2.5.1) |
|
| 257 | 244 |
em-websocket (~> 0.5) |
| 258 |
- guard (~> 2.0) |
|
| 245 |
+ guard (~> 2.8) |
|
| 246 |
+ guard-compat (~> 1.0) |
|
| 259 | 247 |
multi_json (~> 1.8) |
| 260 |
- guard-rspec (4.3.1) |
|
| 248 |
+ guard-rspec (4.6.4) |
|
| 261 | 249 |
guard (~> 2.1) |
| 262 |
- rspec (>= 2.14, < 4.0) |
|
| 250 |
+ guard-compat (~> 1.1) |
|
| 251 |
+ rspec (>= 2.99.0, < 4.0) |
|
| 263 | 252 |
hashie (2.0.5) |
| 264 | 253 |
haversine (0.3.0) |
| 265 | 254 |
hipchat (1.2.0) |
| 266 | 255 |
httparty |
| 267 |
- hitimes (1.2.3) |
|
| 268 | 256 |
hpricot (0.8.6) |
| 269 | 257 |
httmultiparty (0.3.10) |
| 270 | 258 |
httparty (>= 0.7.3) |
@@ -302,13 +290,12 @@ GEM |
||
| 302 | 290 |
railties (>= 3.2) |
| 303 | 291 |
libv8 (3.16.14.13) |
| 304 | 292 |
liquid (3.0.6) |
| 305 |
- listen (2.7.9) |
|
| 306 |
- celluloid (>= 0.15.2) |
|
| 293 |
+ listen (3.0.5) |
|
| 307 | 294 |
rb-fsevent (>= 0.9.3) |
| 308 | 295 |
rb-inotify (>= 0.9) |
| 309 | 296 |
loofah (2.0.3) |
| 310 | 297 |
nokogiri (>= 1.5.9) |
| 311 |
- lumberjack (1.0.9) |
|
| 298 |
+ lumberjack (1.0.10) |
|
| 312 | 299 |
macaddr (1.7.1) |
| 313 | 300 |
systemu (~> 2.6.2) |
| 314 | 301 |
mail (2.6.3) |
@@ -326,6 +313,7 @@ GEM |
||
| 326 | 313 |
multipart-post (2.0.0) |
| 327 | 314 |
mysql2 (0.3.16) |
| 328 | 315 |
naught (1.0.0) |
| 316 |
+ nenv (0.2.0) |
|
| 329 | 317 |
net-ftp-list (3.2.8) |
| 330 | 318 |
net-scp (1.2.1) |
| 331 | 319 |
net-ssh (>= 2.6.5) |
@@ -333,6 +321,9 @@ GEM |
||
| 333 | 321 |
netrc (0.10.3) |
| 334 | 322 |
nokogiri (1.6.7.2) |
| 335 | 323 |
mini_portile2 (~> 2.0.0.rc2) |
| 324 |
+ notiffany (0.0.8) |
|
| 325 |
+ nenv (~> 0.1) |
|
| 326 |
+ shellany (~> 0.0) |
|
| 336 | 327 |
oauth (0.4.7) |
| 337 | 328 |
oauth2 (0.9.4) |
| 338 | 329 |
faraday (>= 0.8, < 0.10) |
@@ -370,7 +361,7 @@ GEM |
||
| 370 | 361 |
polyglot (0.3.5) |
| 371 | 362 |
protected_attributes (1.0.8) |
| 372 | 363 |
activemodel (>= 4.0.1, < 5.0) |
| 373 |
- pry (0.10.1) |
|
| 364 |
+ pry (0.10.3) |
|
| 374 | 365 |
coderay (~> 1.1.0) |
| 375 | 366 |
method_source (~> 0.8.1) |
| 376 | 367 |
slop (~> 3.4) |
@@ -379,6 +370,8 @@ GEM |
||
| 379 | 370 |
quiet_assets (1.1.0) |
| 380 | 371 |
railties (>= 3.1, < 5.0) |
| 381 | 372 |
rack (1.6.4) |
| 373 |
+ rack-livereload (0.3.16) |
|
| 374 |
+ rack |
|
| 382 | 375 |
rack-test (0.6.3) |
| 383 | 376 |
rack (>= 1.0) |
| 384 | 377 |
rails (4.2.5.1) |
@@ -412,7 +405,7 @@ GEM |
||
| 412 | 405 |
thor (>= 0.18.1, < 2.0) |
| 413 | 406 |
raindrops (0.13.0) |
| 414 | 407 |
rake (10.5.0) |
| 415 |
- rb-fsevent (0.9.4) |
|
| 408 |
+ rb-fsevent (0.9.7) |
|
| 416 | 409 |
rb-inotify (0.9.5) |
| 417 | 410 |
ffi (>= 0.5.0) |
| 418 | 411 |
ref (2.0.0) |
@@ -468,6 +461,7 @@ GEM |
||
| 468 | 461 |
tilt (~> 1.1) |
| 469 | 462 |
select2-rails (3.5.9.3) |
| 470 | 463 |
thor (~> 0.14) |
| 464 |
+ shellany (0.0.1) |
|
| 471 | 465 |
shoulda-matchers (3.0.0) |
| 472 | 466 |
activesupport (>= 4.0.0) |
| 473 | 467 |
signet (0.5.1) |
@@ -507,8 +501,6 @@ GEM |
||
| 507 | 501 |
thor (0.19.1) |
| 508 | 502 |
thread_safe (0.3.5) |
| 509 | 503 |
tilt (1.4.1) |
| 510 |
- timers (4.1.1) |
|
| 511 |
- hitimes |
|
| 512 | 504 |
tins (1.3.2) |
| 513 | 505 |
treetop (1.5.3) |
| 514 | 506 |
polyglot (~> 0.3) |
@@ -590,9 +582,9 @@ DEPENDENCIES |
||
| 590 | 582 |
geokit (~> 1.8.4) |
| 591 | 583 |
geokit-rails (~> 2.0.1) |
| 592 | 584 |
google-api-client |
| 593 |
- guard |
|
| 594 |
- guard-livereload (~> 2.2) |
|
| 595 |
- guard-rspec |
|
| 585 |
+ guard (~> 2.13.0) |
|
| 586 |
+ guard-livereload (~> 2.5.1) |
|
| 587 |
+ guard-rspec (~> 4.6.4) |
|
| 596 | 588 |
haversine |
| 597 | 589 |
hipchat (~> 1.2.0) |
| 598 | 590 |
httparty (~> 0.13) |
@@ -622,6 +614,7 @@ DEPENDENCIES |
||
| 622 | 614 |
pry-rails |
| 623 | 615 |
quiet_assets |
| 624 | 616 |
rack (> 1.5.0) |
| 617 |
+ rack-livereload (~> 0.3.16) |
|
| 625 | 618 |
rails (= 4.2.5.1) |
| 626 | 619 |
rails_12factor |
| 627 | 620 |
rr |
+ 2
- 0
config/environments/development.rb
@@ -1,6 +1,8 @@ |
||
| 1 | 1 |
$stdout.sync = true |
| 2 | 2 |
|
| 3 | 3 |
Huginn::Application.configure do |
| 4 |
+ config.middleware.insert_after ActionDispatch::Static, Rack::LiveReload |
|
| 5 |
+ |
|
| 4 | 6 |
# Settings specified here will take precedence over those in config/application.rb |
| 5 | 7 |
|
| 6 | 8 |
# In the development environment your application's code is reloaded on |