From 3e43a19e58d4bb37707f99343fdd988e8bdec5f2 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:09:04 +1030 Subject: [PATCH 01/16] Update CONTRIBUTING.md Dead link, no archived version of it --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71e94bd6b..1197b826c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ Thanks for contributing to Growstuff! When you create a pull request, please include the following: * Mention the issue it solves (eg. #123) -* Your code should follow our [Coding style guide](http://wiki.growstuff.org/index.php/Coding_style_guide) +* Your code should follow our [Coding style guide](https://github.com/Growstuff/growstuff/wiki/Development-process-overview#coding-practices) * Make sure you have automated tests for your work, where possible. * Add your name (and that of your pair partner, if any) to [CONTRIBUTORS.md](CONTRIBUTORS.md). From 303fd8c24393c8d9f134967d62a0c5e488762bfb Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:20:09 +1030 Subject: [PATCH 02/16] Update autoprefixer-rails --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 425491475..31d0b316b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM public_suffix (~> 2.0, >= 2.0.2) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.4.0.2) + autoprefixer-rails (6.5.3.1) execjs bcrypt (3.1.11) better_errors (2.1.1) From 59ec36320b6e17cd626b7934a46099cf5c9f5b0c Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:20:47 +1030 Subject: [PATCH 03/16] Update codeclimate-test-reporter --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 31d0b316b..63a5bcbea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,8 +95,8 @@ GEM cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.3) + simplecov codemirror-rails (5.16.0) railties (>= 3.0, < 6.0) coderay (1.1.1) From aaaca81d496c5e7f9a28c8c2b969fb4f856f33cd Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:21:31 +1030 Subject: [PATCH 04/16] Update hashie --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 63a5bcbea..4672d6f9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -216,7 +216,7 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.4.4) + hashie (3.4.6) heroku-api (0.4.2) excon (~> 0.45) multi_json (~> 1.8) From d99f24c02c25d9c0caa700a8cbb306cb9727d0f4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:22:32 +1030 Subject: [PATCH 05/16] Update coffee-script-source --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4672d6f9e..9034c1ed3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.11.1) comfortable_mexican_sofa (1.12.9) active_link_to (>= 1.0.0) bootstrap-sass (>= 3.2.0) From 18ab47eed37a3e0f6be03806bfb84a7062bd78f4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:23:24 +1030 Subject: [PATCH 06/16] Update thor --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9034c1ed3..23a548cf1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,7 +461,7 @@ GEM tins (~> 1.0) terminal-table (1.7.3) unicode-display_width (~> 1.1.1) - thor (0.19.3) + thor (0.19.4) thread (0.2.2) thread_safe (0.3.5) tilt (2.0.5) From 817c1ec5ce76f9867b30a3d682b78395fce835b5 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:24:18 +1030 Subject: [PATCH 07/16] Update will_paginate --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 23a548cf1..7d975ec4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -486,7 +486,7 @@ GEM websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - will_paginate (3.1.0) + will_paginate (3.1.5) xpath (2.0.0) nokogiri (~> 1.3) From f7ca706e0bd4c460898c01ff84ba1f0cf33a86d8 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:25:08 +1030 Subject: [PATCH 08/16] Update omniauth-facebook (not as scary as it sounds - https://github.com/mkdynamic/omniauth-facebook/blob/master/CHANGELOG.md) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d975ec4c..c96a75e8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM mini_portile2 (2.1.0) minitest (5.9.1) multi_json (1.11.3) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) newrelic_rpm (3.17.1.326) @@ -299,7 +299,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-flickr (0.0.19) multi_json (~> 1.11.0) From c9127dbf1e7247f3e733cf403970e295c8c9d890 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:46:22 +1030 Subject: [PATCH 09/16] Update rake and rubocop --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c96a75e8b..00b5dd780 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,7 +320,7 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parser (2.3.2.0) + parser (2.3.3.1) ast (~> 2.2) pg (0.19.0) plupload-rails (1.2.1) @@ -376,7 +376,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.17.0) - rake (11.3.0) + rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -408,7 +408,7 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.45.0) + rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) From 1982dc76be4fd5717103e05cb2afb712b444b852 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:51:13 +1030 Subject: [PATCH 10/16] Pin to elasticsearch API 2.0 for now --- Gemfile | 5 +++++ Gemfile.lock | 1 + 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index a91ccba45..6033dbb24 100644 --- a/Gemfile +++ b/Gemfile @@ -71,6 +71,11 @@ gem 'omniauth-facebook' # client for Elasticsearch. Elasticsearch is a flexible # and powerful, distributed, real-time search and analytics engine. # An example of the use in the project is fuzzy crop search. + +# Project does not use semver, so we want to be in sync with the version of +# elasticsearch we use +# See https://github.com/elastic/elasticsearch-ruby#compatibility +gem "elasticsearch-api", "~> 2.0.0" gem "elasticsearch-model" gem "elasticsearch-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 00b5dd780..32ccd887e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -518,6 +518,7 @@ DEPENDENCIES dalli database_cleaner (~> 1.5.0) devise (>= 4.0.0) + elasticsearch-api (~> 2.0.0) elasticsearch-model elasticsearch-rails factory_girl_rails From d3d3731fa319dee701568a354267d2e509efa424 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 10:52:01 +1030 Subject: [PATCH 11/16] Update minitest --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 32ccd887e..6d8716ff4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_portile2 (2.1.0) - minitest (5.9.1) + minitest (5.10.1) multi_json (1.11.3) multi_xml (0.6.0) multipart-post (2.0.0) From 5235b11905f3fa1d94ded24fd353237ff36484f9 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 11:17:54 +1030 Subject: [PATCH 12/16] Disable Style/EmptyMethod for now --- .rubocop.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 43f27ddf4..06f48aefc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -75,4 +75,7 @@ Style/FrozenStringLiteralComment: Rails/Output: Exclude: - 'config/unicorn.rb' - - 'db/seeds.rb' \ No newline at end of file + - 'db/seeds.rb' + +Style/EmptyMethod: + Enabled: false \ No newline at end of file From be572b9a539f22f54a864b6aed221465ae938b33 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 9 Dec 2016 11:25:03 +1030 Subject: [PATCH 13/16] Upgrade --- spec/spec_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7b314e901..ee8556548 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,8 +14,8 @@ # users commonly want. # # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration -require "codeclimate-test-reporter" -CodeClimate::TestReporter.start +require 'simplecov' +SimpleCov.start RSpec.configure do |config| # rspec-expectations config goes here. You can use an alternate # assertion/expectation library such as wrong or the stdlib/minitest From 6ff3fa21e17b32f94fd6270731fc20ebf41b49c4 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 12 Dec 2016 10:37:26 +1030 Subject: [PATCH 14/16] Revert "Disable Style/EmptyMethod for now" This reverts commit 5235b11905f3fa1d94ded24fd353237ff36484f9. --- .rubocop.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 06f48aefc..43f27ddf4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -75,7 +75,4 @@ Style/FrozenStringLiteralComment: Rails/Output: Exclude: - 'config/unicorn.rb' - - 'db/seeds.rb' - -Style/EmptyMethod: - Enabled: false \ No newline at end of file + - 'db/seeds.rb' \ No newline at end of file From 74657abec053fa39841971e3ecc1ed96ec6823b0 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 12 Dec 2016 10:37:45 +1030 Subject: [PATCH 15/16] Revert "Update rake and rubocop" This reverts commit c9127dbf1e7247f3e733cf403970e295c8c9d890. --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6d8716ff4..4307429cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,7 +320,7 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parser (2.3.3.1) + parser (2.3.2.0) ast (~> 2.2) pg (0.19.0) plupload-rails (1.2.1) @@ -376,7 +376,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.17.0) - rake (12.0.0) + rake (11.3.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) @@ -408,7 +408,7 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.46.0) + rubocop (0.45.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) From feff2cdfd43b796b2356dbc9d5fe60bbdd27be40 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Mon, 12 Dec 2016 10:38:31 +1030 Subject: [PATCH 16/16] Upgrade rake only --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4307429cf..ae037027d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -376,7 +376,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.17.0) - rake (11.3.0) + rake (12.0.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0)