Ruby/BF/Chapel Updates

docker/ruby.docker

@@ -129,11 +129,9 @@ RUN gem install statsample-timeseries --no-ri --no-rdoc
 RUN gem install stuff-classifier --no-ri --no-rdoc
 RUN gem install symbolic --no-ri --no-rdoc
 RUN gem install unit --no-ri --no-rdoc
-
 RUN gem install chronic --no-ri --no-rdoc
-
-# partner packages
 RUN gem install ably --no-ri --no-rdoc
+RUN gem install bcrypt --no-ri --no-rdoc
 
 USER codewarrior
 

lib/runners/bf.js

@@ -15,6 +15,7 @@ module.exports.run = function run(opts, cb) {
         case 'cw-2':
           var fixture = `
 require('/runner/frameworks/javascript/cw-2');
+${opts.setup};
 const runBF = require('/runner/frameworks/bf/run-bf.js');
 ${opts.fixture};
 `;

lib/runners/chapel.js

@@ -12,9 +12,9 @@ module.exports.run = function run(opts, cb) {
   const dir = temp.mkdirSync('chpl');
   shovel.start(opts, cb, {
     solutionOnly: function(runCode, fail) {
-      if (opts.setup) handleSetup(opts, dir);
+      const code = [opts.setup, opts.solution].filter(l => !!l).join("\n");
       const executable = path.join(dir, 'solution');
-      const solutionFile = util.codeWriteSync('chpl', opts.solution, dir, 'solution.chpl');
+      const solutionFile = util.codeWriteSync('chpl', code, dir, 'solution.chpl');
 
       compile([solutionFile, '-o', executable], function(error, stdout, stderr) {
         if (error) return fail(error, stdout, stderr);
@@ -24,10 +24,10 @@ module.exports.run = function run(opts, cb) {
     },
 
     testIntegration: function(runCode, fail) {
-      if (opts.setup) handleSetup(opts, dir);
       const executable = path.join(dir, 'solution');
       const solutionFile = util.codeWriteSync('chpl', [
         cw2,
+        opts.setup,
         opts.solution,
         opts.fixture,
       ].join('\n'), dir, 'solution.chpl');
@@ -56,7 +56,3 @@ module.exports.run = function run(opts, cb) {
 function compile(args, cb) {
   exec(`chpl ${args.join(' ')}`, cb);
 }
-
-function handleSetup(opts, dir) {
-  opts.solution = opts.setup + '\n' + opts.solution;
-}