mumuki-gobstones-runner 1.0.1 → 1.1.0

data/lib/gobstones_runner.rb

@@ -1,13 +1,26 @@
 require 'mumukit'
+require 'erb'
+
+I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
 Mumukit.runner_name = 'gobstones'
 Mumukit.configure do |config|
-  config.structured = true
+  config.docker_image = 'mumuki/mumuki-gobstones-worker:1.0'
   config.content_type = 'html'
+  config.structured = true
 end
 
-require 'active_support/all'
-require_relative './stones_spec'
-require_relative './test_hook'
+require_relative './gobstones'
+require_relative './extensions/string'
+require_relative './assets_server'
+require_relative './render/with_renderer'
+require_relative './render/html_board'
+require_relative './render/html_renderer'
+
+require_relative './multiple_executions_runner'
+
 require_relative './metadata_hook'
+require_relative './precompile_hook'
+require_relative './test_hook'
 require_relative './expectations_hook'
+require_relative './checker'

data/lib/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  actual_board: 'Actual final board'
+  check_failed_unexpected_boom: 'The program did BOOM.'
+  check_final_board_failed_different_boards: 'A different board was obtained'
+  check_error_failed_expected_boom: 'The program was expected to BOOM but a final board was obtained.'
+  check_error_failed_another_reason: 'The program was expected to fail by <strong>%{expected_code}</strong>, but it failed by another reason.'
+  check_return_failed_different_values: '<strong>%{expected_value}</strong> was expected but <strong>%{actual_value}</strong> was obtained.'
+  check_return_failed_no_return: '<strong>%{expected_value}</strong> was expected but no value was obtained.'
+  code_no_stones: 'No stones left'
+  code_out_of_board: 'Out of board'
+  expected_board: 'Expected final board'
+  final_board: 'Final board'
+  initial_board: 'Initial board'

data/lib/locales/es.yml

@@ -0,0 +1,13 @@
+es:
+  actual_board: 'Tablero final obtenido'
+  check_failed_unexpected_boom: 'El programa hizo BOOM.'
+  check_final_board_failed_different_boards: 'Se obtuvo un tablero distinto al esperado.'
+  check_error_failed_expected_boom: 'Se esperaba que el programa hiciera BOOM, pero se ejecutó normalmente.'
+  check_error_failed_another_reason: 'Se esperaba que el programa hiciera BOOM por <strong>%{expected_code}</strong> pero falló por otro motivo.'
+  check_return_failed_different_values: 'Se esperaba <strong>%{expected_value}</strong> pero se obtuvo <strong>%{actual_value}</strong>.'
+  check_return_failed_no_return: 'Se esperaba <strong>%{expected_value}</strong> pero no se obtuvo ningún valor.'
+  code_no_stones: 'falta de bolitas disponibles'
+  code_out_of_board: 'caída del tablero'
+  expected_board: 'Tablero final esperado'
+  final_board: 'Tablero final'
+  initial_board: 'Tablero inicial'

data/lib/metadata_hook.rb

@@ -1,16 +1,38 @@
 class GobstonesMetadataHook < Mumukit::Hook
   def metadata
-    {language: {
+    {
+      language: {
         name: 'gobstones',
         icon: {type: 'devicon', name: 'gobstones'},
-        version: '1.4.1',
+        version: 'v1.0.0',
         extension: 'gbs',
         ace_mode: 'gobstones',
         graphic: true
-    },
-     test_framework: {
-         name: 'stones-spec',
-         test_extension: 'yml'
-     }}
+      },
+      layout_assets_urls: {
+        js: [
+          'assets/webcomponents.js'
+        ],
+        html: [
+          'assets/polymer.html',
+          'assets/gs-board.html'
+        ]
+      },
+      editor_assets_urls: {
+        js: [
+          'assets/editor/editor.js'
+        ],
+        html: [
+          'assets/editor/editor.html',
+        ],
+        css: [
+          'assets/editor/editor.css'
+        ]
+      },
+      test_framework: {
+        name: 'metatest',
+        test_extension: 'yml'
+      }
+    }
   end
 end

data/lib/multiple_executions_runner.rb

@@ -0,0 +1,28 @@
+module Gobstones
+  class MultipleExecutionsRunner
+    def run(output, example)
+      execution = output[example[:id]]
+      execution[:status] = execution[:status].to_sym
+
+      raise Mumukit::Metatest::Errored, error_message(execution) unless success?(execution)
+      execution
+    end
+
+    private
+
+    def success?(execution)
+      [:passed, :runtime_error].include? execution[:status]
+    end
+
+    def error_message(execution)
+      return format execution.except(:result).to_json if execution[:status] != :compilation_error
+
+      error = execution[:result][:finalBoardError]
+      format Gobstones.build_error(error)
+    end
+
+    def format(error)
+      "<pre>#{error}</pre>"
+    end
+  end
+end

data/lib/precompile_hook.rb

@@ -0,0 +1,30 @@
+class GobstonesPrecompileHook < Mumukit::Templates::FileHook
+  attr_accessor :batch
+
+  structured true
+  isolated true
+
+  def tempfile_extension
+    '.json'
+  end
+
+  def command_line(filename)
+    "gobstones-cli --batch #{filename}"
+  end
+
+  def compile(request)
+    file = super request
+
+    struct request.to_h.merge batch: @batch,
+                              result: run!(file)
+  end
+
+  def compile_file_content(request)
+    @batch = Gobstones::BatchParser.parse(request)
+    @batch.to_json
+  end
+
+  def post_process_file(_file, result, status)
+    [result.parse_as_json, status]
+  end
+end

data/lib/render/boards.html.erb

@@ -0,0 +1,58 @@
+<style>
+
+  .boards-container {
+    display: inline-flex;
+  }
+
+  .error-text {
+    color: #d9534f;
+  }
+
+  .boom-text {
+    margin-top: 20px;
+  }
+
+  .title {
+    color: #b4bcc2;
+    text-align: left;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+  }
+
+  .board {
+    margin: 0 15px;
+  }
+
+</style>
+
+<% if @result[:error] %>
+  <p class="error-text">
+    <%=I18n.t @result[:error], @result %>
+  </p>
+<% end %>
+
+<div class="boards-container">
+
+  <% @result[:boards].each do |it| %>
+    <div class="board">
+      <p class="title"><%=I18n.t it.title %></p>
+      <p>
+        <% if it.board.boom %>
+          <img src="<%= @boom_image %>" />
+        <% else %>
+          <gs-board>
+            <%= it.board.gbb %>
+          </gs-board>
+        <% end %>
+      </p>
+    </div>
+  <% end %>
+
+</div>
+
+<% if @result[:reason] %>
+  <div class="boom-text">
+    <strong>BOOM</strong>
+    <pre><%=@result[:reason]%></pre>
+  </div>
+<% end %>

data/lib/render/editor/editor.css

@@ -0,0 +1,12 @@
+#blocklyDiv {
+  height: 400px !important;
+  width: 555px !important;
+}
+
+.blocklyTrash {
+  display: none;
+}
+
+.blocklyZoom {
+  display: none;
+}

data/lib/render/editor/editor.js

@@ -0,0 +1,9 @@
+$(document).ready(() => {
+  $("#custom-editor").html("<gs-element-blockly />");
+
+  const blockly = $("gs-element-blockly")[0];
+
+  blockly.workspace.addChangeListener(() => {
+    $("#custom-editor-value")[0].value = blockly.generateCode();
+  });
+});

data/lib/render/html_board.rb

@@ -0,0 +1,12 @@
+require "base64"
+
+module Gobstones
+  class HtmlBoard
+    attr_reader :gbb, :boom
+
+    def initialize(board, boom = false)
+      @gbb = board[:table][:gbb]
+      @boom = boom
+    end
+  end
+end

data/lib/render/html_renderer.rb

@@ -0,0 +1,95 @@
+require "base64"
+
+module Gobstones
+  class HtmlRenderer
+    def initialize(options)
+      @options = options
+      @boom_image = encode_image_png 'boom'
+    end
+
+    def render_success(result)
+      bind_result boards: prepare_boards([:initial, :final], result),
+                  reason: prepare_reason(result[:reason])
+    end
+
+    def render_error_check_final_board_failed_different_boards(result)
+      bind_result error: :check_final_board_failed_different_boards,
+                  boards: prepare_boards([:initial, :expected, :actual], result)
+    end
+
+    def render_error_check_failed_unexpected_boom(result)
+      bind_result error: :check_failed_unexpected_boom,
+                  boards: prepare_boards([:initial, :expected, :actual], result),
+                  reason: prepare_reason(result[:reason])
+    end
+
+    def render_error_check_error_failed_expected_boom(result)
+      bind_result error: :check_error_failed_expected_boom,
+                  boards: prepare_boards([:initial, :expected, :final], result)
+    end
+
+    def render_error_check_return_failed_no_return(result)
+      bind_result error: :check_return_failed_no_return,
+                  boards: prepare_boards([:initial], result),
+                  expected_value: result[:expected_value]
+    end
+
+    def render_error_check_return_failed_different_values(result)
+      bind_result error: :check_return_failed_different_values,
+                  boards: prepare_boards([:initial], result),
+                  expected_value: result[:expected_value],
+                  actual_value: result[:actual_value]
+    end
+
+    def render_error_check_error_failed_another_reason(result)
+      bind_result error: :check_error_failed_another_reason,
+                  expected_code: I18n.t("code_#{result[:expected_code]}"),
+                  reason: prepare_reason(result[:reason])
+    end
+
+    private
+
+    def prepare_reason(reason)
+      return unless reason
+      Gobstones::build_error(reason)
+    end
+
+    def prepare_boards(names, result)
+      visible_names(names, result).map do |it|
+        struct title: "#{it}_board".to_sym,
+               board: visible_board(result, it)
+      end
+    end
+
+    def visible_names(names, result)
+      names.reject do |it|
+        must_show = @options["show_#{it}_board".to_sym]
+        !must_show.nil? && !must_show
+      end
+    end
+
+    def visible_board(result, name)
+      board = result[name]
+
+      if board == 'boom'
+        HtmlBoard.new(result[:initial], boom: true)
+      else
+        HtmlBoard.new(board)
+      end
+    end
+
+    def encode_image_png(file_name)
+      base64 = Base64.strict_encode64 File.read(Gobstones::Board.assets_path_for("htmls/components/#{file_name}.png"))
+      "data:image/png;base64,#{base64}"
+    end
+
+    def bind_result(result)
+      @result = { boards: [] }.merge result
+      template_file.result binding
+    end
+
+    def template_file
+      ERB.new File.read("#{__dir__}/boards.html.erb")
+    end
+  end
+end

data/lib/render/with_renderer.rb

@@ -0,0 +1,22 @@
+module Gobstones
+  module WithRenderer
+    def render_success_output(output)
+      result = output[:result]
+
+      renderer.render_success initial: result[:initialBoard],
+                              final: result[:finalBoard] || 'boom',
+                              reason: result[:finalBoardError]
+    end
+
+    def render_error_output(_output, error)
+      report = error.parse_as_json
+      renderer.send "render_error_#{report[:status]}", report[:result]
+    end
+
+    private
+
+    def renderer
+      @renderer ||= Gobstones::HtmlRenderer.new(@options)
+    end
+  end
+end

data/lib/test_hook.rb

@@ -1,24 +1,11 @@
-require 'mumukit'
-require 'yaml'
-
-require_relative 'stones_spec'
-require_relative 'with_test_parser'
-
-class GobstonesTestHook < Mumukit::Hook
-  include WithTestParser
-
-  def compile(request)
-    test = parse_test request
-    test[:source] = "#{request[:content]}\n#{request[:extra]}".strip
-    test[:check_head_position] = !!test[:check_head_position]
-    test
-  end
-
-  def run!(test_definition)
-    StonesSpec::Gobstones.configure do |config|
-      config.gbs_command = gobstones_command
+class GobstonesTestHook < Mumukit::Defaults::TestHook
+  def run!(request)
+    output, status = request.result
+
+    if status == :passed
+      request.batch.run_tests! output
+    else
+      request.result
     end
-
-    StonesSpec::Runner.new.run!(test_definition)
   end
 end

metadata

@@ -1,160 +1,171 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
-- Franco Leonardo Bulgarelli
+- Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
-  name: mumukit-inspection
+  name: sinatra-cross_origin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: ruby-stones
+  name: gobstones-board
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: gobstones-blockly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 description: 
 email:
-- franco@mumuki.org
+- rodri042@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/assets/boom.png
+- lib/assets_server.rb
+- lib/checker.rb
 - lib/expectations_hook.rb
+- lib/extensions/string.rb
+- lib/gobstones.rb
+- lib/gobstones/batch.rb
+- lib/gobstones/batch_parser.rb
+- lib/gobstones/error_builder.rb
+- lib/gobstones/example_code_builder.rb
 - lib/gobstones_runner.rb
+- lib/locales/en.yml
+- lib/locales/es.yml
 - lib/metadata_hook.rb
-- lib/stones_spec.rb
-- lib/stones_spec/error_message_parser.rb
-- lib/stones_spec/example.rb
-- lib/stones_spec/gobstones.rb
-- lib/stones_spec/hash.rb
-- lib/stones_spec/html_board_renderer.rb
-- lib/stones_spec/postcondition/expected_boom.rb
-- lib/stones_spec/postcondition/expected_final_board.rb
-- lib/stones_spec/postcondition/expected_return_value.rb
-- lib/stones_spec/postcondition/postcondition.rb
-- lib/stones_spec/precondition.rb
-- lib/stones_spec/runner.rb
-- lib/stones_spec/string.rb
-- lib/stones_spec/subject.rb
-- lib/stones_spec/version.rb
-- lib/stones_spec/with_command_line.rb
-- lib/stones_spec/with_gbb_html_rendering.rb
-- lib/stones_spec/with_gobstones_css.rb
-- lib/stones_spec/with_tempfile.rb
+- lib/multiple_executions_runner.rb
+- lib/precompile_hook.rb
+- lib/render/boards.html.erb
+- lib/render/editor/editor.css
+- lib/render/editor/editor.js
+- lib/render/html_board.rb
+- lib/render/html_renderer.rb
+- lib/render/with_renderer.rb
 - lib/test_hook.rb
-- lib/with_test_parser.rb
-homepage: http://github.com/mumuki/mumuki-gobstones-server
+homepage: http://github.com/gobstones/mumuki-gobstones-runner
 licenses:
 - MIT
 metadata: {}
@@ -164,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki