From 76369f33c5e96fc499b10356ccbb68f071b58eee Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 19 Jun 2016 06:04:32 +0200 Subject: [PATCH 1/4] Remove pry-debundle --- Gemfile | 1 - Gemfile.lock | 3 --- 2 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8da1679e4..05461b91a 100644 --- a/Gemfile +++ b/Gemfile @@ -242,7 +242,6 @@ group :development do # Debugging gem "pry" - gem "pry-debundle" gem "pry-byebug" # test coverage diff --git a/Gemfile.lock b/Gemfile.lock index 0387ef669..889d80521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -531,8 +531,6 @@ GEM pry-byebug (3.4.0) byebug (~> 9.0) pry (~> 0.10) - pry-debundle (0.8) - pry quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.4) @@ -863,7 +861,6 @@ DEPENDENCIES open_graph_reader (= 0.6.1) pry pry-byebug - pry-debundle quiet_assets (= 1.1.0) rack-cors (= 0.4.0) rack-google-analytics (= 1.2.0) From e0f31fb350dae3e6d0338a5d4e5b47763bfe3112 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 19 Jun 2016 06:09:18 +0200 Subject: [PATCH 2/4] Remove jshint guard config --- Guardfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Guardfile b/Guardfile index ec3eade0c..df294bb7f 100644 --- a/Guardfile +++ b/Guardfile @@ -37,9 +37,3 @@ guard :rubocop, all_on_start: false, keep_failed: false do watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/) watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/) end - -guard :jshintrb do - watch(/^app\/assets\/javascripts\/.+\.js$/) - watch(/^lib\/assets\/javascripts\/.+\.js$/) - watch(/^spec\/javascripts\/.+\.js$/) -end From 2b1942a9b31037d596bba97780bf7d4f2c9091aa Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 19 Jun 2016 06:11:56 +0200 Subject: [PATCH 3/4] Remove deprecated guard-cucumber arguments --- Guardfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Guardfile b/Guardfile index df294bb7f..a06f2dc33 100644 --- a/Guardfile +++ b/Guardfile @@ -22,8 +22,7 @@ guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: fals end guard(:cucumber, - command_prefix: "bin/spring", - bundler: false, + cmd: "bin/spring cucumber", all_on_start: false, all_after_pass: false) do watch(/^features\/.+\.feature$/) From 3ae3bfe5203caca5a804ca866b7e4dfdbd0486f4 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 19 Jun 2016 06:13:49 +0200 Subject: [PATCH 4/4] Don't require guard-* gems --- Gemfile | 8 ++++---- Gemfile.lock | 15 +++++---------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 05461b91a..ed3b8ea1d 100644 --- a/Gemfile +++ b/Gemfile @@ -222,11 +222,11 @@ end group :development do # Automatic test runs - gem "guard-cucumber", "2.1.2" - gem "guard-jshintrb", "1.1.1" - gem "guard-rspec", "4.7.2", require: false - gem "guard-rubocop", "1.2.0" gem "guard", "2.14.0", require: false + gem "listen", "~> 3.0.0", require: false + gem "guard-cucumber", "2.1.2", require: false + gem "guard-rspec", "4.7.2", require: false + gem "guard-rubocop", "1.2.0", require: false gem "rb-fsevent", "0.9.7", require: false gem "rb-inotify", "0.9.7", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 889d80521..1ab4062e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,9 +370,6 @@ GEM cucumber (~> 2.0) guard-compat (~> 1.0) nenv (~> 0.1) - guard-jshintrb (1.1.1) - guard (~> 2.0) - jshintrb guard-rspec (4.7.2) guard (~> 2.1) guard-compat (~> 1.1) @@ -442,10 +439,9 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - listen (3.1.5) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (>= 0.9) - ruby_dep (~> 1.2) + rb-inotify (~> 0.9, >= 0.9.7) little-plugger (1.1.4) logging (2.1.0) little-plugger (~> 1.1) @@ -478,7 +474,6 @@ GEM multi_test (0.1.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.4.4) naught (1.1.0) nenv (0.3.0) nested_form (0.3.2) @@ -521,6 +516,7 @@ GEM orm_adapter (0.5.0) parser (2.3.1.2) ast (~> 2.2) + pg (0.18.4) phantomjs (2.1.1.0) pkg-config (1.1.7) powerpack (0.1.1) @@ -680,7 +676,6 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-oembed (0.10.1) ruby-progressbar (1.8.1) - ruby_dep (1.3.1) rubyzip (1.2.0) safe_yaml (1.0.4) sass (3.4.22) @@ -829,7 +824,6 @@ DEPENDENCIES gon (= 6.0.1) guard (= 2.14.0) guard-cucumber (= 2.1.2) - guard-jshintrb (= 1.1.1) guard-rspec (= 4.7.2) guard-rubocop (= 1.2.0) haml (= 4.0.7) @@ -845,13 +839,13 @@ DEPENDENCIES jshintrb (= 0.3.0) json (= 1.8.3) json-schema (= 2.6.2) + listen (~> 3.0.0) logging-rails (= 0.5.0) markerb (= 1.1.0) messagebus_ruby_api (= 1.0.3) mini_magick (= 4.5.1) minitest mobile-fu (= 1.3.1) - mysql2 (= 0.4.4) nokogiri (= 1.6.8) omniauth (= 1.3.1) omniauth-facebook (= 3.0.0) @@ -859,6 +853,7 @@ DEPENDENCIES omniauth-twitter (= 1.2.1) omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.6.1) + pg (= 0.18.4) pry pry-byebug quiet_assets (= 1.1.0)