Merge pull request #12 from mtsmfm/test-old-ruby

Test against old ruby

Author: mtsmfm

Dockerfile.development

@@ -1,11 +1,12 @@
-FROM ruby:2.4.1
+ARG RUBY_VERSION=2.4.1
+FROM ruby:$RUBY_VERSION
 
 RUN apt-get update && apt-get install less -y
 RUN groupadd --gid 1000 ruby && useradd --uid 1000 --gid ruby --shell /bin/bash --create-home ruby
 RUN mkdir /app && chown ruby:ruby /app
 
 ENV LANG=C.UTF-8 \
-  BUNDLE_PATH=/app/vendor/bundle \
+  BUNDLE_PATH=/app/vendor/bundle/$RUBY_VERSION \
   BUNDLE_JOBS=4
 
 USER ruby

README.md

@@ -61,7 +61,9 @@ https://github.com/EugenMayer/docker-sync/wiki/1.-Installation
 
 ### Run test
 
-    $ docker-compose run app bundle exec rake test
+    $ docker-compose run app bin/m
+    $ docker-compose run ruby-2-3 bin/m
+    $ docker-compose run ruby-2-2 bin/m
 
 ## Contributing
 

circle.yml

@@ -6,14 +6,26 @@ jobs:
     working_directory: /project
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: 17.05.0-ce
       - run:
+          name: setup
           command: |
             set -x
+            docker info
             docker volume create mtsmfm-language-server-sync
             docker create -v mtsmfm-language-server-sync:/app --name mtsmfm-language-server-sync busybox chown -R 1000:1000 /app
             docker cp . mtsmfm-language-server-sync:/app
             docker start mtsmfm-language-server-sync
-            docker-compose run node bin/generate_files
+            docker-compose build
             docker-compose run app bin/setup
+            docker-compose run ruby-2-3 bin/setup
+            docker-compose run ruby-2-2 bin/setup
+      - run:
+          name: test
+          command: |
+            set -x
+            docker-compose run node bin/generate_files
             docker-compose run app bin/m
+            docker-compose run ruby-2-3 bin/m
+            docker-compose run ruby-2-2 bin/m

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.0'
 services:
-  app:
-    build:
+  app: &app
+    build: &app-build
       context: .
       dockerfile: Dockerfile.development
     volumes:
@@ -10,6 +10,18 @@ services:
       - $HOME/.gitconfig:/home/ruby/.gitconfig:ro
       - $HOME/.ssh:/home/ruby/.ssh:ro
       - $HOME/.gem:/home/ruby/.gem
+  ruby-2-3:
+    <<: *app
+    build:
+      <<: *app-build
+      args:
+        RUBY_VERSION: 2.3
+  ruby-2-2:
+    <<: *app
+    build:
+      <<: *app-build
+      args:
+        RUBY_VERSION: 2.2
   node:
     build:
       context: .

test/language_server/completion_provider/rcodetools_test.rb

@@ -9,7 +9,7 @@ def setup
       end
 
       def test_array
-        @file_store.cache(@uri, <<~EOS)
+        @file_store.cache(@uri, <<-EOS.strip_heredoc)
           [].l
         EOS
 
@@ -25,7 +25,7 @@ def test_array
       end
 
       def test_no_candidates
-        @file_store.cache(@uri, <<~EOS)
+        @file_store.cache(@uri, <<-EOS.strip_heredoc)
           [].not_exists
         EOS
 
@@ -35,7 +35,7 @@ def test_no_candidates
       end
 
       def test_syntax_error
-        @file_store.cache(@uri, <<~EOS)
+        @file_store.cache(@uri, <<-EOS.strip_heredoc)
           class Foo
           [].l
         EOS
@@ -46,7 +46,7 @@ class Foo
       end
 
       def test_runtime_error
-        @file_store.cache(@uri, <<~EOS)
+        @file_store.cache(@uri, <<-EOS.strip_heredoc)
           require "not_exists"
           [].l
         EOS

test/language_server/linter/ruby_wc_test.rb

@@ -3,7 +3,7 @@
 module LanguageServer::Linter
   class RubyWCTest < Minitest::Test
     def test_error
-      linter = RubyWC.new(<<~EOS)
+      linter = RubyWC.new(<<-EOS.strip_heredoc)
         require "foo
         if a == "\\n"
       EOS
@@ -14,9 +14,9 @@ def test_error
     end
 
     def test_warn
-      linter = RubyWC.new(<<~RUBY)
+      linter = RubyWC.new(<<-EOS.strip_heredoc)
         a = 1
-      RUBY
+      EOS
 
       assert {
         linter.call == [Error.new(line_num: 0, message: "assigned but unused variable - a", type: "warning")]

test/test_helper.rb

@@ -4,3 +4,11 @@
 
 require 'minitest/autorun'
 require 'power_assert/colorize'
+
+class String
+  def strip_heredoc
+    min = scan(/^[ \t]*(?=\S)/).min
+    indent = min ? min.size : 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end