Fix deploy job and put into workflow

Add .circleci/config.yml

.circleci/config.yml

@@ -1,10 +1,39 @@
 version: 2
+workflows: # Define a Workflow running the build job, then the deploy job
+  version: 2
+  build-deploy:
+    jobs:
+      - build
+      - deploy:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master # Only deploys when the commit is on the Master branch
 jobs:
  build:
    machine: true
    steps:
      - checkout
-     # start proprietary DB using private Docker image
-     # with credentials stored in the UI
      - run: |
-         bash bin/run-tests-with-docker.sh
+         bash bin/run-tests-with-docker.sh
+         
+ # https://github.com/circleci/circleci-docs/blob/master/jekyll/_cci1/continuous-deployment-with-heroku.md
+ deploy:
+   machine: true
+   steps:
+     - checkout
+     - run: |
+         cat >~/.netrc <<EOF
+         machine api.heroku.com
+           login $HEROKU_EMAIL
+           password $HEROKU_TOKEN
+         machine git.heroku.com
+           login $HEROKU_EMAIL
+           password $HEROKU_TOKEN
+         EOF
+         chmod 600 ~/.netrc # Heroku cli complains about permissions without this
+         heroku git:remote -a wrestlingapp
+         git push heroku master
+         sleep 20s
+         heroku run rake db:migrate --app wrestlingapp

.travis.yml

@@ -1,21 +0,0 @@
-sudo: required
-language: minimal
-services:
-- docker
-addons:
-  apt:
-    packages:
-    - docker-ce
-env:
-- DOCKER_COMPOSE_VERSION=1.22.0
-script:
-- bash bin/run-tests-with-docker.sh
-deploy:
-  provider: heroku
-  api_key:
-    secure: WQnMF1v9J8n3z+Icx1Sp2tcu5bsIDwuCRgmGSEyFEl0aI3KsFxCpNWKEhHougkBxYRi7XXW1TZGGwRYb5VNf5UVG4xqlgJE7vm4ri3PjU2x/bLJb6tJq+WNrXoJNzfeyRqwXpfOYJT6n3/ak7lsZrVY2zSIuNTdQQ1oVWk33x9KNyr1RS/XmygJDnsG8n7dnz4xUi57F2w3hORVF3Lm3a63F9hoBcZjZUeMHzLPPhG4yySkpBe1oWtFk58ZSyqCSpcpbiQSSCxHiMrlSJ6GDZjUFDe+GIkx/P8by+MP0qcS2dw1w5yPZvsAATe826xP+LmcZX7g2LHJbIDu+ZwisQDbWfhpShvIkgtnhG95fAF7pv+md6VsLf3cTggtOYKHXDGBTO2nHDDuol/W7ZZHiVT5Da52MFdkJ/4TTgzqWmnlDmmJT6nAZKgGp/dcnslUHscwM1nnhJZZqbxbg8tIZ3Q9+hLjh9vikO76ujkIaseJ+fGcpzTl5SvwW7NfINzJPkVZsPQb6tYNs01iKVfLJ8xNKvUswKe3G3nvrbfJahgySZ0+4xDEjQbbaa63RjyOw06DAcN3SgMj0o1w66NGdd1GzloggN0mdUfXkn+mjP3okYh7zgPY1n+ZJ88BQYJoScS790g30pqxR1Tj0uR3+TEd3Qmp7McfXKlMJiMXX2mI=
-  app: wrestlingapp
-  on:
-    repo: jcwimer/wrestlingApp
-    branch: master
-  run: rake db:migrate RAILS_ENV=production

Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-ruby '2.6.5'
+ruby '3.0.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.0.3.2'
+gem 'rails', '6.1.2'
 # Use sqlite3 as the database for Active Record
 #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development
 gem 'sqlite3', :group => :development

Gemfile.lock

@@ -1,71 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
+    actioncable (6.1.2)
+      actionpack (= 6.1.2)
+      activesupport (= 6.1.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionmailbox (6.1.2)
+      actionpack (= 6.1.2)
+      activejob (= 6.1.2)
+      activerecord (= 6.1.2)
+      activestorage (= 6.1.2)
+      activesupport (= 6.1.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
+    actionmailer (6.1.2)
+      actionpack (= 6.1.2)
+      actionview (= 6.1.2)
+      activejob (= 6.1.2)
+      activesupport (= 6.1.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.2)
+      actionview (= 6.1.2)
+      activesupport (= 6.1.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actiontext (6.1.2)
+      actionpack (= 6.1.2)
+      activerecord (= 6.1.2)
+      activestorage (= 6.1.2)
+      activesupport (= 6.1.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.1.2)
+      activesupport (= 6.1.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activejob (6.1.2)
+      activesupport (= 6.1.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
+    activemodel (6.1.2)
+      activesupport (= 6.1.2)
+    activerecord (6.1.2)
+      activemodel (= 6.1.2)
+      activesupport (= 6.1.2)
+    activestorage (6.1.2)
+      actionpack (= 6.1.2)
+      activejob (= 6.1.2)
+      activerecord (= 6.1.2)
+      activesupport (= 6.1.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.4.0)
-    ast (2.4.1)
-    backports (3.18.2)
+    ast (2.4.2)
+    backports (3.20.2)
     bcrypt (3.1.16)
-    brakeman (4.9.1)
+    brakeman (5.0.0)
     builder (3.2.4)
-    bullet (6.1.0)
+    bullet (6.1.3)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    cancancan (3.1.0)
+    cancancan (3.2.1)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -75,21 +79,21 @@ GEM
     coffee-script-source (1.12.2)
     commander (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
     daemons (1.3.1)
-    dalli (2.7.10)
-    delayed_job (4.1.8)
-      activesupport (>= 3.0, < 6.1)
-    delayed_job_active_record (4.1.4)
-      activerecord (>= 3.0, < 6.1)
+    dalli (2.7.11)
+    delayed_job (4.1.9)
+      activesupport (>= 3.0, < 6.2)
+    delayed_job_active_record (4.1.5)
+      activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
     delayed_job_web (1.4.3)
       activerecord (> 3.0.0)
       delayed_job (> 2.0.3)
       rack-protection (>= 1.5.5)
       sinatra (>= 1.4.4)
-    devise (4.7.2)
+    devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -97,15 +101,15 @@ GEM
       warden (~> 1.2.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.9.0)
+    erubi (1.10.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     execjs (2.7.0)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.13.1)
+    ffi (1.14.2)
     gh (0.15.1)
       addressable (~> 2.4.0)
       backports
@@ -128,19 +132,19 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.5)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.1)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.3.1)
+    json (2.5.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
-    loofah (2.7.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -150,11 +154,11 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
@@ -163,41 +167,43 @@ GEM
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
-    newrelic_rpm (6.12.0.367)
-    nio4r (2.5.3)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    newrelic_rpm (6.15.0)
+    nio4r (2.5.5)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
-    passenger (6.0.6)
+    passenger (6.0.7)
       rack
       rake (>= 0.8.1)
-    puma (4.3.6)
+    puma (5.2.1)
       nio4r (~> 2.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
+    rails (6.1.2)
+      actioncable (= 6.1.2)
+      actionmailbox (= 6.1.2)
+      actionmailer (= 6.1.2)
+      actionpack (= 6.1.2)
+      actiontext (= 6.1.2)
+      actionview (= 6.1.2)
+      activejob (= 6.1.2)
+      activemodel (= 6.1.2)
+      activerecord (= 6.1.2)
+      activestorage (= 6.1.2)
+      activesupport (= 6.1.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -209,18 +215,18 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.1.2)
+      actionpack (= 6.1.2)
+      activesupport (= 6.1.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-readline (0.5.5)
-    rdoc (6.2.1)
+    rdoc (6.3.0)
     ref (2.0.0)
-    regexp_parser (1.7.1)
+    regexp_parser (2.0.3)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -230,21 +236,21 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.4)
-    round_robin_tournament (0.0.1)
-    rubocop (0.91.0)
+    round_robin_tournament (0.1.1)
+    rubocop (1.9.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    sdoc (1.1.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    sdoc (2.0.3)
       rdoc (>= 5.0)
     sinatra (2.1.0)
       mustermann (~> 1.0)
@@ -260,13 +266,12 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    terminal-table (1.8.0)
+    terminal-table (3.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.1.0)
     tilt (2.0.10)
     travis (1.8.13)
       backports
@@ -282,9 +287,9 @@ GEM
     turbolinks-source (5.2.0)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -292,14 +297,14 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    uniform_notifier (1.13.0)
+    uniform_notifier (1.13.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket (1.2.8)
+    websocket (1.2.9)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -321,7 +326,7 @@ DEPENDENCIES
   newrelic_rpm
   passenger
   puma
-  rails (= 6.0.3.2)
+  rails (= 6.1.2)
   rails_12factor
   rb-readline
   round_robin_tournament
@@ -336,7 +341,7 @@ DEPENDENCIES
   uglifier
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 3.0.0p0
 
 BUNDLED WITH
-   2.0.2
+   2.2.9

README.md

@@ -2,10 +2,10 @@
 This application is being created to run a wrestling tournament.
 
 ### Current master status
-[![Build Status](https://travis-ci.org/jcwimer/wrestlingApp.svg?branch=master)](https://travis-ci.org/jcwimer/wrestlingApp)
+[![Build Status](https://circleci.com/gh/jcwimer/wrestlingApp/tree/master.svg)](https://travis-ci.org/jcwimer/wrestlingApp)
 
 ### Current development status
-[![Build Status](https://travis-ci.org/jcwimer/wrestlingApp.svg?branch=development)](https://travis-ci.org/jcwimer/wrestlingApp)
+[![Build Status](https://circleci.com/gh/jcwimer/wrestlingApp/tree/development.svg)](https://travis-ci.org/jcwimer/wrestlingApp)
 
 # Info
 **License:** MIT License
@@ -13,8 +13,8 @@ This application is being created to run a wrestling tournament.
 **Public Production Url:** [https://wrestlingdev.com](http://wrestlingdev.com)
 
 **App Info**
-* Ruby 2.6.5
-* Rails 6.0.1
+* Ruby 3.0.0
+* Rails 6.1.2
 * DB mysql or mariadb
 * Memcached
 * Delayed Jobs

bin/rails-dev-run.sh

@@ -11,5 +11,5 @@ if [ $# != 1 ]; then
 fi
 
 docker build -t $1 -f ${project_dir}/deploy/rails-dev-Dockerfile ${project_dir}
-docker run -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash
-sudo chown -R ${USER}:${USER} ${project_dir}
+docker run --rm -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash
+sudo chown -R ${USER_ID}:${USER_ID} ${project_dir}

bin/run-tests-with-docker.sh

@@ -2,4 +2,4 @@
 project_dir="$(dirname $(readlink -f ${BASH_SOURCE[0]}))/.."
 
 docker build -f ${project_dir}/deploy/rails-prod-Dockerfile -t wrestlingdevtests ${project_dir}/.
-docker run -it wrestlingdevtests bash /rails/bin/run-all-tests.sh
+docker run --rm -it wrestlingdevtests bash /rails/bin/run-all-tests.sh

config/application.rb

@@ -33,8 +33,6 @@ module Wrestling
       DeviseController.respond_to :html, :json
     end
     
-    config.active_record.sqlite3.represent_boolean_as_integer = true
-    
     config.autoload_paths += %W(#{config.root}/app/services/tournament_services)
     config.autoload_paths += %W(#{config.root}/app/services/wrestler_services)
     config.autoload_paths += %W(#{config.root}/app/services/weight_services)

config/environments/production.rb

@@ -54,7 +54,7 @@ Wrestling::Application.configure do
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  config.cache_store = :dalli_store,
+  config.cache_store = :mem_cache_store,
                      (ENV["MEMCACHIER_SERVERS"] || "").split(","),
                      {:username => ENV["MEMCACHIER_USERNAME"],
                       :password => ENV["MEMCACHIER_PASSWORD"],

deploy/rails-dev-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.5
+FROM ruby:3.0.0
 
 RUN apt-get -qq update \
   && apt-get -qq install -y \
@@ -22,7 +22,8 @@ RUN gem install bundler
 RUN gem update --system
 ADD Gemfile* /tmp/
 WORKDIR /tmp
-RUN bundle install --jobs 4 --without production
+RUN bundle config set without 'production'
+RUN bundle install --jobs 4
 
 RUN mkdir /rails
 WORKDIR /rails

deploy/rails-prod-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.5-slim
+FROM ruby:3.0.0-slim
 
 #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/
 

test/models/mat_test.rb

@@ -8,6 +8,6 @@ class MatTest < ActiveSupport::TestCase
    test "Mat validations" do
       mat = Mat.new
       assert_not mat.valid?
-      assert_equal [:name], mat.errors.keys
+      assert_equal [:name], mat.errors.attribute_names
     end
 end

test/models/school_test.rb

@@ -8,6 +8,6 @@ class SchoolTest < ActiveSupport::TestCase
    test "School validations" do
       school = School.new
       assert_not school.valid?
-      assert_equal [:name], school.errors.keys
+      assert_equal [:name], school.errors.attribute_names
     end
 end

test/models/tournament_test.rb

@@ -9,6 +9,6 @@ class TournamentTest < ActiveSupport::TestCase
    test "Tournament validations" do
       tourney = Tournament.new
       assert_not tourney.valid?
-      assert_equal [:date, :name, :tournament_type, :address, :director, :director_email], tourney.errors.keys
+      assert_equal [:date, :name, :tournament_type, :address, :director, :director_email], tourney.errors.attribute_names
     end
 end

test/models/weight_test.rb

@@ -8,6 +8,6 @@ class WeightTest < ActiveSupport::TestCase
    test "Weight validations" do
       weight = Weight.new
       assert_not weight.valid?
-      assert_equal [:max], weight.errors.keys
+      assert_equal [:max], weight.errors.attribute_names
     end
 end

test/models/wrestler_test.rb

@@ -8,6 +8,6 @@ class WrestlerTest < ActiveSupport::TestCase
    test "Wrestler validations" do
       wrestler = Wrestler.new
       assert_not wrestler.valid?
-      assert_equal [:name, :weight_id, :school_id], wrestler.errors.keys
+      assert_equal [:name, :weight_id, :school_id], wrestler.errors.attribute_names
     end
 end