Merge pull request #470 from QutEcoacoustics/rails-6

Upgrades to Rails 6

.devcontainer/devcontainer.json

@@ -26,11 +26,10 @@
   // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
   // "shutdownAction": "none",
   // Uncomment the next line to run commands after the container is created - for example installing git.
-  "postCreateCommand": "/home/baw_web/baw-server/provision/dev_setup.sh",
+  "postCreateCommand": "/home/baw_web/baw-server/provision/entrypoint.sh",
   // Add the IDs of extensions you want installed when the container is created in the array below.
   "extensions": [
     "rebornix.ruby",
-    "bung87.rails",
     "misogi.ruby-rubocop",
     "castwide.solargraph",
     "bung87.vscode-gemfile",
@@ -40,5 +39,6 @@
     "connorshea.vscode-ruby-test-adapter",
     "knisterpeter.vscode-github",
     "castwide.ruby-debug",
+    "pavlitsky.yard"
   ]
 }

.gitignore

@@ -2,21 +2,8 @@
 /db/*.sqlite3
 /db/*.sqlite3-journal
 
-# ignore media folder
-/media/*
-
-# ignore custom rake import task
-/lib/tasks/import.rake
-/lib/tasks/sample_data.rake
-
-# ignore deploy files
-/config/deploy.rb
-/config/deploy/production.rb
-/config/deploy/staging.rb
-
 # ignore settings files (except default.yml)
-/config/settings/development.yml
-/config/settings/test.yml
+/config/settings/*.local.yml
 /config/settings/staging.yml
 /config/settings/production.yml
 

.rubocop.yml

@@ -5,21 +5,35 @@ AllCops:
   Include:
     - '**/Rakefile'
     - '**/config.ru'
+    - '**/*.rb'
   Exclude:
     - 'db/**/*'
     - 'config/**/*'
     - 'script/**/*'
   TargetRubyVersion: 2.6
-# Rails:
-#   Enabled: true
 
 # Customized options
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Layout/LineLength:
+  Max: 120
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
 Layout/EndOfLine:
   EnforcedStyle: lf
+# We sometimes leave commented out code in the code base
+Layout/LeadingCommentSpace:
+  Enabled: false
 Metrics/ClassLength:
   Max: 300
-Layout/EmptyLinesAroundBlockBody:
-  Enabled: false
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
 Metrics/BlockLength:
   ExcludedMethods:
     - resource
@@ -30,21 +44,43 @@ Metrics/BlockLength:
     - it
     - group
     - namespace
-Metrics/LineLength:
-  Max: 120
+    - draw
+    - setup
+    - configure
+    - draw
+    - define
+    - factory
 Metrics/MethodLength:
   Max: 30
   ExcludedMethods:
     - filter_settings
+Metrics/ModuleLength:
+  Max: 150
 Metrics/AbcSize:
   Max: 60
 Style/BlockDelimiters:
   EnforcedStyle: semantic
   AllowBracesOnProceduralOneLiners: true
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
-Layout/LeadingCommentSpace:
-  Enabled: false
+  IgnoredMethods:
+    - its
+Style/ExponentialNotation:
+  Enabled: true
+  EnforcedStyle: scientific
+Style/HashEachMethods:
+  Enabled: true
+  AutoCorrect: false
+Style/HashTransformKeys:
+  Enabled: true
+  AutoCorrect: false
+Style/HashTransformValues:
+  Enabled: true
+  AutoCorrect: false
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
 Style/SymbolArray:
   EnforcedStyle: brackets
 Style/WordArray:

Dockerfile

@@ -42,19 +42,27 @@ RUN apt-get update \
   && mkdir -p "$GEM_HOME/bin" \
   && chmod 777 "$GEM_HOME/bin"
 
+
 ENV RAILS_ENV=production \
   APP_USER=${app_user} \
   APP_NAME=${app_name} \
   # enable binstubs to take priority
-  PATH=./bin:$PATH
+  PATH=./bin:$PATH \
+  BUNDLE_PATH__SYSTEM="true"
+
 
 USER ${app_user}
 
+RUN \
+  # temporarily upgrade bundler until we can jump to ruby 2.7 
+  gem update --system \
+  && gem install bundler
+
 # change the working directory to the user's home directory
 WORKDIR /home/${app_user}/${app_name}
 
 # add base dependency files for bundle install (so we don't invalidate docker cache)
-COPY --chown=${app_user} Gemfile Gemfile.lock /home/${app_user}/${app_name}/
+COPY --chown=${app_user} Gemfile Gemfile.lock  /home/${app_user}/${app_name}/
 
 VOLUME [ "/data" ]
 
@@ -71,7 +79,7 @@ EXPOSE 3000
 # install deps
 RUN \
   # install baw-server
-  bundle install --system \
+  BAW_SKIP_LOCAL_GEMS=true bundle install \
   # install docs for dev work
   && solargraph download-core \
   && solargraph bundle
@@ -96,8 +104,9 @@ EXPOSE 80
 # install deps
 # skip installing gem documentation
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc" \
+  && bundle config set without development test \
   # install baw-server
-  && bundle install --system --without 'development' 'test'
+  && BAW_SKIP_LOCAL_GEMS=true bundle install
 
 # Add the Rails app
 COPY --chown=${app_user} ./ /home/${app_user}/${app_name}