Merge pull request #158 from Christine-horrocks/master

Update Ruby and Bundler

.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.0

.travis.yml

@@ -9,6 +9,8 @@ env:
     OPENSEARCH_DESCRIPTION_URL=http://api.parliament.uk/search/opensearch
 
 before_install:
+  - gem update --system
+  - gem install bundler
   - "curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter"
   - "chmod +x ./cc-test-reporter"
 
@@ -18,4 +20,4 @@ script:
 
 after_script:
   - "./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.json coverage/backend/.resultset.json"
-  - "if [[ \"$TRAVIS_TEST_RESULT\" == 0 ]]; then ./cc-test-reporter upload-coverage; fi"
+  - "if [[ \"$TRAVIS_TEST_RESULT\" == 0 ]]; then ./cc-test-reporter upload-coverage; fi"

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.3-alpine3.8
+FROM ruby:2.6.0-alpine3.8
 
 # Add command line argument variables used to customise the image at build-time.
 
@@ -26,7 +26,7 @@ WORKDIR /app
 RUN echo "Environment (RACK_ENV): $RACK_ENV" && \
     apk --update add libcurl && \
     apk --update add --virtual build-dependencies build-base ruby-dev && \
-    gem install bundler --no-ri --no-rdoc && \
+    gem install bundler --no-document && \
     if [ "$RACK_ENV" == "production" ]; then \
       bundle install --without development test --path vendor/bundle; \
       apk del build-dependencies; \

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.3'
+ruby '2.6.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'

Gemfile.lock

@@ -285,7 +285,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.6.0p0
 
 BUNDLED WITH
    2.0.1