diff --git a/.ruby-version b/.ruby-version index 73462a5a1..aedc15bb0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 +2.5.3 diff --git a/.travis.yml b/.travis.yml index cedd8a5ff..d835f53c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,53 +2,53 @@ sudo: required language: ruby cache: directories: - - vendor/bundle - - node_modules - - $HOME/.nvm + - vendor/bundle + - node_modules + - $HOME/.nvm rvm: -- 2.5.1 + - 2.5.3 addons: postgresql: '9.6' chrome: stable env: global: - - RAILS_ENV=test - - CC_TEST_REPORTER_ID=f39e060a8b1a558ebd8aff75d5b9760bf1ae98f3f85d628ae28814f3c66438cd + - RAILS_ENV=test + - CC_TEST_REPORTER_ID=f39e060a8b1a558ebd8aff75d5b9760bf1ae98f3f85d628ae28814f3c66438cd branches: only: - master before_install: - nvm install node v8.11.4 install: -- bundle install --path vendor/bundle -- bundle exec chromedriver-update -- yarn install -- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 - > ./cc-test-reporter -- chmod +x ./cc-test-reporter + - bundle install --path vendor/bundle + - bundle exec chromedriver-update + - yarn install + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 + > ./cc-test-reporter + - chmod +x ./cc-test-reporter before_script: -- cp config/database.yml.travis config/database.yml -- psql -c 'create database travis_ci_test;' -U postgres + - cp config/database.yml.travis config/database.yml + - psql -c 'create database travis_ci_test;' -U postgres script: -- bundle exec rails webpacker:compile -- bundle exec rake db:schema:load -- "./cc-test-reporter before-build" -- bundle exec rspec spec -- "./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.simplecov.json" -- yarn test -- "./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.lcov.json" -- "./cc-test-reporter sum-coverage coverage/codeclimate.*.json" -- "./cc-test-reporter upload-coverage" -- "bundle exec bundle-audit check --update" + - bundle exec rails webpacker:compile + - bundle exec rake db:schema:load + - './cc-test-reporter before-build' + - bundle exec rspec spec + - './cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.simplecov.json' + - yarn test + - './cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.lcov.json' + - './cc-test-reporter sum-coverage coverage/codeclimate.*.json' + - './cc-test-reporter upload-coverage' + - 'bundle exec bundle-audit check --update' deploy: provider: heroku - api_key: "$HEROKU_AUTH_TOKEN" + api_key: '$HEROKU_AUTH_TOKEN' app: master: practicaldev run: - - rake db:migrate + - rake db:migrate after_deploy: -- bash after_deploy.sh + - bash after_deploy.sh notifications: slack: on_pull_requests: false diff --git a/Gemfile b/Gemfile index 8f9a26e7c..02ae862ae 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # rubocop:disable LineLength source "https://rubygems.org" -ruby "2.5.1" +ruby "2.5.3" # Enforce git to transmitted via https. # workaround until bundler 2.0 is released. diff --git a/docs/installation/linux.md b/docs/installation/linux.md index 3706bd8ba..bd47bd384 100644 --- a/docs/installation/linux.md +++ b/docs/installation/linux.md @@ -4,8 +4,8 @@ These prerequisites assume you're working on a Linux-based operating system but ### Ruby -1. If you don't already a Ruby version manager, we highly recommend [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). -2. With the Ruby version manager, install Ruby verion listed on our badge. (ie with rbenv: `rbenv install 2.5.1`) +1. If you don't already a Ruby version manager, we highly recommend [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). +2. With the Ruby version manager, install Ruby verion listed on our badge. (ie with rbenv: `rbenv install 2.5.3`) For very detailed rbenv installation directions on several distros, please vist [DigitalOcean's guide](https://www.digitalocean.com/community/tutorials/how-to-install-ruby-on-rails-with-rbenv-on-ubuntu-18-04). @@ -13,8 +13,8 @@ For very detailed rbenv installation directions on several distros, please vist There are two ways to install Yarn. -* Yarn's offical [installation guide](https://yarnpkg.com/en/docs/install#debian-stable). -* [DigitalOcean's detailed tutorial](https://www.digitalocean.com/community/tutorials/how-to-install-node-js-on-ubuntu-18-04) describes how to install [Node version Manager](https://github.com/creationix/nvm). By installing NVM you can select a Node version (we recommend either LTS or current), the guide will also explain how to install NPM. This way you'll have Node, NPM, and then you can run `npm install -g yarn` to install Yarn. +- Yarn's offical [installation guide](https://yarnpkg.com/en/docs/install#debian-stable). +- [DigitalOcean's detailed tutorial](https://www.digitalocean.com/community/tutorials/how-to-install-node-js-on-ubuntu-18-04) describes how to install [Node version Manager](https://github.com/creationix/nvm). By installing NVM you can select a Node version (we recommend either LTS or current), the guide will also explain how to install NPM. This way you'll have Node, NPM, and then you can run `npm install -g yarn` to install Yarn. ### PostgreSQL @@ -33,9 +33,9 @@ There are more than one way to setup Postgres. For additional configuration, che 6. Install our frontend dependencies with `bin/yarn` 7. Set up your environment variables/secrets -* Take a look at `Envfile`. This file lists all the `ENV` variables we use and provides a fake default for any missing keys. You'll need to get your own free [Algolia credentials](http://docs.dev.to/get-api-keys-dev-env/#algolia) to get your development environment running. -* This [guide](http://docs.dev.to/get-api-keys-dev-env/) will show you how to get free API keys for additional servies that may be required to run certain parts of the app. -* For any key that you wish to enter/replace: +- Take a look at `Envfile`. This file lists all the `ENV` variables we use and provides a fake default for any missing keys. You'll need to get your own free [Algolia credentials](http://docs.dev.to/get-api-keys-dev-env/#algolia) to get your development environment running. +- This [guide](http://docs.dev.to/get-api-keys-dev-env/) will show you how to get free API keys for additional servies that may be required to run certain parts of the app. +- For any key that you wish to enter/replace: 8. Create `config/application.yml` by copying from the provided template (ie. with bash: `cp config/sample_application.yml config/application.yml`). This is a personal file that is ignored in git. 9. Obtain the development variable and apply the key you wish to enter/replace. ie: @@ -45,7 +45,7 @@ There are more than one way to setup Postgres. For additional configuration, che GITHUB_SECRET: "ANOTHER_REAL_SECURE_KEY_HERE" ``` -* If you are missing `ENV` variables on bootup, `envied` gem will alert you with messages similar to `'error_on_missing_variables!': The following environment variables should be set: A_MISSING_KEY.`. -* You do not need "real" keys for basic development. Some features require certain keys, so you may be able to add them as you go. +- If you are missing `ENV` variables on bootup, `envied` gem will alert you with messages similar to `'error_on_missing_variables!': The following environment variables should be set: A_MISSING_KEY.`. +- You do not need "real" keys for basic development. Some features require certain keys, so you may be able to add them as you go. 10. Run `bin/setup` diff --git a/docs/installation/mac-os.md b/docs/installation/mac-os.md index 1bb93187a..d892085a9 100644 --- a/docs/installation/mac-os.md +++ b/docs/installation/mac-os.md @@ -3,7 +3,7 @@ ### Ruby 1. If you don't already a Ruby version manager, we highly recommend [rbenv](https://github.com/rbenv/rbenv). Please follow their [installation guide](https://github.com/rbenv/rbenv#installation). -2. With the Ruby version manager, install Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.5.1`) +2. With the Ruby version manager, install Ruby version listed on our badge. (ie with rbenv: `rbenv install 2.5.3`) ### Yarn diff --git a/docs/installation/windows.md b/docs/installation/windows.md index b88493c93..4d1bdda93 100644 --- a/docs/installation/windows.md +++ b/docs/installation/windows.md @@ -36,8 +36,8 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bashrc exec $SHELL -rbenv install 2.5.1 -rbenv global 2.5.1 +rbenv install 2.5.3 +rbenv global 2.5.3 ruby -v ```