From 3d4f5c6917eda852520cfae4090880a4d577f7a5 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 13 Nov 2017 21:47:17 +1300 Subject: [PATCH 1/6] upgrade leaflet-rails --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 824b6ca9f..7d3ce2a58 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'csv_shaper' # CSV export gem 'figaro' # for handling config via ENV variables gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions gem 'leaflet-markercluster-rails' -gem 'leaflet-rails', '~> 0.7.7' # Newer versions break tests - see https://travis-ci.org/CloCkWeRX/growstuff/builds/200984350 +gem 'leaflet-rails' gem 'pg' gem 'ruby-units' # for unit conversion gem 'unicorn' # http server diff --git a/Gemfile.lock b/Gemfile.lock index 5f8bcf612..e573d4114 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,7 +296,8 @@ GEM addressable (~> 2.3) leaflet-markercluster-rails (0.7.0) railties (>= 3.1) - leaflet-rails (0.7.7) + leaflet-rails (1.2.0) + rails (>= 4.2.0) letter_opener (1.4.1) launchy (~> 2.2) listen (3.1.5) @@ -592,7 +593,7 @@ DEPENDENCIES js-routes kaminari leaflet-markercluster-rails - leaflet-rails (~> 0.7.7) + leaflet-rails letter_opener memcachier newrelic_rpm @@ -625,9 +626,8 @@ DEPENDENCIES will_paginate xmlrpc - RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.15.4 + 1.16.0 From e489831241c92ed905123441a1406b7d13309a56 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 13 Nov 2017 22:11:01 +1300 Subject: [PATCH 2/6] Debugging phantom on travis --- .travis.yml | 1 + script/install_phantomjs | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef68fec4f..d3bd22cab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: before_install: - ./script/install_phantomjs; - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH + - which phantomjs # Force Travis to use Elastic Search 2.4.0 - > if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then diff --git a/script/install_phantomjs b/script/install_phantomjs index b6e8defb6..551a46bb6 100755 --- a/script/install_phantomjs +++ b/script/install_phantomjs @@ -1,10 +1,16 @@ #!/bin/bash +set -v + if [ "$(phantomjs --version)" != '2.1.1' ]; then PHANTOM_URL="https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2" rm -rf "$PWD/travis_phantomjs" mkdir -p "$PWD/travis_phantomjs" - wget "$PHANTOM_URL" -O "$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2" - tar -xvf "$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs" + cd "$PWD/travis_phantomjs" + wget "$PHANTOM_URL" + ls -l + tar -vjxf phantomjs-2.1.1-linux-x86_64.tar.bz2 + find fi +which phantomjs phantomjs --version \ No newline at end of file From c154a9b845fe876dd902e77d082859608ea1c2f5 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 25 Nov 2017 19:34:05 +1300 Subject: [PATCH 3/6] Upgraded leaflet maskercluster --- Gemfile | 5 ++++- Gemfile.lock | 8 +++++--- app/assets/stylesheets/application.sass | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e711de8ca..af2f2ebc8 100644 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,11 @@ gem 'cancancan' # for checking member privileges gem 'csv_shaper' # CSV export gem 'figaro' # for handling config via ENV variables gem 'gibbon', '~>1.2.0' # for Mailchimp newsletter subscriptions -gem 'leaflet-markercluster-rails' + +# Maps gem 'leaflet-rails' +gem 'rails-assets-leaflet.markercluster', source: 'https://rails-assets.org' + gem 'pg' gem 'ruby-units' # for unit conversion gem 'unicorn' # http server diff --git a/Gemfile.lock b/Gemfile.lock index ac07b2c14..b79e44706 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,6 @@ GEM remote: https://rubygems.org/ + remote: https://rails-assets.org/ specs: actionmailer (4.2.10) actionpack (= 4.2.10) @@ -298,8 +299,6 @@ GEM kramdown (1.15.0) launchy (2.4.3) addressable (~> 2.3) - leaflet-markercluster-rails (0.7.0) - railties (>= 3.1) leaflet-rails (1.2.0) rails (>= 4.2.0) letter_opener (1.4.1) @@ -401,6 +400,9 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.10) sprockets-rails + rails-assets-leaflet (1.2.0) + rails-assets-leaflet.markercluster (1.2.0) + rails-assets-leaflet (>= 1.0.3) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.8) @@ -597,7 +599,6 @@ DEPENDENCIES js-routes jsonapi-resources kaminari - leaflet-markercluster-rails leaflet-rails letter_opener memcachier @@ -612,6 +613,7 @@ DEPENDENCIES pry quiet_assets rails (~> 4.2.8) + rails-assets-leaflet.markercluster! rails_12factor rainbow (< 2.2.0) rake (>= 10.0.0) diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index a386feb29..ae07e7516 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -2,7 +2,6 @@ @import 'bootstrap-datepicker' @import 'leaflet' @import 'leaflet.markercluster' -@import 'leaflet.markercluster.default' @import 'custom_bootstrap/custom_bootstrap' @import 'overrides' @import 'graphs' From 49aa6bb846632e8d28eeb801d499e0f5a0eba987 Mon Sep 17 00:00:00 2001 From: Shiny Date: Sat, 25 Nov 2017 19:41:03 +1300 Subject: [PATCH 4/6] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3bd22cab..ef68fec4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: before_install: - ./script/install_phantomjs; - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - - which phantomjs # Force Travis to use Elastic Search 2.4.0 - > if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then From dae3ea2789deee6de80d60bdad1e4388dce3376a Mon Sep 17 00:00:00 2001 From: Shiny Date: Sat, 25 Nov 2017 19:41:41 +1300 Subject: [PATCH 5/6] removed some debug --- script/install_phantomjs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/script/install_phantomjs b/script/install_phantomjs index 551a46bb6..b633ea9cd 100755 --- a/script/install_phantomjs +++ b/script/install_phantomjs @@ -7,10 +7,8 @@ if [ "$(phantomjs --version)" != '2.1.1' ]; then mkdir -p "$PWD/travis_phantomjs" cd "$PWD/travis_phantomjs" wget "$PHANTOM_URL" - ls -l tar -vjxf phantomjs-2.1.1-linux-x86_64.tar.bz2 - find fi which phantomjs -phantomjs --version \ No newline at end of file +phantomjs --version From 811011419e46e0d46072e77d83528dc1f134b87e Mon Sep 17 00:00:00 2001 From: Shiny Date: Sun, 26 Nov 2017 09:39:43 +1300 Subject: [PATCH 6/6] Exit if we can't cd --- script/install_phantomjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install_phantomjs b/script/install_phantomjs index b633ea9cd..c31b5408b 100755 --- a/script/install_phantomjs +++ b/script/install_phantomjs @@ -5,7 +5,7 @@ if [ "$(phantomjs --version)" != '2.1.1' ]; then PHANTOM_URL="https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2" rm -rf "$PWD/travis_phantomjs" mkdir -p "$PWD/travis_phantomjs" - cd "$PWD/travis_phantomjs" + cd "$PWD/travis_phantomjs" || exit 1 wget "$PHANTOM_URL" tar -vjxf phantomjs-2.1.1-linux-x86_64.tar.bz2 fi