Merge pull request #158 from CDLUC3/development

Upgrade to latest DMPRoadmap release

.github/workflows/brakeman.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Will run Brakeman checks on dependencies
     #   https://github.com/marketplace/actions/brakeman-linter

.github/workflows/eslint.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Will run ES Lint checks on javascript files
     #   https://github.com/marketplace/actions/run-eslint

.github/workflows/mysql.yml

@@ -10,11 +10,10 @@ jobs:
       DB_ADAPTER: mysql2
       MYSQL_PWD: root
       RAILS_ENV: test
-      WICKED_PDF_PATH: vendor/bundle/bin/wkhtmltopdf
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
 
@@ -74,11 +73,25 @@ jobs:
           ${{ runner.os }}-yarn-
           ${{ runner.os }}-
 
+    # Figure out where wkhtmltopdf is installed
+    - name: 'Determine wkhtmltopdf location'
+      run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
+
+    # Startup MySQL
+    - name: 'Start MySQL'
+      run: sudo systemctl start mysql
+
+
+
     # Install the JS dependencies
     - name: 'Yarn Install'
       run: |
         yarn install
 
+    # Figure out where wkhtmltopdf is installed
+    - name: 'Determine wkhtmltopdf location'
+      run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
+
     # Setup the database
     - name: 'Setup Test DB'
       run: bundle exec rake db:setup RAILS_ENV=test

.github/workflows/postgres.yml

@@ -9,7 +9,13 @@ jobs:
     services:
       # Postgres installation
       db:
-        image: postgres:11
+        image: postgres
+        env:
+          # Latest version of Postgres has increased security. We can use the default
+          # user/password in this testing scenario though so use the following env
+          # variable to bypass this changes:
+          # https://github.com/docker-library/postgres/issues/681
+          POSTGRES_HOST_AUTH_METHOD: trust
         ports: ['5432:5432']
         options: >-
           --health-cmd pg_isready
@@ -20,11 +26,10 @@ jobs:
     env:
       RAILS_ENV: test
       DATABASE_URL: postgres://postgres:@localhost:5432/roadmap_test
-      WICKED_PDF_PATH: vendor/bundle/bin/wkhtmltopdf
 
     steps:
     # Checkout the repo
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 1
 
@@ -38,6 +43,7 @@ jobs:
     - name: 'Determine Ruby Version'
       run: echo ::set-env name=RUBY_VERSION::$(echo `cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`)
 
+
     # Install Ruby - using the version found in the Gemfile.lock
     - name: 'Install Ruby'
       uses: actions/setup-ruby@v1
@@ -84,6 +90,10 @@ jobs:
           ${{ runner.os }}-yarn-
           ${{ runner.os }}-
 
+    # Figure out where wkhtmltopdf is installed
+    - name: 'Determine wkhtmltopdf location'
+      run: echo ::set-env name=WICKED_PDF_PATH::$(echo `bundle exec which wkhtmltopdf`)
+
     # Install the JS dependencies
     - name: 'Yarn Install'
       run: |

.github/workflows/rubocop.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     # Extract the Ruby version from the Gemfile.lock
 #    - name: 'Determine Ruby Version'
@@ -31,4 +31,4 @@ jobs:
 #         additional-gems: 'rubocop-dmp_roadmap'
 
     - name: 'Placeholder for Rubocop'
-      run: echo "Rubocop has been temporarily disabled"
+      run: echo "Rubocop has been temporarily disabled"

.gitignore

@@ -1,6 +1,9 @@
 # Ignore rbenv files
 .ruby-version
 
+# Version file generated by Capistrano
+.version
+
 # Ignore bundler config
 /.bundle
 

Gemfile

@@ -172,9 +172,6 @@ gem 'wicked_pdf', '~> 1.1.0'
 # This simple gem allows you to create MS Word docx documents from simple html documents. This makes it easy to create dynamic reports and forms that can be downloaded by your users as simple MS Word docx files. (http://github.com/karnov/htmltoword)
 gem 'htmltoword', '1.1.0'
 
-# A feed fetching and parsing library (http://feedjira.com)
-gem 'feedjira'
-
 # Filename sanitization for Ruby. This is useful when you generate filenames for downloads from user input
 gem 'zaru'
 
@@ -204,6 +201,9 @@ gem "dotenv-rails"
 
 gem 'activerecord-session_store'
 
+# -------------------------------------------------
+# UTILITIES
+gem 'parallel'
 
 # ------------------------------------------------
 # ENVIRONMENT SPECIFIC DEPENDENCIES