Bump ruby versions

.vscode/settings.json

@@ -1,8 +1,6 @@
 {
-    "ruby-lsc.commandWithArgs": [
-        "docker-compose", "run", "--rm", "app"
-    ],
-    "files.exclude": {
-        "vendor": true
-    }
+  "ruby-lsc.commandWithArgs": ["docker-compose", "run", "--rm", "ruby-2-6"],
+  "files.exclude": {
+    "vendor": true
+  }
 }

circle.yml

@@ -1,15 +1,13 @@
 version: 2
 jobs:
-  test-2-5: &test
+  ruby-2-6: &test
     docker:
       - image: tmaier/docker-compose
         environment:
           COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
-          SERVICE_NAME: ruby-2-5
     steps:
       - checkout
-      - setup_remote_docker:
-          version: 17.05.0-ce
+      - setup_remote_docker
       - run:
           name: setup
           command: |
@@ -19,29 +17,16 @@ jobs:
             docker create -v project:/app --name project busybox chown -R 1000:1000 /app
             docker cp . project:/app
             docker start project
-            docker-compose build $SERVICE_NAME
-      - run: docker-compose run $SERVICE_NAME bin/ci
-  test-2-4:
+            docker-compose build $CIRCLE_JOB
+      - run: docker-compose run $CIRCLE_JOB bin/ci
+  ruby-2-5:
     <<: *test
-    docker:
-      - image: tmaier/docker-compose
-        environment:
-          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
-          SERVICE_NAME: ruby-2-4
-  test-2-3:
+  ruby-2-4:
     <<: *test
-    docker:
-      - image: tmaier/docker-compose
-        environment:
-          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
-          SERVICE_NAME: ruby-2-3
-  test-2-2:
+  ruby-2-3:
+    <<: *test
+  ruby-2-2:
     <<: *test
-    docker:
-      - image: tmaier/docker-compose
-        environment:
-          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
-          SERVICE_NAME: ruby-2-2
   test-docker-build:
     docker:
       - image: docker
@@ -54,8 +39,9 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-2-5
-      - test-2-4
-      - test-2-3
-      - test-2-2
+      - ruby-2-6
+      - ruby-2-5
+      - ruby-2-4
+      - ruby-2-3
+      - ruby-2-2
       - test-docker-build

docker-compose.ci.yml

@@ -1,16 +1,16 @@
-version: '3.0'
+version: "3.0"
 services:
-  app: &app
+  ruby-2-6: &latest
     volumes:
       - project:/app
   ruby-2-5:
-    <<: *app
+    <<: *latest
   ruby-2-4:
-    <<: *app
+    <<: *latest
   ruby-2-3:
-    <<: *app
+    <<: *latest
   ruby-2-2:
-    <<: *app
+    <<: *latest
 volumes:
   project:
     external: true

docker-compose.override.yml

@@ -1,16 +1,16 @@
-version: '3.0'
+version: "3.0"
 services:
-  app: &app
+  ruby-2-6: &latest
     volumes:
       - .:/app:cached
       - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
       - $HOME/.ssh:/home/ruby/.ssh:ro
       - $HOME/.gem:/home/ruby/.gem
   ruby-2-5:
-    <<: *app
+    <<: *latest
   ruby-2-4:
-    <<: *app
+    <<: *latest
   ruby-2-3:
-    <<: *app
+    <<: *latest
   ruby-2-2:
-    <<: *app
+    <<: *latest

docker-compose.yml

@@ -1,36 +1,40 @@
-version: '3.0'
+version: "3.0"
 services:
-  app: &app
-    build: &app-build
+  ruby-2-6: &latest
+    build: &build
       context: .
       dockerfile: Dockerfile.development
       args:
-        RUBY_VERSION: 2.5.0
+        RUBY_VERSION: 2.6.0
     environment:
       LANGUAGE_SERVER_RUBY_REMOTE_ROOT: $PWD
     volumes:
       - vendor:/vendor
       - home:/home/ruby
   ruby-2-5:
-    <<: *app
+    <<: *latest
+    build:
+      <<: *build
+      args:
+        RUBY_VERSION: 2.5.3
   ruby-2-4:
-    <<: *app
+    <<: *latest
     build:
-      <<: *app-build
+      <<: *build
       args:
-        RUBY_VERSION: 2.4.3
+        RUBY_VERSION: 2.4.5
   ruby-2-3:
-    <<: *app
+    <<: *latest
     build:
-      <<: *app-build
+      <<: *build
       args:
-        RUBY_VERSION: 2.3.6
+        RUBY_VERSION: 2.3.8
   ruby-2-2:
-    <<: *app
+    <<: *latest
     build:
-      <<: *app-build
+      <<: *build
       args:
-        RUBY_VERSION: 2.2.9
+        RUBY_VERSION: 2.2.10
 volumes:
   home:
   vendor:

test/language_server/linter/ruby_wc_test.rb

@@ -19,8 +19,15 @@ def test_error
           10..11
         end
 
+      message =
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
+          "unexpected backslash, expecting end-of-input"
+        else
+          "unexpected $undefined, expecting end-of-input"
+        end
+
       assert {
-        linter.call == [Error.new(line_num: 1, characters: characters, message: "unexpected $undefined, expecting end-of-input", type: "syntax error")]
+        linter.call == [Error.new(line_num: 1, characters: characters, message: message, type: "syntax error")]
       }
     end