mumuki-ruby-runner 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01ae6927e0f50e1993de8e451c4b35b1151b5d02c8d9bbf435ab5aca90de1209
-  data.tar.gz: 79d37750af1c960f0cbcbd7530e40d4a508cc9b010a48877c926b4784ad86db4
+  metadata.gz: 73812cd6f3268c7ed802e7f73bd7297f4012e258b411d0e660b46f69aea8560c
+  data.tar.gz: 8cf3c2bff84fe5070845a6132a3b9d16d89b47d3579ddee9ad123799908eb2e5
 SHA512:
-  metadata.gz: 646a9e20fff76af5a53780782755c0f112df761d4fdb46f75a2aa62a058128447ecc4cc69e302090ca89302e8eb759539feb05ed206150caecce044cb87c1f1b
-  data.tar.gz: 777cad48c38ee446d1d20fac05470a2fd09177b30913928ce815e1ba259133200be80bd3e02a18fa0958250ce8f73e36cd1204fc53c3586238c4a33fbd492ff8
+  metadata.gz: d34193c160f96ed07ef23d9b47190f3f6a0210e0a948c3e679ea26b416efe00963867ab4c6cd53d3b38887b0d36bef0dff475fd48f1480ccf3168f6c96213136
+  data.tar.gz: 7c4043a5607c9a69f99d6a484fdce1358ab0f148b7cbbb9123bcace8e9371ab06d51c85a31336bb91edf03c6ac0bdc7eb09730346813cf521b3f070b849ac942

data/lib/query_hook.rb

@@ -1,4 +1,5 @@
 class RubyQueryHook < Mumukit::Templates::FileHook
+  with_error_patterns
   isolated true
 
   def tempfile_extension
@@ -31,12 +32,11 @@ ruby
     "ruby #{filename}"
   end
 
-  def post_process_file(_file, result, status)
-    if status == :failed && error_output?(result)
-      [sanitize_error_output(result), status]
-    else
-      super
-    end
+  def error_patterns
+    [
+      Mumukit::ErrorPattern::Failed.new(runtime_error_regexp),
+      Mumukit::ErrorPattern::Errored.new(syntax_error_regexp)
+    ]
   end
 
   def compile_query(query)
@@ -62,18 +62,14 @@ ruby
     build_state(cookie).join("\n")
   end
 
-  def error_output?(result)
-    error_regexp =~ result
-  end
-
-  def sanitize_error_output(result)
-    result.gsub(error_regexp, '').strip
-  end
-
-  def error_regexp
+  def runtime_error_regexp
     # Matches lines like:
     # * from /tmp/mumuki.compile20170404-3221-1db8ntk.rb:17:in `<main>'
     # * /tmp/mumuki.compile20170404-3221-1db8ntk.rb:17:in `respond_to?':
     /(from )?(.)+\.rb:(\d)+:in `([\w|<|>|?|!|+|*|-|\/|=]+)'(:)?/
   end
+
+  def syntax_error_regexp
+    /.+?\.rb:\d+: (?m)(?=.*syntax error)/
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RubyVersionHook
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-ruby-runner
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.30'
 - !ruby/object:Gem::Dependency
   name: mulang-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby Runner for Mumuki