mumuki-gobstones-runner 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 484ea53637cf6bfc666f5d15fbd1b3e244bfd7035c6b7d3fbce7529977b1640d
-  data.tar.gz: 562e301290aff2f265e659c0e0f941596bda18d5991025e2b03c6b731b92698e
+  metadata.gz: a25c116e5577d9a6ec6bd39ea1c385f5f6cbfbd11348aa5d5a3c4370536d6c99
+  data.tar.gz: 2b7b816e3347a90bdcd49d5273d7eb3d53e5e6a0f101b591951cf8d21a038cea
 SHA512:
-  metadata.gz: 8735d5544a16ed4ef1920b32922970906355e10099fd270df8c5b2aa30836aeeb96d39a5af4bf3b7171f0583f028dd25f1bd56fb42eed8605fbe2b1b95e8ae69
-  data.tar.gz: 02015b374dfe27bc2b136d0194c44de7f63aeab5cc7dbe491c28f5172e43a5a95506e9c31d490f6fd2209debeac4c8c4a0ba9e99041fd1696d786d2a6e98a133
+  metadata.gz: ccb9d74307dd8e4e7a0a92ccfd984ddf5c8815f4ff1e6cbf0c05fa952fc48a21216c1d6dabccfd300f592fe4a9f6f6ca3c6d144e9e9382fbd7e6aa7dcfdf00df
+  data.tar.gz: 7d0909dd929f4812c02e45c761d70f3d5a2422bc47da3203335422817557355b5907bfeb3eaea93e4e67e03b31147c05e2cf3d0726a148a0304c48acc95901ee

data/lib/precompile_hook.rb

@@ -1,6 +1,8 @@
 class GobstonesPrecompileHook < Mumukit::Templates::FileHook
   attr_accessor :batch
 
+  DEFAULT_TIMEOUT = 2
+
   structured true
   isolated true
 
@@ -17,7 +19,11 @@ class GobstonesPrecompileHook < Mumukit::Templates::FileHook
   end
 
   def timeout_argument
-    "--timeout #{(Mumukit.config.command_time_limit - 1) * 1000}"
+    "--timeout " + timeout.to_s
+  end
+
+  def timeout
+    (ENV['MUMUKI_GOBSTONES_TIMEOUT'] || DEFAULT_TIMEOUT).to_i * 1000
   end
 
   def compile(request)

data/lib/render/editor/editor.html

@@ -48,7 +48,6 @@
       },
 
       attached: function () {
-
         const setBlocklySounds = () => {
           Blockly.WorkspaceAudio.prototype.preload = () => {
             for (var soundName in this.SOUNDS_) {
@@ -110,13 +109,13 @@
         const updateFields = () => {
           const blockly = this.getBlockly();
 
-          const editorValue = $("#mu-custom-editor-value")[0];
+          const editorValue = this.getEditorValue();
           if (editorValue) {
             editorValue.value = blockly.workspaceXml;
           }
 
           if (this.teacherMode) {
-            const editorExtra = $("#mu-custom-editor-extra")[0];
+            const editorExtra = this.getEditorExtra();
             if (editorExtra) {
               editorExtra.value = blockly.workspaceXml;
             }
@@ -207,18 +206,34 @@
       },
 
       getStudentXml: function () {
-        return $("#mu-custom-editor-value")[0].value || "";
+        return this.getEditorValue().value || "";
       },
 
       getTeacherCode: function () {
-        const teacherXml = $("#mu-custom-editor-extra")[0];
+        const teacherXml = this.getEditorExtra();
         if (!teacherXml || !teacherXml.value) return;
         this.$.blocklyTmp.workspaceXml = teacherXml.value;
         return this.$.blocklyTmp.generateCode();
       },
 
+      getEditorValue: function() {
+        return $("#mu-custom-editor-value")[0];
+      },
+
+      getEditorDefaultValue: function() {
+        return $("#mu-custom-editor-default-value")[0];
+      },
+
+      getEditorExtra: function() {
+        return $("#mu-custom-editor-extra")[0];
+      },
+
+      getEditorTest: function() {
+        return $("#mu-custom-editor-test")[0];
+      },
+
       _setInitialXml: function (blockly) {
-        const editorDefaultContent = $("#mu-custom-editor-default-value")[0];
+        const editorDefaultContent = this.getEditorDefaultValue();
         if (editorDefaultContent && editorDefaultContent.value) {
           blockly.initialXml = editorDefaultContent.value;
         } else {
@@ -228,7 +243,7 @@
 
       _initializeWorkspace: function(blockly, callback) {
         postpone(() => {
-          const value = $("#mu-custom-editor-value")[0].value;
+          const value = this.getEditorValue().value;
 
           blockly.workspaceXml = value || (
             this.teacherMode
@@ -504,6 +519,17 @@
       },
 
       _showError: function (region, error) {
+        const expectsTimeout = /expect_endless_while *: *true/.test(
+          this._getEditor().getEditorTest().value
+        );
+
+        const isExpectedTimeout = (
+          error.reason && error.reason.code === "timeout" &&
+          expectsTimeout
+        );
+
+        if (isExpectedTimeout) return;
+
         this._getBlockly().showBlockError(region, error.message);
       },
 

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '1.10.1'
+  VERSION = '1.10.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit