mumuki-gobstones-runner 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82526f4a5824f6c8d3006f7539bff0bcd77300fe2d51c1c5d7244902a406225
-  data.tar.gz: d2dea8e130b4f881ba830f15b90493b56de9e8be4901f49278d81922c63ad6af
+  metadata.gz: 91e8c6260caa533e79054eb0523b7a50ef314c39cbe095aa522985e7e76f8607
+  data.tar.gz: f9b0337db874c710c5339f0454ac98c181961d8f3aa8be40a49b5c7a362235d6
 SHA512:
-  metadata.gz: c0c1e8bef4c879972db7bf589634f33b58c649f5a3b3beacc4d061f864b01e849a1f3db2a71f81349e413df1fcf269610c15d13bcd5337b5150851c6d33a08dd
-  data.tar.gz: cf1eec4fbbe28c8456adfc681506d8daf9d671d5a9faa0957878462b1ea0202fe84275ba95b0bb74214f55fad523168a10984f7e5f3ad42fe6dee8ec1e6942f5
+  metadata.gz: 8a8fcda16da5e7e2325bd5dec995855bcdc1a8096d2cce7124f9e2f6641ea358c8fd0899e0d20dbdf4a6fdb103e21e64f3a74a2b3007d2e895ae273f89a647fa
+  data.tar.gz: f63dca544118647d5fb28a12bd5e4af9a89a335ab71b2984b6132409ce3b26b7254a92b0ebde10a4e44527b6ac7ebf2763309a67b7866ccc7eab34f3e73a80c7

data/lib/expectations_hook.rb

@@ -1,18 +1,15 @@
 class GobstonesExpectationsHook < Mumukit::Templates::MulangExpectationsHook
   include_smells true
 
-  def language
-    'Mulang'
-  end
-
+  # no need to implement `language` and `compile_content`
+  # since we are completly overriding `mulang_code`
   def mulang_code(request)
-    output, status = request.result
-    Mulang::Code.new(mulang_language, extract_ast(output))
+    Mulang::Code.external extract_ast(request)
   end
 
   def compile_expectations(request)
     super(request).tap do |expectations|
-      request.batch.options[:subject].try do |subject|
+      request.precompiled_batch.options[:subject].try do |subject|
         expectations[:ast] << { binding: '*', inspection: "Declares:=#{subject}" }
       end
     end
@@ -24,12 +21,19 @@ class GobstonesExpectationsHook < Mumukit::Templates::MulangExpectationsHook
 
   private
 
-  def extract_ast(precompiled_output)
+  def extract_ast(request)
+    precompiled_output, _ = request.precompiled_result
+
     if precompiled_output.is_a?(String)
-      logger.warn(precompiled_output)
-      {tag: :None} # this happens when gobstones cli miserably fails on parsing the submission or the extra code
+      # gobstones cli miserably failed on parsing the submission or the extra code
+      logger.warn("Unprocessable GobstonesCLI output:\n\n#{precompiled_output}")
+      {tag: :None}
+    elsif (ast = precompiled_output.first.dig(:result, :mulangAst)).blank?
+      # gobstones cli could not produce a valid ast
+      logger.warn("GobstonesCLI produced an empty AST:\n\n#{precompiled_output}")
+      {tag: :None}
     else
-      precompiled_output.first[:result][:mulangAst]
+      ast
     end
   end
 end

data/lib/precompile_hook.rb

@@ -31,8 +31,8 @@ class GobstonesPrecompileHook < Mumukit::Templates::FileHook
     @locale = request[:locale]
     file = super request
 
-    struct request.to_h.merge batch: @batch,
-                              result: run!(file)
+    struct request.to_h.merge precompiled_batch: @batch,
+                              precompiled_result: run!(file)
   end
 
   def add_missing_headers!(request)

data/lib/test_hook.rb

@@ -1,13 +1,13 @@
 class GobstonesTestHook < Mumukit::Defaults::TestHook
   def run!(request)
-    output, status = request.result
+    output, status = request.precompiled_result
 
-    if request.batch.options[:interactive]
+    if request.precompiled_batch.options[:interactive]
       ['', :passed]
     elsif status == :passed
-      request.batch.run_tests! output
+      request.precompiled_batch.run_tests! output
     else
-      request.result
+      request.precompiled_result
     end
   end
 end

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module GobstonesVersionHook
-  VERSION = '2.1.3'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-gobstones-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Rodrigo Alfonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit