Merge pull request #60 from mtsmfm/bump-ruby

Bump ruby versions

Author: mtsmfm

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.2-alpine
+FROM ruby:2.5.1-alpine
 
 RUN apk add --no-cache git
 

circle.yml

@@ -1,11 +1,11 @@
 version: 2
 jobs:
-  test-2-4: &test
+  test-2-5: &test
     docker:
       - image: tmaier/docker-compose
         environment:
           COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
-          SERVICE_NAME: ruby-2-4
+          SERVICE_NAME: ruby-2-5
     steps:
       - checkout
       - setup_remote_docker:
@@ -21,6 +21,13 @@ jobs:
             docker start project
             docker-compose build $SERVICE_NAME
       - run: docker-compose run $SERVICE_NAME bin/ci
+  test-2-4:
+    <<: *test
+    docker:
+      - image: tmaier/docker-compose
+        environment:
+          COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml
+          SERVICE_NAME: ruby-2-4
   test-2-3:
     <<: *test
     docker:
@@ -47,6 +54,7 @@ workflows:
   version: 2
   test:
     jobs:
+      - test-2-5
       - test-2-4
       - test-2-3
       - test-2-2

docker-compose.ci.yml

@@ -3,6 +3,8 @@ services:
   app: &app
     volumes:
       - project:/app
+  ruby-2-5:
+    <<: *app
   ruby-2-4:
     <<: *app
   ruby-2-3:

docker-compose.override.yml

@@ -6,6 +6,8 @@ services:
       - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
       - $HOME/.ssh:/home/ruby/.ssh:ro
       - $HOME/.gem:/home/ruby/.gem
+  ruby-2-5:
+    <<: *app
   ruby-2-4:
     <<: *app
   ruby-2-3:

docker-compose.yml

@@ -5,26 +5,32 @@ services:
       context: .
       dockerfile: Dockerfile.development
       args:
-        RUBY_VERSION: 2.4.2
+        RUBY_VERSION: 2.5.0
     environment:
       LANGUAGE_SERVER_RUBY_REMOTE_ROOT: $PWD
     volumes:
       - vendor:/vendor
       - home:/home/ruby
+  ruby-2-5:
+    <<: *app
   ruby-2-4:
     <<: *app
+    build:
+      <<: *app-build
+      args:
+        RUBY_VERSION: 2.4.3
   ruby-2-3:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.3.4
+        RUBY_VERSION: 2.3.6
   ruby-2-2:
     <<: *app
     build:
       <<: *app-build
       args:
-        RUBY_VERSION: 2.2.7
+        RUBY_VERSION: 2.2.9
 volumes:
   home:
   vendor:

test/language_server/linter/ruby_wc_test.rb

@@ -8,8 +8,19 @@ def test_error
         if a == "\\n"
       EOS
 
+      # <compiled>:2: syntax error, unexpected $undefined, expecting end-of-input
+      # if a == "\n"
+      #           ^
+
+      characters =
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.5.0")
+          9..10
+        else
+          10..11
+        end
+
       assert {
-        linter.call == [Error.new(line_num: 1, characters: 10..11, message: "unexpected $undefined, expecting end-of-input", type: "syntax error")]
+        linter.call == [Error.new(line_num: 1, characters: characters, message: "unexpected $undefined, expecting end-of-input", type: "syntax error")]
       }
     end