Code Cleanup (#452)

- docker images no longer use timeout as default entrypoint
- ESLint fixes

Author: jhoffner

.eslintignore

@@ -1 +1,2 @@
 frameworks/javascript/angular/
+frameworks/java

docker-compose.yml

@@ -192,6 +192,16 @@ services:
     entrypoint: ''
     command: bash
 
+  chapel-runner:
+    image: codewars/chapel-runner
+    volumes:
+      - ./lib:/runner/lib
+      - ./examples:/runner/examples
+      - ./frameworks:/runner/frameworks
+      - ./test:/runner/test
+    entrypoint: ''
+    command: bash
+
   # LANGUAGE SPECIFIC HELPERS
   javascript:
     image: codewars/node-runner

docker/alt.docker

@@ -42,4 +42,4 @@ RUN mocha -t 3000 test/runners/php_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/chapel.docker

@@ -34,4 +34,4 @@ WORKDIR /runner
 USER codewarrior
 
 RUN mocha -t 10000 test/runners/chapel_spec.js
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/crystal.docker

@@ -44,3 +44,5 @@ ADD frameworks/crystal/formatter.cr /home/codewarrior/crystal/formatter.cr
 USER codewarrior
 
 RUN mocha -t 10000 test/runners/crystal_spec.js
+
+ENTRYPOINT ["node"]

docker/dart.docker

@@ -42,3 +42,5 @@ RUN ln -s /home/codewarrior /workspace
 USER codewarrior
 
 RUN mocha -t 10000 test/runners/dart_spec.js
+
+ENTRYPOINT ["node"]

docker/dotnet.docker

@@ -57,4 +57,4 @@ RUN mono -V
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/erlang.docker

@@ -56,4 +56,4 @@ RUN mocha -t 5000 test/runners/{erlang,elixir}_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/esolangs.docker

@@ -25,4 +25,4 @@ RUN mocha -t 10000 test/runners/bf_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/func.docker

@@ -34,4 +34,4 @@ RUN mocha -t 5000 test/runners/{ocaml,racket}_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/go.docker

@@ -52,4 +52,4 @@ RUN mocha -t 5000 test/runners/go_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "17", "node"]
+ENTRYPOINT ["node"]

docker/haskell.docker

@@ -28,7 +28,7 @@ RUN cabal update
 RUN cabal install cabal-install
 
 # Install Haskell Packages
-# To install additional packages use "RUN cabal install <pkg-name>" 
+# To install additional packages use "RUN cabal install <pkg-name>"
 RUN cabal install split ifelse
 RUN cabal install persistent-sqlite persistent-template
 RUN cabal install haskell-src-exts lens
@@ -38,7 +38,7 @@ RUN cabal install hspec hspec-core hspec-discover
 # Haskell stuff end.
 # =========================================================================
 
-# Add the package json first to a tmp directory and build, 
+# Add the package json first to a tmp directory and build,
 # copy over so that we dont rebuild every time
 USER root
 ADD package.json /tmp/package.json
@@ -55,4 +55,4 @@ RUN mocha -t 10000 test/runners/haskell_spec.js
 
 # timeout is a fallback in case an error with node
 # prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/julia.docker

@@ -51,4 +51,4 @@ RUN mocha -t 5000 test/runners/julia_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/jvm.docker

@@ -62,4 +62,4 @@ 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
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/lua.docker

@@ -32,4 +32,4 @@ RUN mocha -t 5000 test/runners/lua_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/node.docker

@@ -58,4 +58,4 @@ RUN mocha -t 10000 test/runners/typescript_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/objc.docker

@@ -149,4 +149,4 @@ RUN mocha -t 5000 test/runners/objc_spec.js
 
 # timeout is a fallback in case an error with node
 # prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/ocaml.docker

@@ -44,4 +44,4 @@ RUN /home/codewarrior/run_ocaml.sh mocha -t 5000 test/runners/ocaml_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["/home/codewarrior/run_ocaml.sh", "timeout", "15", "node"]
+ENTRYPOINT ["/home/codewarrior/run_ocaml.sh", "node"]

docker/python.docker

@@ -102,4 +102,4 @@ RUN mocha -t 5000 test/runners/python_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/ruby.docker

@@ -179,10 +179,10 @@ ENV USER codewarrior
 ENV HOME /home/codewarrior
 
 RUN mocha -t 5000 test/runners/ruby_spec.js
-#RUN mocha -t 5000 test/runners/sql_spec.js
 RUN mocha -t 5000 test/runners/shell_spec.js
+#RUN mocha -t 5000 test/runners/sql_spec.js
 RUN sh /runner/lib/cleanup.sh
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/rust.docker

@@ -26,3 +26,5 @@ RUN ln -s /home/codewarrior /workspace
 USER codewarrior
 
 RUN mocha -t 10000 test/runners/rust_spec.js
+
+ENTRYPOINT ["node"]

docker/swift.docker

@@ -72,4 +72,4 @@ RUN mocha -t 5000 test/runners/swift_spec.js
 
 # timeout is a fallback in case an error with node
 # prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

docker/systems.docker

@@ -60,4 +60,4 @@ RUN mocha -t 5000 test/runners/{c,cpp}_spec.js
 
 #timeout is a fallback in case an error with node
 #prevents it from exiting properly
-ENTRYPOINT ["timeout", "15", "node"]
+ENTRYPOINT ["node"]

frameworks/javascript/cw-2.js

@@ -256,18 +256,18 @@ try {
     // additional code is injected and line numbers will not match.
     trace: function(ex) {
       return (ex.stack || ex.toString() || '')
-                .toString()
-                // remove file names (ie: (/cli-runner/...))
-                .replace(/\s\(.*\)/g, '')
-                // remove at [eval] statements
-                .replace(/(at)*( Object.)*\s*[(]?\[eval\].*(:\d*)*[)]?\n/g, '')
-                // remove stack trace beyond the Module information
-                .replace(/at Module[\w\s.:\d\n]*/g, '')
-                // remove at Object.<anonymous>
-                .replace(/\t*at Object.<\w*>\n/g, '')
-                // handleError is used to wrap top level code, so lets remove it so that it doesn't
-                // confuse users who won't understand why it is there.
-                .replace('at Object.Test.handleError', '');
+        .toString()
+        // remove file names (ie: (/cli-runner/...))
+        .replace(/\s\(.*\)/g, '')
+        // remove at [eval] statements
+        .replace(/(at)*( Object.)*\s*[(]?\[eval\].*(:\d*)*[)]?\n/g, '')
+        // remove stack trace beyond the Module information
+        .replace(/at Module[\w\s.:\d\n]*/g, '')
+        // remove at Object.<anonymous>
+        .replace(/\t*at Object.<\w*>\n/g, '')
+        // handleError is used to wrap top level code, so lets remove it so that it doesn't
+        // confuse users who won't understand why it is there.
+        .replace('at Object.Test.handleError', '');
     },
     pass: function() {
       _expect(true);

frameworks/javascript/display.js

@@ -134,11 +134,11 @@ module.exports.format = function format(obj, options) {
  */
 module.exports.escapeHtml = function escapeHtml(html) {
   return String(html)
-        .replace(/&/g, '&')
-        .replace(/"/g, '"')
-        .replace(/'/g, ''')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;');
+    .replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
 };
 
 /**

lib/runners/arm.js

@@ -13,7 +13,7 @@ module.exports.run = function run(opts, cb) {
           solutionFile = util.codeWriteSync('arm', opts.solution + '\n', dir, 'solution.s'),
           objectFile = solutionFile.replace(/\.[^\.]+$/, '.o'),
           armCommand = ['arm-linux-gnueabi-as', solutionFile, '-o', objectFile].join(' '),
-        // Check for whether we need to link against libc
+          // Check for whether we need to link against libc
           linker = opts.solution.search(/\.glob[a]?l\W+_start/) == -1 ? "arm-linux-gnueabi-gcc-4.7" : "arm-linux-gnueabi-ld",
           linkerCommand = [linker, objectFile, '-o', executable].join(' ');
       util.exec(armCommand, function() {

lib/runners/c.js

@@ -36,13 +36,14 @@ module.exports.run = function run(opts, cb) {
     },
     sanitizeStdErr: function(error) {
       error = error || '';
-      return error.replace(/clang.*-std=c[^\s]+/g, '')
-                        .replace(/Error: Command failed:/g, '')
-                        .replace(/\/tmp.*(solution\.c|solution)[:0-9]*/g, '')
-                        .replace('\n', '')
-                        .replace('  ', ' ')
-                        .replace(opts.setup || '', '')
-                        .replace(opts.fixture || '', '');
+      return error
+        .replace(/clang.*-std=c[^\s]+/g, '')
+        .replace(/Error: Command failed:/g, '')
+        .replace(/\/tmp.*(solution\.c|solution)[:0-9]*/g, '')
+        .replace('\n', '')
+        .replace('  ', ' ')
+        .replace(opts.setup || '', '')
+        .replace(opts.fixture || '', '');
     }
   });
 };

lib/runners/chapel.js

@@ -15,6 +15,7 @@ module.exports.run = function run(opts, cb) {
       if (opts.setup) handleSetup(opts, dir);
       const executable = path.join(dir, 'solution');
       const solutionFile = util.codeWriteSync('chpl', opts.solution, dir, 'solution.chpl');
+
       compile([solutionFile, '-o', executable], function(error, stdout, stderr) {
         if (error) return fail(error, stdout, stderr);
         opts.publish('stdout', stdout);
@@ -30,20 +31,23 @@ module.exports.run = function run(opts, cb) {
         opts.solution,
         opts.fixture,
       ].join('\n'), dir, 'solution.chpl');
+
       compile([solutionFile, '-o', executable], function(error, stdout, stderr) {
         if (error) return fail(error, stdout, stderr);
         opts.publish('stdout', stdout);
+
         runCode({name: executable, args: []});
       });
     },
 
     sanitizeStdErr: function(error) {
       error = error || '';
-      return error.replace(/\/tmp.*(solution\.chpl|solution)[:0-9]*/g, '')
-                           .replace(/Error: Command failed:/g, '')
-                           .replace(/error: uncaught error/g, '')
-                           .replace('\n', '')
-                           .replace('  ', ' ');
+      return error
+        .replace(/\/tmp.*(solution\.chpl|solution)[:0-9]*/g, '')
+        .replace(/Error: Command failed:/g, '')
+        .replace(/error: uncaught error/g, '')
+        .replace('\n', '')
+        .replace('  ', ' ');
     }
   });
 };

lib/runners/clojure.js

@@ -21,9 +21,9 @@ module.exports.run = function run(opts, cb) {
     // HACK: don't know clojure well enough to fix issue within actual runner, but it is escaping line breaks when it shouldn't
     sanitizeStdOut: function(stdout) {
       return stdout
-                .replace(/\<:LF:\>\<PASSED::\>/g, '\n<PASSED::>')
-                .replace(/\<:LF:\>\<FAILED::\>/g, '\n<FAILED::>')
-                .replace(/\<:LF:\>\<ERROR::\>/g, '\n<ERROR::>');
+        .replace(/\<:LF:\>\<PASSED::\>/g, '\n<PASSED::>')
+        .replace(/\<:LF:\>\<FAILED::\>/g, '\n<FAILED::>')
+        .replace(/\<:LF:\>\<ERROR::\>/g, '\n<ERROR::>');
 
     }
   });

lib/runners/cpp.js

@@ -41,13 +41,14 @@ module.exports.run = function run(opts, cb) {
 
     sanitizeStdErr: function(error) {
       error = error || '';
-      return error.replace(/clang.*-std=c[^\s]+/g, '')
-                        .replace(/Error: Command failed:/g, '')
-                        .replace(/\/tmp.*(solution\.cpp|solution)[:0-9]*/g, '')
-                        .replace('\n', '')
-                        .replace('  ', ' ')
-                        .replace(opts.setup || '', '')
-                        .replace(opts.fixture || '', '');
+      return error
+        .replace(/clang.*-std=c[^\s]+/g, '')
+        .replace(/Error: Command failed:/g, '')
+        .replace(/\/tmp.*(solution\.cpp|solution)[:0-9]*/g, '')
+        .replace('\n', '')
+        .replace('  ', ' ')
+        .replace(opts.setup || '', '')
+        .replace(opts.fixture || '', '');
     }
   });
 };

lib/runners/fsharp.js

@@ -5,7 +5,7 @@ var shovel = require('../shovel'),
     csharpFrameworksPath = path.resolve(__dirname, '..', '..', 'frameworks', 'csharp'),
     fuchuPath = path.resolve(fsharpFrameworksPath, 'Fuchu', 'lib', 'Fuchu'),
 
-  // Fuchu references exception classes from these libs
+    // Fuchu references exception classes from these libs
     nunitAssemblies = ['nunit.core.dll', 'nunit.core.interfaces.dll', 'nunit.util.dll', 'nunit.framework.dll', 'Newtonsoft.Json.dll', 'Qualified.dll'],
     nunitPath = path.resolve(csharpFrameworksPath, 'nunit', 'bin'),
     gallioPath = path.resolve(fsharpFrameworksPath, 'Gallio', 'lib', 'NET40'),

lib/runners/gas.js

@@ -13,7 +13,7 @@ module.exports.run = function(opts, cb) {
           solutionFile = util.codeWriteSync('gas', opts.solution + '\n', dir, 'solution.s'),
           objectFile = solutionFile.replace(/\.[^\.]+$/, '.o'),
           gasCommand = ['gcc', '-c', solutionFile, '-o', objectFile].join(' '),
-        // Check for whether we need to link against libc
+          // Check for whether we need to link against libc
           linker = opts.solution.search(/\.global\W+_start/) == -1 ? "gcc" : "ld",
           linkerCommand = [linker, objectFile, '-o', executable].join(' ');
       util.exec(gasCommand, function() {

lib/runners/haskell.js

@@ -20,8 +20,9 @@ module.exports.run = function run(opts, cb) {
       if (opts.setup) codeWriteSync('haskell', opts.setup, haskellCodeDir);
       var solutionFileName = codeWriteSync('haskell', opts.solution, haskellCodeDir, "Main.hs"),
           fixtureFileName = solutionFileName.split('/').pop() == "Main.hs" ?
-                    codeWriteSync('haskell', opts.fixture, haskellCodeDir) :
-                    codeWriteSync('haskell', opts.fixture, haskellCodeDir, "Main.hs");
+            codeWriteSync('haskell', opts.fixture, haskellCodeDir) :
+            codeWriteSync('haskell', opts.fixture, haskellCodeDir, "Main.hs");
+
       process.env["solutionFileName"] = solutionFileName;
 
       runCode({

lib/runners/javascript.js

@@ -40,12 +40,13 @@ module.exports.run = function run(opts, cb) {
     },
     sanitizeStdErr: function(error) {
       error = error || '';
-      return error.replace(/(\()?\/codewars\/[(\w\/-\d.js:) ;]*/g, '')
-                        .replace(/( Object. )?[\(]?\[eval\][-:\w\d\)]* at/g, '')
-                        .replace(/Module._compile.*/g, '')
-                        .replace('Object.Test.handleError ', '')
-                        .replace(opts.setup || '', '')
-                        .replace(opts.fixture || '', '');
+      return error
+        .replace(/(\()?\/codewars\/[(\w\/-\d.js:) ;]*/g, '')
+        .replace(/( Object. )?[\(]?\[eval\][-:\w\d\)]* at/g, '')
+        .replace(/Module._compile.*/g, '')
+        .replace('Object.Test.handleError ', '')
+        .replace(opts.setup || '', '')
+        .replace(opts.fixture || '', '');
     },
     sanitizeStdOut: function(stdout) {
       return this.sanitizeStdErr(stdout);

lib/runners/lisp.js

@@ -7,7 +7,7 @@ module.exports.run = function run(opts, cb) {
   var lispCodeDir = temp.mkdirSync('lisp'),
       args = [
         '--noinform', // Disable banner
-        '--disable-ldb',  // Disable the low-level debugger
+        '--disable-ldb', // Disable the low-level debugger
         '--lose-on-corruption', // Don't try to recover
         '--non-interactive' // No REPL
       ];

lib/runners/nasm.js

@@ -14,7 +14,7 @@ module.exports.run = function run(opts, cb) {
           solutionFile = util.codeWriteSync('nasm', opts.solution + '\n', dir, 'solution.asm'),
           nasmCommand = ['nasm', '-felf64', solutionFile].join(' '),
           objectFile = solutionFile.replace(/\.[^\.]+$/, '.o'),
-        // Check for whether we need to link against libc
+          // Check for whether we need to link against libc
           linker = opts.solution.search(/global\W+_start/) == -1 ? "gcc" : "ld",
           linkerCommand = [linker, objectFile, '-o', executable].join(' ');
       util.exec(nasmCommand, function() {