Merge pull request #309 from unepwcmc/release-3.0.0

Release 3.0.0

.dockerignore

@@ -0,0 +1,6 @@
+.git*
+log/*
+tmp/*
+Dockerfile
+README.md
+.env*

.gitignore

@@ -21,6 +21,12 @@ dump.rdb
 /public/assets
 .env
 
-/vendor/assets/bower_components
 coverage
 node_modules
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+tmp/cache/webpacker

.ruby-version

@@ -1 +1 @@
-2.1.2
+2.6.3

.travis.yml

@@ -23,12 +23,26 @@ before_install:
   - psql -c 'create database pp_test_backup' -U postgres
   - psql -c 'CREATE EXTENSION postgis;' -U postgres -d pp_test
   - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d pp_test
+  - curl -s -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.0.1-amd64.deb
+  - sudo dpkg -i --force-confnew elasticsearch-7.0.1-amd64.deb
+  - sudo sed -i.old 's/-Xms1g/-Xms128m/' /etc/elasticsearch/jvm.options
+  - sudo sed -i.old 's/-Xmx1g/-Xmx128m/' /etc/elasticsearch/jvm.options
+  - echo -e '-XX:+DisableExplicitGC\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dlog4j.skipJansi=true\n-server\n' | sudo tee -a /etc/elasticsearch/jvm.options
+  - sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
+  - sudo service elasticsearch start
+install:
+  - nvm install node
+  - node -v
+  - npm i -g yarn
+  - yarn
+  - bundle install
 bundler_args: --without development production staging --jobs=6
 rvm:
-  - 2.1.2
+  - 2.6.3
 before_script:
+  - sleep 10
   - cp .env.example .env
-  - RAILS_ENV=test bundle exec rake db:migrate
+  - RAILS_ENV=test bundle exec rake db:drop db:create db:migrate
 notifications:
   email:
     - [email protected]
@@ -45,4 +59,3 @@ addons:
   postgresql: 9.3
 services:
   - redis-server
-  - elasticsearch

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 3.0.0
+
+* Upgrade to Rails 5.0.5
+* Add webpacker 4.0.2
+* Remove dependency on the protectedplanet-frontend repo and move styles in asset folder
+* Add docker for local development
+
 ### 2.6.1
 
 * Add country, pame_country and marine stats (WDPA September 2019 release).

Capfile

@@ -1,11 +1,24 @@
-require 'dotenv'
-Dotenv.load
-
 # Load DSL and set up stages
-require 'capistrano/setup'
+require "capistrano/setup"
 
 # Include default deployment tasks
-require 'capistrano/deploy'
+require "capistrano/deploy"
+
+# Load the SCM plugin appropriate to your project:
+#
+# require "capistrano/scm/hg"
+# install_plugin Capistrano::SCM::Hg
+# or
+# require "capistrano/scm/svn"
+# install_plugin Capistrano::SCM::Svn
+# or
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
+
+
+require "capistrano/scm/git-with-submodules"
+install_plugin Capistrano::SCM::Git::WithSubmodules
+
 
 # Include tasks from other gems included in your Gemfile
 #
@@ -18,16 +31,24 @@ require 'capistrano/deploy'
 #   https://github.com/capistrano/rails
 #   https://github.com/capistrano/passenger
 #
-require 'capistrano/rvm'
-# require 'capistrano/rbenv'
-# require 'capistrano/chruby'
-require 'capistrano/bundler'
-require 'capistrano/rails/assets'
-require 'capistrano/rails/migrations'
-require 'capistrano/passenger'
-require "whenever/capistrano"
-require 'capistrano/sidekiq'
+require "capistrano/rvm"
+# require "capistrano/rbenv"
+# require "capistrano/chruby"
+require "capistrano/bundler"
+require "capistrano/rails/assets"
+require "capistrano/rails/migrations"
+require "capistrano/passenger"
 require 'capistrano/maintenance'
+require 'whenever/capistrano'
+require 'capistrano/sidekiq'
+
+
+
+
+
+
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
+# Load environment variables
+
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Dockerfile

@@ -0,0 +1,19 @@
+FROM unepwcmc/unepwcmc-geospatial-base:20190809
+LABEL maintainer="[email protected]"
+
+USER unepwcmc
+
+WORKDIR /ProtectedPlanet
+ADD Gemfile /ProtectedPlanet/Gemfile
+ADD Gemfile.lock /ProtectedPlanet/Gemfile.lock
+ADD package.json /ProtectedPlanet/package.json
+ADD docker/scripts /ProtectedPlanet/docker/scripts
+
+COPY --chown=unepwcmc:unepwcmc . /ProtectedPlanet
+
+RUN /bin/bash -l -c "bundle install"
+RUN /bin/bash -l -c "yarn install"
+
+EXPOSE 3000
+
+CMD ["rails", "server", "-b", "0.0.0.0"]

Gemfile

@@ -1,73 +1,89 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.5.1'
+gem 'rails', '5.0.5'
+gem 'webpacker', '~> 4.0.2'
 
-gem 'pg'
-gem 'activerecord-postgis-adapter', '~> 3.1.0'
-gem 'gdal', '~> 0.0.5'
+gem 'pg', '~> 0.21'
+gem 'activerecord-postgis-adapter', '~> 4.0.0'
 gem 'dbf', '~> 2.0.7'
-gem 'rb-readline'
+#
+gem 'elasticsearch', '~> 7.2.0'
+#
+gem 'sass-rails', '~> 5.0.7'
+gem 'sprockets-rails', '~> 3.2.1'
 
-gem 'elasticsearch', '~> 5.0.3'
-
-gem 'bower-rails', '~> 0.10.0'
-gem 'sass-rails', '~> 5.0.4'
-gem 'sprockets-rails', '~> 2.3.3'
 gem 'uglifier', '~> 2.7.2'
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.2.2'
 gem "autoprefixer-rails"
-gem "exception_notification", '~> 4.1.4'
+gem "exception_notification", '~> 4.3.0'
 gem "slack-notifier", "~> 1.5.1"
-
-gem 'jquery-rails', '~> 3.1.3'
+#
+gem 'jquery-rails', '~> 4.3.3'
 gem 'premailer-rails'
-
+# gem 'listen'
 gem 'levenshtein', '~> 0.2.2'
 
-gem 'vuejs-rails', '~> 2.3.2', github: 'adambutler/vuejs-rails'
+gem 'vuejs-rails', '~> 2.3.2'
 gem 'sprockets-vue', '~> 0.1.0'
 
+gem 'rails-controller-testing'
+gem 'gdal', '~> 2.0'
+#
 group :production, :staging do
 #  gem 'unicorn'
   gem 'dalli', '~> 2.7.2'
   gem 'rack-cache', '~> 1.2'
 end
-
+#
 group :development do
   gem 'spring'
-  gem 'capistrano', '~> 3.4', require: false
-  gem 'capistrano-rails',   '~> 1.1', require: false
-  gem 'capistrano-bundler', '~> 1.1.4', require: false
-  gem 'capistrano-rvm',   '~> 0.1', require: false
-  gem 'capistrano-sidekiq'
-  gem 'capistrano-maintenance', '~> 1.0', require: false
-  gem 'capistrano-passenger', '~> 0.2.0', require: false
-  gem 'byebug', '~> 3.1.2'
+  gem 'capistrano', '3.11.0', require: false
+  gem 'capistrano-rails',   '1.4.0', require: false
+  gem 'capistrano-bundler', '1.6.0', require: false
+  gem 'capistrano-rvm', '0.1.2', require: false
+  gem 'capistrano-maintenance','1.2.1', require: false
+  gem 'capistrano-passenger', '0.2.0', require: false
+  gem 'capistrano-sidekiq','1.0.2'
+  gem 'capistrano-git-with-submodules', '2.0.3'
+  # gem 'listen', '~> 3.1.5'
+  # gem 'spring-watcher-listen', '~> 2.0.0'
+  #
+  # gem 'web-console', '>= 3.3.0'
+  # gem 'listen', '>= 3.0.5', '< 3.2'
+  # gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :test do
   gem 'factory_girl_rails', '~> 4.4.1'
   gem 'mocha', '~> 1.0.0'
-  gem 'webmock', '~> 1.18.0', require: false
+  gem 'webmock', '~> 1.22.0', require: false
   gem 'timecop', '~> 0.7.1'
   gem 'capybara', '~> 2.3.0'
-  gem 'codeclimate-test-reporter', require: nil
+  # gem 'codeclimate-test-reporter', require: nil
+  gem 'simplecov', require: false, group: :test
+  # gem 'simplecov-console'
   gem 'selenium-webdriver'
+  gem 'database_cleaner'
 end
 
 group :test, :development do
-  gem 'konacha'
+  #gem 'konacha' - TODO - NOT COMPATIBLE WITH RAILS 5
   gem 'ejs'
+  # gem 'minitest', '5.10.3' # Explicit minitest version fixes test reporting errors
+  gem 'minitest', '~> 5.10', '!= 5.10.2'
+  gem 'byebug', '~> 9.0', '>= 9.0.5'
+
 end
 
+
 gem 'will_paginate', '~> 3.0'
 
-gem 'aws-sdk', '~> 1.3.9'
+gem 'aws-sdk', '3.0.1' # DRAMATIC CHANGES
 
-gem 'httparty', '~> 0.13.1'
+gem 'httparty', '~> 0.15.1' # FROM 13 to 15 BREAKING CHANGES
 gem 'httmultiparty', '~> 0.3.14'
 
-gem 'sidekiq', '~> 3.5.3'
+gem 'sidekiq', '~> 5.2.5' # DRAMATIC CHANGES
 gem 'sinatra', '>= 1.3.0', :require => nil
 gem 'whenever', require: false
 
@@ -77,13 +93,14 @@ gem 'system'
 gem 'dotenv', '~> 0.11.1'
 gem 'dotenv-deployment'
 
-gem 'best_in_place'
-gem 'turnout', '~> 2.0.0'
-gem 'bystander', github: 'unepwcmc/bystander'
+gem 'best_in_place', '~> 3.0.1'
+gem 'turnout', '~> 2.5.0'
+
+gem 'bystander', '2.0.0', git: 'https://github.com/unepwcmc/bystander'
 
-gem 'devise', '~> 3.5.2'
+gem 'devise', '~> 4.6.2' # MAJOR VERSION CHANGE, CHECK DOCS
 
-gem 'comfortable_mexican_sofa', '~> 1.12.8'
-gem 'nokogiri', '~> 1.6.7'
+gem 'comfortable_mexican_sofa', '1.12.10'
+gem 'nokogiri', '~> 1.10.1'
 gem 'tinymce-rails', '~> 4.3.2'
 gem 'phantompdf', '~> 1.2.2'