mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update rails and restore guard 'run on start'

Browse Source
This commit is contained in:
Mark Moser 2016-08-22 11:46:21 -05:00
parent 8209a2293b
commit 1aca2d98d3
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'figaro', '~> 1.1.1' gem 'figaro', '~> 1.1.1'
gem 'bcrypt', '~> 3.1.7' gem 'bcrypt', '~> 3.1.7'
gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
gem 'rails', '~> 5.0.0' gem 'rails', '~> 5.0', '>= 5.0.0.1'
gem 'jbuilder', '~> 2.6' gem 'jbuilder', '~> 2.6'
gem 'jquery-rails' gem 'jquery-rails'

86
Gemfile.lock
View File

@ -1,46 +1,46 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.0.0) actioncable (5.0.0.1)
actionpack (= 5.0.0) actionpack (= 5.0.0.1)
nio4r (~> 1.2) nio4r (~> 1.2)
websocket-driver (~> 0.6.1) websocket-driver (~> 0.6.1)
actionmailer (5.0.0) actionmailer (5.0.0.1)
actionpack (= 5.0.0) actionpack (= 5.0.0.1)
actionview (= 5.0.0) actionview (= 5.0.0.1)
activejob (= 5.0.0) activejob (= 5.0.0.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.0.0) actionpack (5.0.0.1)
actionview (= 5.0.0) actionview (= 5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
rack (~> 2.0) rack (~> 2.0)
rack-test (~> 0.6.3) rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.0) actionview (5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.0) activejob (5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.0.0) activemodel (5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
activerecord (5.0.0) activerecord (5.0.0.1)
activemodel (= 5.0.0) activemodel (= 5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
arel (~> 7.0) arel (~> 7.0)
activesupport (5.0.0) activesupport (5.0.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0) addressable (2.4.0)
ansi (1.5.0) ansi (1.5.0)
arel (7.1.0) arel (7.1.1)
ast (2.3.0) ast (2.3.0)
awesome_print (1.7.0) awesome_print (1.7.0)
bcrypt (3.1.11) bcrypt (3.1.11)
@ -75,7 +75,7 @@ GEM
thor (~> 0.14) thor (~> 0.14)
formatador (0.2.5) formatador (0.2.5)
foundation_emails (2.2.0.0) foundation_emails (2.2.0.0)
globalid (0.3.6) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
guard (2.14.0) guard (2.14.0)
formatador (>= 0.2.4) formatador (>= 0.2.4)
@ -92,7 +92,7 @@ GEM
guard (~> 2.8) guard (~> 2.8)
guard-compat (~> 1.0) guard-compat (~> 1.0)
multi_json (~> 1.8) multi_json (~> 1.8)
guard-minitest (2.4.5) guard-minitest (2.4.6)
guard-compat (~> 1.2) guard-compat (~> 1.2)
minitest (>= 3.0) minitest (>= 3.0)
guard-rubocop (1.2.0) guard-rubocop (1.2.0)
@ -111,7 +111,7 @@ GEM
jbuilder (2.6.0) jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1) activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (4.1.1) jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
@ -135,7 +135,7 @@ GEM
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.9.0) minitest (5.9.0)
minitest-reporters (1.1.10) minitest-reporters (1.1.11)
ansi ansi
builder builder
minitest (>= 5.0) minitest (>= 5.0)
@ -151,7 +151,7 @@ GEM
nokogiri (1.6.8) nokogiri (1.6.8)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7) pkg-config (~> 1.1.7)
notiffany (0.1.0) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
parser (2.3.1.2) parser (2.3.1.2)
@ -179,17 +179,17 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (5.0.0) rails (5.0.0.1)
actioncable (= 5.0.0) actioncable (= 5.0.0.1)
actionmailer (= 5.0.0) actionmailer (= 5.0.0.1)
actionpack (= 5.0.0) actionpack (= 5.0.0.1)
actionview (= 5.0.0) actionview (= 5.0.0.1)
activejob (= 5.0.0) activejob (= 5.0.0.1)
activemodel (= 5.0.0) activemodel (= 5.0.0.1)
activerecord (= 5.0.0) activerecord (= 5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0) railties (= 5.0.0.1)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.1) rails-controller-testing (1.0.1)
actionpack (~> 5.x) actionpack (~> 5.x)
@ -198,16 +198,16 @@ GEM
rails-dom-testing (2.0.1) rails-dom-testing (2.0.1)
activesupport (>= 4.2.0, < 6.0) activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-erd (1.4.7) rails-erd (1.5.0)
activerecord (>= 3.2) activerecord (>= 3.2)
activesupport (>= 3.2) activesupport (>= 3.2)
choice (~> 0.2.0) choice (~> 0.2.0)
ruby-graphviz (~> 1.2) ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
railties (5.0.0) railties (5.0.0.1)
actionpack (= 5.0.0) actionpack (= 5.0.0.1)
activesupport (= 5.0.0) activesupport (= 5.0.0.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
@ -228,7 +228,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-graphviz (1.2.2) ruby-graphviz (1.2.2)
ruby-progressbar (1.8.1) ruby-progressbar (1.8.1)
ruby_dep (1.3.1) ruby_dep (1.4.0)
sass (3.4.22) sass (3.4.22)
sass-rails (5.0.6) sass-rails (5.0.6)
railties (>= 4.0.0, < 6) railties (>= 4.0.0, < 6)
@ -258,12 +258,12 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.5) tilt (2.0.5)
turbolinks (5.0.0) turbolinks (5.0.1)
turbolinks-source (~> 5) turbolinks-source (~> 5)
turbolinks-source (5.0.0) turbolinks-source (5.0.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.0.0) uglifier (3.0.2)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
@ -308,7 +308,7 @@ DEPENDENCIES
pry-rails pry-rails
puma (~> 3.0) puma (~> 3.0)
rack-livereload rack-livereload
rails (~> 5.0.0) rails (~> 5.0, >= 5.0.0.1)
rails-controller-testing rails-controller-testing
rails-erd rails-erd
rubocop (~> 0.42.0) rubocop (~> 0.42.0)

2
Guardfile
View File

@ -29,7 +29,7 @@ guard 'livereload' do
end end
end end
guard :minitest, spring: true, all_after_pass: true, all_on_start: false do guard :minitest, spring: true, all_after_pass: true do
watch(%r{^test/test_helper\.rb$}) { 'test' } watch(%r{^test/test_helper\.rb$}) { 'test' }
watch(%r{^test/(.*)\/?(.*)_test\.rb$}) watch(%r{^test/(.*)\/?(.*)_test\.rb$})