mumuki-gobstones-runner 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25c116e5577d9a6ec6bd39ea1c385f5f6cbfbd11348aa5d5a3c4370536d6c99
-  data.tar.gz: 2b7b816e3347a90bdcd49d5273d7eb3d53e5e6a0f101b591951cf8d21a038cea
+  metadata.gz: 3199fbffe852edccab69f24303b07c4d177902f5fbcc60e8440c88dbd8f7b25c
+  data.tar.gz: c105259943ecac7f90d24a1a7e4dc775546247b795bafc68fd5f64934b6e39e6
 SHA512:
-  metadata.gz: ccb9d74307dd8e4e7a0a92ccfd984ddf5c8815f4ff1e6cbf0c05fa952fc48a21216c1d6dabccfd300f592fe4a9f6f6ca3c6d144e9e9382fbd7e6aa7dcfdf00df
-  data.tar.gz: 7d0909dd929f4812c02e45c761d70f3d5a2422bc47da3203335422817557355b5907bfeb3eaea93e4e67e03b31147c05e2cf3d0726a148a0304c48acc95901ee
+  metadata.gz: 7005215585bd9fbc9427edc5b4e24ae7164e8e42a45d8b260324f047bf0871e7c8f047cd3c0aaeb64414d515ac75c535bd6a1aad4ec1257958f60a112db74673
+  data.tar.gz: d7b6921fdbbb445704febd35d6711dbd900cecc4ed7d2d6c03e05feca5bb9e1ef4ed0a9fe8e0877b2210b3b1a0448512bba29cf849d3058a6dbbdd4b8c6124a6

data/lib/assets_server.rb

@@ -31,9 +31,9 @@ class Mumukit::Server::App < Sinatra::Base
     get_asset route, File.join(__dir__, '..', path), type
   end
 
-  get_board_asset 'polymer.html', 'htmls/vendor/polymer.html', 'text/html'
-  get_board_asset 'polymer-mini.html', 'htmls/vendor/polymer-mini.html', 'text/html'
-  get_board_asset 'polymer-micro.html', 'htmls/vendor/polymer-micro.html', 'text/html'
+  ['polymer', 'polymer-mini', 'polymer-micro'].each { |name|
+    get_board_asset "#{name}.html", "htmls/vendor/#{name}.html", 'text/html'
+  }
   get_board_asset 'gs-board.html', 'htmls/gs-board.html', 'text/html'
 
   get_editor_asset 'editor/gs-element-blockly.html', 'htmls/gs-element-blockly.html', 'text/html'
@@ -44,6 +44,7 @@ class Mumukit::Server::App < Sinatra::Base
   get_local_asset 'editor/editor.css', 'lib/render/editor/editor.css', 'text/css'
   get_local_asset 'editor/editor.html', 'lib/render/editor/editor.html', 'text/html'
   get_local_asset 'boom.png', 'lib/public/boom.png', 'image/png'
-  get_local_asset 'editor/attires_enabled.svg', 'lib/public/attires_enabled.svg', 'image/svg+xml'
-  get_local_asset 'editor/attires_disabled.svg', 'lib/public/attires_disabled.svg', 'image/svg+xml'
+  ['red', 'blue', 'green', 'black', 'attires_enabled', 'attires_disabled'].each { |name|
+    get_local_asset "editor/#{name}.svg", "lib/public/#{name}.svg", 'image/svg+xml'
+  }
 end

data/lib/checker.rb

@@ -10,11 +10,7 @@ module Gobstones
       status = output[:status]
       result = output[:result]
 
-      is_expected_timeout = result[:finalBoardError] &&
-                                    result[:finalBoardError][:reason][:code] == 'timeout' &&
-                                    @options[:expect_endless_while]
-
-      return if is_expected_timeout
+      return if is_expected_timeout(result)
       assert_not_boom status, result
 
       expected_board = result[:extraBoard]
@@ -40,6 +36,8 @@ module Gobstones
       status = output[:status]
       result = output[:result]
 
+      return if is_expected_timeout(result)
+
       fail_with status: :check_error_failed_expected_boom,
                 result: {
                   initial: result[:initialBoard],
@@ -97,6 +95,12 @@ module Gobstones
                 } if status == :runtime_error
     end
 
+    def is_expected_timeout(result)
+      result[:finalBoardError] &&
+      result[:finalBoardError][:reason][:code] == 'timeout' &&
+      @options[:expect_endless_while]
+    end
+
     def fail_with(error)
       fail error.to_json
     end

data/lib/gobstones_runner.rb

@@ -5,7 +5,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:2.0'
+  config.docker_image = 'mumuki/mumuki-gobstones-worker:3.0'
   config.content_type = 'html'
   config.structured = true
 end

data/lib/precompile_hook.rb

@@ -47,7 +47,7 @@ class GobstonesPrecompileHook < Mumukit::Templates::FileHook
   def post_process_file(_file, result, status)
     if status == :passed
       result = result.parse_as_json
-      status = :aborted if is_timeout? result and !@batch.options[:expect_endless_while]
+      status = :aborted if is_timeout? result and !expects_timeout?
     end
 
     [result, status]
@@ -55,6 +55,10 @@ class GobstonesPrecompileHook < Mumukit::Templates::FileHook
 
   private
 
+  def expects_timeout?
+    @batch.options[:expect_endless_while] || @batch.examples.any? { |it| it[:postconditions][:error] == 'timeout' }
+  end
+
   def is_timeout?(result)
     result[0]&.dig(:result, :finalBoardError, :reason, :code) === 'timeout'
   end