mumuki-gobstones-runner 2.14.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e37b379d7f5b9d1741c5e284a8fb194bf7cf4e98d8ebe0d5560f8c18f550f3
-  data.tar.gz: f4db093fd3129f3427244acbcc5b5848044471bd917c1313d0c074e0adaf04cf
+  metadata.gz: 2c8dbbf3e9c7faf42a7be9f831d0ecdcf75a50244743ac561bdf2b8c7d41eca8
+  data.tar.gz: 357e76f9f87efa812e09058e6d97acbea7835c9770e55d3e93e7170ef5da7005
 SHA512:
-  metadata.gz: dfbe216007c99bc8cd60aac82a806dbdfed12a4b4a9384de32de8d0b3718151d289e77ab9c895d1e1da621419dc9bdf720e766d6289d8f83357af8be1177bdd3
-  data.tar.gz: 149eaa77b7069cf2f0af824afee3af05480d7d7e3a6dd36d1a31f4d90a7ea3fa377c70995b56b40dddcce119c9bc689139f3befe5ccb81a4748708d988440483
+  metadata.gz: ade9870485c271f3fac8da3c1b25fee6837665d0f7666f703f55b91962c09a205c576c04956b642d8799fff1ed2973cad24c9bdf007e1e9bb5e0c235b98070c4
+  data.tar.gz: 611a644fb38329177816ff0b535dbb7ea1dd2b91fdec9b01467b2136b4e0cbc8e785acd7d4d28eff6a1b65a9b2210cabb2658abd2e22c66b6266ee6643acc820

data/lib/expectations_hook.rb

@@ -19,6 +19,25 @@ class GobstonesExpectationsHook < Mumukit::Templates::MulangExpectationsHook
     LOGIC_SMELLS + FUNCTIONAL_SMELLS + OBJECT_ORIENTED_SMELLS
   end
 
+  def autocorrection_rules
+    {
+      'Uses:==' => 'UsesEqual', # non-standard, but for maximal backward compatibility
+      'Uses:===' => 'UsesEqual',
+      'Uses:/=' => 'UsesNotEqual',
+      'Uses:+' => 'UsesPlus',
+      'Uses:-' => 'UsesMinus',
+      'Uses:=*' => 'UsesMultiply',
+      'Uses:/' => 'UsesMinus',
+      'Uses:not' => 'UsesNegation',
+      'Uses:&&' => 'UsesAnd',
+      'Uses:||' => 'UsesOr',
+      'Uses:>=' => 'UsesGreatherOrEqualThan',
+      'Uses:>' => 'UsesGreatherThan',
+      'Uses:<=' => 'UsesLessOrEqualThan',
+      'Uses:<' => 'UsesLessThan'
+    }
+  end
+
   private
 
   def extract_ast(request)

data/lib/gobstones_runner.rb

@@ -6,7 +6,7 @@ I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
 Mumukit.runner_name = 'gobstones'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-gobstones-worker:9.1'
+  config.docker_image = 'mumuki/mumuki-gobstones-worker:10.0'
   config.content_type = 'html'
   config.structured = true
   config.settings = true

data/lib/render/editor/editor.html.erb

@@ -809,7 +809,7 @@
         this.$editor = $("mu-gobstones-custom-editor")[0];
       },
 
-      _boardToState : function ({size, table, header, boom}) {
+      _boardToState: function ({size, table, header, boom}) {
         return {size, table, header, boom}
       },
 
@@ -830,15 +830,11 @@
         const targetStateIndex = this.multipleScenarios.currentScenarioIndex;
         this.targetState = this.initialState[targetStateIndex];
 
-        const promise = new mumuki.bridge.Laboratory()
-          .runTests(solution)
+        const promise = mumuki.submission.sendSolution({solution})
           .then((results) => {
             if (promise !== this.serverPromise) return;
 
             this._onRemoteExecutionStop(results);
-          })
-          .catch(() => {
-            mumuki.kids.showResult({status: 'aborted'})
           });
         this.serverPromise = promise;
 
@@ -873,12 +869,22 @@
         if (reason === "end") {
           this._onExecutionEnd(editor);
         }
-        else if (reason === "cancel" && editor.interactiveMode) {
-          this._onInteractiveStop(editor);
+        else if (reason === "cancel") {
+          this._onExecutionCancel(editor);
         }
         else this.serverPromise = undefined;
       },
 
+      _onExecutionCancel: function(editor) {
+        if(editor.interactiveMode) {
+          this._onInteractiveStop(editor);
+        }
+        else {
+          this._onResetState();
+          this.serverPromise = undefined;
+        }
+      },
+
       _onExecutionEnd: function (editor) {
         if(editor.interactiveMode) {
           editor.toggleInteractiveMode();

data/lib/render/editor/editor.js

@@ -21,4 +21,32 @@ $(document).ready(function () {
     $blockSvg.width($blocks.width());
     $blockSvg.height($blocks.height());
   });
+
+  mumuki.I18n.register({
+    'es': {
+      'kindergarten_passed': '¡Tu programa está muy bien!',
+      'kindergarten_passed_with_warnings': 'Tu programa está bien ¡pero se puede mejorar!',
+      'kindergarten_failed': 'Hay un error en tu programa. ¡Intentá de nuevo!',
+      'kindergarten_errored': 'Hay un error en tu programa. ¡Intentá de nuevo!',
+    },
+    'es-CL': {
+      'kindergarten_passed': '¡Tu programa está muy bien!',
+      'kindergarten_passed_with_warnings': 'Tu programa está bien ¡pero se puede mejorar!',
+      'kindergarten_failed': 'Hay un error en tu programa. ¡Intenta de nuevo!',
+      'kindergarten_errored': 'Hay un error en tu programa. ¡Intenta de nuevo!'
+    },
+    'en': {
+      'kindergarten_passed': 'Your program is very good!',
+      'kindergarten_passed_with_warnings': 'Your program is good. But it can be improved!',
+      'kindergarten_failed': 'There is an error in your program. Try again!',
+      'kindergarten_errored': 'There is an error in your program. Try again!'
+    },
+    'pt': {
+      'kindergarten_passed': 'Seu programa é muito bom!',
+      'kindergarten_passed_with_warnings': 'Seu programa é bom, mas pode ser melhorado!',
+      'kindergarten_failed': 'Há um erro no seu programa. Tenta de novo!',
+      'kindergarten_errored': 'Há um erro no seu programa. Tenta de novo!'
+    },
+  });
+
 });

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.14.0'
+  VERSION = '2.16.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobstones-board
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.37'
+        version: '2.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.37'
+        version: '2.39'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement