mumuki-gobstones-runner 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27939843f1079b96e0fe0dcd5ac9b7b8d2a8a63f
-  data.tar.gz: 2716a7461ea02e23df6d9186c009e1415ea85c25
+SHA256:
+  metadata.gz: c12c74934309e4653afed1d6402e2d8f9474da3d3fd791d7c5ab2f6604cb3c58
+  data.tar.gz: 5967cf219b0575ff14bbc6bbcdfa41878fca2f02b6bfadcabb3cce3cb92adc17
 SHA512:
-  metadata.gz: 875d7f8a03261bad7ee99e45e672644ea4498fd43467ee6f182060526cf218fb242ef830dae5d77bdb1054f2eceab801fc672fb657dbcefdd4d28dd3d954c939
-  data.tar.gz: 833e0840163ed6dfe96a12446833457aacac8d5d9bfc4e294da45293b15bd65b5e8506c77a4af81591c958d4ab051449dc9b96424c3c923730ff014bb2999ebf
+  metadata.gz: f49274e5da567a2a1a904b7f6cdfcf1797df55e9f94437cf598d97238f4b293455ea954365591c40d769edcf0aaefae3cfb98fecabc19793efbc2cee2381bb8e
+  data.tar.gz: f0bbcfb9c8188fc1849d59826e3e4ddf9819f42c6129438730cdfc1aaa205d9a5b147914cd81059fecddb392a6a73ffbe23e29ef4b39a19082ed45e34bde2e54

data/lib/checker.rb

@@ -62,13 +62,21 @@ module Gobstones
                   expected_value: expected
                 } if return_value.nil?
 
-      final_value = return_value[:value]
+      final_value = adapt_value return_value
+      final_expected_value = expected
+
+      if return_value[:type] == 'Number'
+        final_value = final_value.to_s
+        final_expected_value = final_expected_value.to_s
+        # TODO: This is not ok but it's here for retrocompatibility issues.
+      end
+
       fail_with status: :check_return_failed_different_values,
                 result: {
                   initial: result[:initialBoard],
                   expected_value: expected,
                   actual_value: final_value
-                } if final_value != expected
+                } if final_value != final_expected_value
     end
 
     private
@@ -92,10 +100,22 @@ module Gobstones
     end
 
     def convert_known_reason_code(code)
-      return "no_stones" if code == "cannot-remove-stone"
-      return "out_of_board" if code == "cannot-move-to"
+      return "no_stones" if code == 'cannot-remove-stone'
+      return "out_of_board" if code == 'cannot-move-to'
+      return "unassigned_variable" if code == 'undefined-variable'
+      return "wrong_argument_type" if code.include? 'type-mismatch'
+      return "wrong_arguments_quantity" if code.include? 'arity-mismatch'
 
       code
     end
+
+    def adapt_value(return_value)
+      type = return_value[:type]
+      value = return_value[:value]
+
+      return value.to_s.capitalize if type == 'Bool'
+
+      value
+    end
   end
 end

data/lib/expectations_hook.rb

@@ -11,4 +11,17 @@ class GobstonesExpectationsHook < Mumukit::Templates::MulangExpectationsHook
     ast = output.first[:result][:mulangAst]
     Mulang::Code.new(mulang_language, ast)
   end
+
+  def compile_expectations_and_exceptions(request)
+    expectations, exceptions = super request
+
+    subject = request.batch.options[:subject]
+    expectations << { binding: '*', inspection: "Declares:=#{subject}" } if subject
+
+    [expectations, exceptions]
+  end
+
+  def default_smell_exceptions
+    LOGIC_SMELLS + FUNCTIONAL_SMELLS + OBJECT_ORIENTED_SMELLS
+  end
 end

data/lib/locales/en.yml

@@ -6,8 +6,11 @@ en:
   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'
+  code_no_stones: 'no stones left'
+  code_out_of_board: 'out of board'
+  code_wrong_argument_type: 'wrong arguments type'
+  code_unassigned_variable: 'unassigned variable'
+  code_wrong_arguments_quantity: 'wrong arguments quantity'
   expected_board: 'Expected final board'
   final_board: 'Final board'
   initial_board: 'Initial board'

data/lib/locales/es.yml

@@ -8,6 +8,9 @@ es:
   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'
+  code_wrong_argument_type: 'problema de tipos en los argumentos'
+  code_unassigned_variable: 'variable no asignada'
+  code_wrong_arguments_quantity: 'cantidad errónea de argumentos'
   expected_board: 'Tablero final esperado'
   final_board: 'Tablero final'
   initial_board: 'Tablero inicial'

data/lib/multiple_executions_runner.rb

@@ -4,6 +4,8 @@ module Gobstones
       execution = output[example[:id]]
       execution[:status] = execution[:status].to_sym
 
+      convert_compilation_to_runtime_errors! execution if compilation_error?(execution)
+
       raise Mumukit::Metatest::Errored, error_message(execution) unless success?(execution)
       execution
     end
@@ -14,6 +16,10 @@ module Gobstones
       [:passed, :runtime_error].include? execution[:status]
     end
 
+    def compilation_error?(execution)
+      execution[:status] == :compilation_error
+    end
+
     def error_message(execution)
       return format execution.except(:result).to_json if execution[:status] != :compilation_error
 
@@ -21,6 +27,12 @@ module Gobstones
       format Gobstones.build_error(error)
     end
 
+    def convert_compilation_to_runtime_errors!(execution)
+      if execution[:result][:finalBoardError][:reason][:code].include? 'arity-mismatch'
+        execution[:status] = :runtime_error
+      end
+    end
+
     def format(error)
       "<pre>#{error}</pre>"
     end

data/lib/precompile_hook.rb

@@ -13,12 +13,17 @@ class GobstonesPrecompileHook < Mumukit::Templates::FileHook
   end
 
   def compile(request)
+    add_missing_headers! request
     file = super request
 
     struct request.to_h.merge batch: @batch,
                               result: run!(file)
   end
 
+  def add_missing_headers!(request)
+    request.test.gsub! /(.*(initial_board|final_board).*\n)(?!.*GBB\/1\.0.*)/, "\\1    GBB/1.0\\3\n"
+  end
+
   def compile_file_content(request)
     @batch = Gobstones::BatchParser.parse(request)
     @batch.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -143,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/assets/boom.png
 - lib/assets_server.rb
 - lib/checker.rb
 - lib/expectations_hook.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Gobstones Runner for Mumuki