Merge pull request #415 from pibi/groovyserv

jhoffner · web-flow · commit 19a0dbafd988 · 2017-06-05T13:50:59.000+08:00
Groovyserv POC for develop branch
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ env:
     - TEST_IMG=ruby
     - TEST_IMG=alt
     - TEST_IMG=rust
-    - TEST_IMG=julia
+#    - TEST_IMG=julia
     - TEST_IMG=systems
     - TEST_IMG=dart
     - TEST_IMG=crystal
@@ -33,6 +33,7 @@ env:
     - TEST_IMG=objc
     - TEST_IMG=go
     - TEST_IMG=lua
+    - TEST_IMG=java
 
 script:
   - eslint '**/*.js'
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 HOSTNAME=codewars
 
 # Building erlang images have been suspended (frozen) until they are able to be repaired
-CONTAINERS=node dotnet jvm python ruby alt rust julia systems dart crystal ocaml swift haskell objc go lua
+CONTAINERS=node dotnet jvm java python ruby alt rust systems dart crystal ocaml swift haskell objc go lua
 
 # recent containers should be updated when adding or modifying a language, so that
 # the travis build process will test it. The process cant test all languages
 # without timing out so this is required to get passed that issue.
-RECENT_CONTAINERS=node
+RECENT_CONTAINERS=java
 
 ALL_CONTAINERS=${CONTAINERS} base
 
@@ -44,6 +44,7 @@ push:
 	docker push codewars/python-runner
 	docker push codewars/dotnet-runner
 	docker push codewars/jvm-runner
+	docker push codewars/java-runner
 	docker push codewars/haskell-runner
 	docker push codewars/systems-runner
 	docker push codewars/erlang-runner
@@ -62,6 +63,7 @@ pull:
 	docker pull codewars/python-runner
 	docker pull codewars/dotnet-runner
 	docker pull codewars/jvm-runner
+	docker pull codewars/java-runner
 	docker pull codewars/haskell-runner
 	docker pull codewars/systems-runner
 	docker pull codewars/erlang-runner
diff --git a/docker/java.docker b/docker/java.docker
@@ -0,0 +1,69 @@
+# BUILD-USING:    docker build -t codewars/runner-jvm .
+# EXAMPLE USAGE:  (Hello world): docker run --rm --name=runner-jvm codewars/runner-jvm run -l java -c $'class Solution {\npublic static void main(String[] args){\nSystem.out.println("Hello world");\n}}'
+
+# Pull base image.
+FROM codewars/base-runner
+
+# Needed to run add-apt-repository
+RUN apt-get -y install software-properties-common
+
+# Install Java 8
+# RUN apt-get install -y default-jre-headless default-jdk # default is OpenJDK6
+RUN add-apt-repository ppa:webupd8team/java
+RUN apt-get update
+# http://askubuntu.com/a/190674
+RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
+    echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
+RUN apt-get install -y oracle-java8-installer
+
+RUN apt-get install -y unzip
+
+# Install dependencies binaries
+RUN mkdir -p /usr/local
+WORKDIR /usr/local
+
+# Checkout binaries
+RUN  wget -q https://dl.bintray.com/groovy/maven/apache-groovy-binary-2.4.10.zip && unzip apache-groovy-binary-2.4.10.zip
+RUN  wget -q https://bitbucket.org/kobo/groovyserv-mirror/downloads/groovyserv-1.1.0-bin.zip && unzip groovyserv-1.1.0-bin.zip
+
+# Setup Groovy
+RUN mv groovy-2.4.10 groovy
+ENV GROOVY_HOME /usr/local/groovy/
+ENV PATH /usr/local/groovy/bin:${PATH}
+
+# Setup GroovyServ
+RUN mv groovyserv-1.1.0 groovyserv
+ENV PATH /usr/local/groovyserv/bin:${PATH}
+
+# add the package json first to a tmp directory and build, copy over so that we dont rebuild every time
+ADD package.json /tmp/package.json
+RUN cd /tmp && npm install --production
+RUN mkdir -p /runner && cp -a /tmp/node_modules /runner
+
+# ADD cli-runner and install node deps
+ADD . /runner
+
+RUN ln -s /home/codewarrior /workspace
+WORKDIR /runner
+RUN npm install
+
+RUN /usr/local/groovyserv/bin/setup.sh
+RUN groovyserver -t 20 --debug || echo "server connection error"; groovyclient -Ct 120 -Cdebug -e "println 'Hello from GroovyServ'"
+
+# Run the test suite to make sure this thing works
+USER codewarrior
+
+# Set environment variables
+ENV TIMEOUT 120000
+ENV USER codewarrior
+ENV HOME /home/codewarrior
+RUN groovyserver -t 20 --debug || echo "server connection error"; mocha -t ${TIMEOUT} test/runners/java_spec.js
+
+USER root
+RUN echo '#!/bin/bash\ngroovyserver -t 10 -q || echo ""\n timeout 15 node "$@"'>/runner/entrypoint.sh ; chmod +x /runner/entrypoint.sh 
+
+USER codewarrior
+#timeout is a fallback in case an error with node
+#prevents it from exiting properly
+ENTRYPOINT ["/runner/entrypoint.sh"]
+
diff --git a/docker/jvm.docker b/docker/jvm.docker
@@ -58,7 +58,7 @@ USER codewarrior
 ENV TIMEOUT 10000
 ENV USER codewarrior
 ENV HOME /home/codewarrior
-RUN mocha -t 10000 test/runners/{java,clojure,groovy,scala,kotlin}_spec.js
+RUN mocha -t 10000 test/runners/{clojure,groovy,scala,kotlin}_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
diff --git a/frameworks/java/CwRunListener.java b/frameworks/java/CwRunListener.java
@@ -0,0 +1,50 @@
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.Description;
+import java.io.StringWriter;
+import java.io.PrintWriter;
+
+public class CwRunListener extends RunListener
+{
+    private boolean failed;
+    public void testFailure(final Failure failure)
+    {
+        failed = true;
+        final String msg = failure.getMessage();
+        final boolean hasMessage =  msg != null && msg.length() > 0;
+        System.out.println(String.format("\n<FAILED::>%s<:LF:>", formatMessage(hasMessage ? msg : "Runtime Error Occurred")));
+        if(!hasMessage && failure.getException() != null) {
+            System.out.println(formatException(failure.getException()));
+        }
+    }
+    public void testStarted(final Description description)
+    {
+        System.out.println(String.format("\n<DESCRIBE::>%s<:LF:>", formatMessage(description.getDisplayName())));
+        failed = false;
+    }
+    public void testFinished(final Description description)
+    {
+        if(!failed)
+        {
+            System.out.println("\n<PASSED::>Test Passed<:LF:>");
+        }
+        System.out.println("\n<COMPLETEDIN::>");
+    }
+    private static String formatException(final Throwable ex)
+    {
+        if(ex == null){
+            return "";
+        }
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        ex.printStackTrace(pw);
+        return sw.toString();
+    }
+    private static String formatMessage(final String s)
+    {
+        if(s == null){
+            return "";
+        }
+        return s.replaceAll("\n", "<:LF:>");
+    }
+}
diff --git a/lib/runners/java.js b/lib/runners/java.js
@@ -1,21 +1,51 @@
 var shovel = require('../shovel'),
-    path = require('path');
+    exec = require('child_process').exec,
+    util = require('../util');
+
+
+var groovyTestRunner = `
+import org.junit.runner.JUnitCore;
+import CwRunListener;
+import TestFixture;
+
+def runner =   new JUnitCore();
+runner.addListener(new CwRunListener());
+runner.run(TestFixture.class);
+`;
 
 module.exports.run = function run(opts, cb) {
-  var uberJar = path.resolve(__dirname, '../../jvm-runner/target/jvm-runner-0.1.3-standalone.jar');
+
+  function compile(args, cb) {
+    args.unshift('javac', '-verbose','-cp', opts.dir, '-d', opts.dir, '-sourcepath', opts.dir);
+    exec(args.join(' '), cb);
+  }
+
   shovel.start(opts, cb, {
-    solutionOnly: function(runCode) {
-      runCode({
-        name: 'java',
-        args: ['-jar', uberJar],
-        stdin: JSON.stringify(opts)
+    solutionOnly: function(runCode, fail) {
+      var solutionFile = util.codeWriteSync('javac', opts.solution, opts.dir, 'Solution.java');
+
+      compile([solutionFile], function(error, stdout, stderr) {
+        if (error) return fail(error, stdout, stderr);
+        opts.publish('stdout', stdout);
+        runCode({
+          name: 'groovyclient',
+          args: ['-cp', opts.dir, '-e', 'import Solution; Solution.main(null);']
+        });
       });
     },
-    testIntegration: function(runCode) {
-      runCode({
-        name: 'java',
-        args: ['-jar', uberJar],
-        stdin: JSON.stringify(opts)
+    testIntegration: function(runCode, fail) {
+      var solutionFile = util.codeWriteSync('javac', opts.solution, opts.dir, 'Solution.java');
+
+      var fixtureFile = util.codeWriteSync('javac', opts.fixture, opts.dir, 'TestFixture.java');
+      var runner = util.codeWriteSync('groovy', groovyTestRunner, opts.dir, 'testRunner.groovy');
+
+      compile(['-cp', '/usr/local/groovy/lib/junit-4.12.jar', solutionFile, fixtureFile, './frameworks/java/CwRunListener.java'], function(error, stdout, stderr) {
+        if (error) return fail(error, stdout, stderr);
+        opts.publish('stdout', stdout);
+        runCode({
+          name: 'groovyclient',
+          args: ['-cp', opts.dir, '-cp', '/usr/local/groovy/lib/', runner]
+        });
       });
     }
   });
diff --git a/test/runners/java_spec.js b/test/runners/java_spec.js
@@ -7,13 +7,14 @@ describe('java runner', function() {
     it('should handle basic code evaluation', function(done) {
       runner.run({
         language: 'java',
-        code: [
-          'class Solution {',
-          '   static void main(String[] args){',
-          '        System.out.println("42");',
-          '   }',
-          '}'].join('\n')
+        code:`
+          class Solution {
+             public static void main(String[] args){
+                  System.out.println("42");
+             }
+          }`
       }, function(buffer) {
+        console.log(buffer);
         expect(buffer.stdout).to.contain('42\n');
         done();
       });
@@ -23,21 +24,21 @@ describe('java runner', function() {
     it('should handle basic junit tests', function(done) {
       runner.run({
         language: 'java',
-        code: 'public class Solution {\n'
-                    + '    public Solution(){}\n'
-                    + '    public int testthing(){return 3;}\n'
-                    + '}\n',
-        fixture: 'import static org.junit.Assert.assertEquals;\n'
-                    + 'import org.junit.Test;\n'
-                    + 'import org.junit.runners.JUnit4;\n'
-                    + 'public class TestFixture {\n'
-                    + '    public TestFixture(){}'
-                    + '    @Test\n'
-                    + '    public void myTestFunction(){\n'
-                    + '        Solution s = new Solution();\n'
-                    + '        assertEquals("wow", 3, s.testthing());\n'
-                    + '        System.out.println("test out");\n'
-                    + '}}'
+        code: `public class Solution {
+                public Solution(){}
+                public int testthing(){return 3;}
+              }`,
+        fixture: `import static org.junit.Assert.assertEquals;
+                    import org.junit.Test;
+                    import org.junit.runners.JUnit4;
+                    public class TestFixture {
+                        public TestFixture(){}
+                        @Test
+                        public void myTestFunction(){
+                            Solution s = new Solution();
+                            assertEquals("wow", 3, s.testthing());
+                            System.out.println("test out");
+                    }}`
       }, function(buffer) {
         expect(buffer.stdout).to.contain('<DESCRIBE::>myTestFunction(TestFixture)<:LF:>\ntest out\n\n<PASSED::>Test Passed<:LF:>\n');
         done();
@@ -46,21 +47,21 @@ describe('java runner', function() {
     it('should handle junit tests failing', function(done) {
       runner.run({
         language: 'java',
-        code: 'public class Solution {\n'
-                    + '    public Solution(){}\n'
-                    + '    public int testthing(){return 3;}\n'
-                    + '}\n',
-        fixture: 'import static org.junit.Assert.assertEquals;\n'
-                    + 'import org.junit.Test;\n'
-                    + 'import org.junit.runners.JUnit4;\n'
-                    + 'public class TestFixture {\n'
-                    + '    public TestFixture(){}'
-                    + '    @Test\n'
-                    + '    public void myTestFunction(){\n'
-                    + '        Solution s = new Solution();\n'
-                    + '        assertEquals("Failed Message", 5, s.testthing());\n'
-                    + '        System.out.println("test out");\n'
-                    + '}}'
+        code: `public class Solution {
+                        public Solution(){}
+                        public int testthing(){return 3;}
+                    }`,
+        fixture: `import static org.junit.Assert.assertEquals;
+                    import org.junit.Test;
+                    import org.junit.runners.JUnit4;
+                    public class TestFixture {
+                        public TestFixture(){}
+                        @Test
+                        public void myTestFunction(){
+                            Solution s = new Solution();
+                            assertEquals("Failed Message", 5, s.testthing());
+                            System.out.println("test out");
+                    }}`
       }, function(buffer) {
         expect(buffer.stdout).to.contain('<DESCRIBE::>myTestFunction(TestFixture)<:LF:>\n\n<FAILED::>Failed Message expected:<5> but was:<3><:LF:>\n');
         done();
@@ -69,19 +70,19 @@ describe('java runner', function() {
     it('should report junit messages', function(done) {
       runner.run({
         language: 'java',
-        code: 'public class Solution {\n'
-                    + '    public Solution(){}\n'
-                    + '    public String testthing(){ return null; }\n'
-                    + '}\n',
-        fixture: 'import static org.junit.Assert.assertEquals;\n'
-                    + 'import org.junit.Test;\n'
-                    + 'import org.junit.runners.JUnit4;\n'
-                    + 'public class TestFixture {\n'
-                    + '    @Test\n'
-                    + '    public void myTestFunction(){\n'
-                    + '        Solution s = new Solution();\n'
-                    + '        assertEquals("Failed Message", 1, s.testthing().length());\n'
-                    + '}}'
+        code: `public class Solution {
+                        public Solution(){}
+                        public String testthing(){ return null; }
+                    }`,
+        fixture: `import static org.junit.Assert.assertEquals;
+                    import org.junit.Test;
+                    import org.junit.runners.JUnit4;
+                    public class TestFixture {
+                        @Test
+                        public void myTestFunction(){
+                            Solution s = new Solution();
+                            assertEquals("Failed Message", 1, s.testthing().length());
+                    }}`
       }, function(buffer) {
         expect(buffer.stdout).to.contain('<FAILED::>Runtime Error Occurred');
         expect(buffer.stdout).to.contain('NullPointerException');
