mumuki-python-runner 1.5.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91dfdb4a06fa385a926782155a7bdfff919556373be784c9bad9dcad981f334d
-  data.tar.gz: f3bdcb46a6ef02ea2ed62643df3a4b66963490e13752bbd5a27d34641a31e7ba
+  metadata.gz: e7ac08925c7c447effe33a7cdadc6d8135d2a3d412586c546550630afe76e5db
+  data.tar.gz: 8b64922903b757f02e1df5714ee78c7dad8dfa5556d32a351396aab73e03c044
 SHA512:
-  metadata.gz: 0d3941d354533c48fec8a34b6029ade0e06d4a464f7a87f58307774248901501f7d0f55647ea261f95fce07b95baef97d9593360f7008d15f88bb146a5d1e945
-  data.tar.gz: 63b075164c4272bff420460cba8dd1efd946d234785a3001ea6d28c4a2feaf864296900bf5db69a711f7a78c535e0e72ca6059c80cc698d411cc08cd9acaf4cd
+  metadata.gz: cb86a2680d68c97a33028bf367b07918b8b64b41e85b8a588819bffe69afa621e033fcd2501ffe5fa0651c15de01e4851e31cc9e3d4084df80f820977f1dc6c1
+  data.tar.gz: c189e9eb01ea000eac2a8f24f8c4bd4b68e57cf4701f49e4984bd3b9be8f17eef47e4108be03ebd5124aa655138038adeb8c5442ca75f472d8a95b2dd12502c6

data/lib/base/query_hook.rb

@@ -7,6 +7,10 @@ class BasePythonQueryHook < Mumukit::Templates::FileHook
   end
 
   def compile_file_content(req)
+    "#{compile_file_header(req)}\n#{compile_query(req.query)}"
+  end
+
+  def compile_file_header(req)
     <<python
 # -*- coding: UTF-8 -*-
 import string, sys, os
@@ -16,19 +20,30 @@ import string, sys, os
 sys.stdout = open(os.devnull, 'w')
 #{compile_cookie(req.cookie)}
 sys.stdout = sys.__stdout__
-#{build_query req.query}
 python
   end
 
-  def build_query(query)
-    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=.*|^raise\b/
+  def compile_query(query, output_prefix = "=> ")
+    if query.match /print *(\(| ).*|.*[^=]=[^=].*|^raise\b/
       query
     else
-      "print(string.Template(\"=> $result\").substitute(result = #{query}))"
+      <<~python
+        __mumuki_error__ = None
+        try:
+          __mumuki_args__ = {'mumuki_query_result': eval("""#{query.gsub('"', '\"')}""")}
+          print(string.Template(\"#{output_prefix}\${mumuki_query_result}\").safe_substitute(**__mumuki_args__))
+        except SyntaxError as e:
+          __mumuki_error__ = SyntaxError(e.msg, ('<console>', e.lineno, e.offset, e.text))
+        if __mumuki_error__:
+          print(__mumuki_error__.text)
+          print(" "*(__mumuki_error__.offset - 1) + "^")
+          print('SyntheticMumukiSyntaxError: SyntaxError: ' + str(__mumuki_error__))
+          exit(1)
+      python
     end
   end
 
-  def build_state(cookie)
+  def compile_state(cookie)
     (cookie||[]).map do |statement|
     <<~python
     try:
@@ -40,7 +55,7 @@ python
   end
 
   def compile_cookie(cookie)
-    build_state(cookie).join("\n")
+    compile_state(cookie).join("\n")
   end
 
   def error_patterns
@@ -50,7 +65,7 @@ python
   end
 
   def syntax_error_regexp
-    /\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError))/
+    /(SyntheticMumukiSyntaxError: )|(\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError)))/
   end
 end
 

data/lib/base/test_hook.rb

@@ -17,8 +17,8 @@ import unittest
 import xmlrunner
 import sys
 
-#{request.content}
 #{request.extra}
+#{request.content}
 #{test_class(request.test)}
 
 unittest.main(

data/lib/base/version.rb

@@ -1,3 +1,4 @@
+
 module BasePythonVersionHook
-  VERSION = '1.5.1'
+  VERSION = '1.7.1'
 end

data/lib/python3/try_hook.rb

@@ -0,0 +1,48 @@
+class Python3TryHook < Mumukit::Templates::TryHook
+  isolated true
+  attr_reader :query_hook
+
+  def initialize(config = nil)
+    super config
+    @query_hook = Python3QueryHook.new
+  end
+
+  def compile_file_content(r)
+    <<python
+#{query_hook.compile_file_header(r)}
+print("#{query_separator}");
+#{query_hook.compile_query(r.query, '')}
+print("#{goal_separator}");
+#{query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
+python
+  end
+
+  delegate :tempfile_extension, to: :query_hook
+  delegate :command_line, to: :query_hook
+
+  def query_separator
+    '!!!MUMUKI-QUERY-START!!!'
+  end
+
+  def goal_separator
+    '!!!MUMUKI-GOAL-START!!!'
+  end
+
+  def to_structured_results(_file, result, status)
+    /#{query_separator}
+?(.*)
+#{goal_separator}
+?(.*)
+/m =~ result
+
+    {
+        query: to_query_result($1, status),
+        goal: $2,
+        status: status
+    }
+  end
+
+  def to_query_result(result, status)
+    { result: result, status: status }
+  end
+end

data/lib/python3_runner.rb

@@ -16,5 +16,6 @@ reload_python3_runner!
 require_relative './python3/version'
 require_relative './python3/test_hook'
 require_relative './python3/query_hook'
+require_relative './python3/try_hook'
 require_relative './python3/expectations_hook'
 require_relative './python3/metadata_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -24,48 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.30'
-- !ruby/object:Gem::Dependency
-  name: mulang
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +133,7 @@ files:
 - lib/python3/metadata_hook.rb
 - lib/python3/query_hook.rb
 - lib/python3/test_hook.rb
+- lib/python3/try_hook.rb
 - lib/python3/version.rb
 - lib/python3_runner.rb
 - lib/python_runner.rb