mumukit 2.39.0 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9858200475db12bcde59a3fa64da16b23378dbc1267e2afca1c022819e53ac
-  data.tar.gz: 610db1e398ff3d5cd4fcbd11254ea9efddbb4be58d49a476253ada519cc573a1
+  metadata.gz: 7df39585e9af97eafeaa33f6189749ed29458e5a55ab37cf3339ae4200fc3f97
+  data.tar.gz: 0d272a7e75b9cd754314cdaafac2e3158b3b80374e88099be3633066d0098ef0
 SHA512:
-  metadata.gz: fc2fdf2ae6b17a495a7e016466046c54127f8acb8ec1628ed2e97dc16756caa8e18dbcc5cad8cd637a6e840597da70ea7da25664ed21a30ae4577d39de7a2e1e
-  data.tar.gz: 3e2cb601a96843576d46c5e401ff1999a0a4435be949e1fb66e2f15c94ed108a6c33b64af9e6bfd008ef0514ff6cde1deab888ddbff82d0ebd8d2eea478edbdf
+  metadata.gz: 7d7868073a960f5c0476bb8dd09aa84bb3d3aa1427ea1fef0700c4d664778cb40c60a18f6db212fc641e784839913e17ba23863788c393535b186764e2f44cdb
+  data.tar.gz: ca71c3f73c932143b403e4758e110f1e2f209f15cca3ada46365f95bc4974bef8042939e558ac5e11ef6e280b239dbd5abc48aa836fd8206b6098904b3473141

data/lib/mumukit/error_pattern.rb

@@ -1,15 +1,17 @@
 module Mumukit
   class ErrorPattern
-    def initialize(regexp)
+    def initialize(regexp, status: :failed, replace: '')
       @regexp = regexp
+      @status = status
+      @replacement = replace
     end
 
-    def matches?(result)
-      @regexp.matches? result
+    def matches?(result, status)
+      @status.like?(status) && @regexp.matches?(result)
     end
 
     def sanitize(result)
-      result.gsub(@regexp, '').strip
+      result.gsub(@regexp, @replacement).strip
     end
 
     def transform(result, status)

data/lib/mumukit/templates/with_error_patterns.rb

@@ -1,8 +1,8 @@
 module Mumukit::Templates
   module WithErrorPatterns
     def post_process_file(_file, result, status)
-      error_patterns.each { |it| return it.transform(result, status) if it.matches? result } if status.failed?
-      super
+      pattern = error_patterns.find { |it| it.matches? result, status }
+      pattern ? pattern.transform(result, status) : super
     end
 
     def error_patterns

data/lib/mumukit/templates/with_structured_results.rb

@@ -7,7 +7,7 @@ module Mumukit::Templates::WithStructuredResults
       post_process_unstructured_result(file, result, status)
     end
   rescue JSON::ParserError
-    [result, :errored]
+    post_process_unstructured_result(file, result, :errored)
   end
 
   def post_process_unstructured_result(_file, result, status)

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.39.0'
+  VERSION = '2.40.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.39.0
+  version: 2.40.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,6 +213,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -220,6 +223,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: mumukit-inspection
   requirement: !ruby/object:Gem::Requirement