mumuki-python-runner 1.5.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e7167e2bb88c00b9533ab2180a1e70ab4a328716ea3aa6a00d57ee59373c059
-  data.tar.gz: cc200d20a917577925591f9c7aea6277c8c9cbbf859d5a3023fcc8eb24b64b6b
+  metadata.gz: f4a1cf971f4ce948e0e251e05f92672ca1c01e2b7f4441b60f57634c8cd89c68
+  data.tar.gz: 6bf96e4e38f596547ed4258c8447e8f6be826a8afedb75989fef278ea70a1664
 SHA512:
-  metadata.gz: 440297a480a73a7906564e6f91e46ed4666c9f780028574a86d6a8b6616dc25ce16ca040fabc4f97dbfde656d1b874b17957f73decab044c3f1089155dbe1ede
-  data.tar.gz: d2be4041b961a5b9ab90a99961b2813314c9ead96a13d37d065055b774d31e9814fae56e2da64ce584d316005f3cba5c11473b3bb74e82d3fa7a6cc6fba817e3
+  metadata.gz: f6340927de462b077cda6f61ea5dfb8b3bdc7ff1419abd8d59f623c33cac2f7c40eba7770a92b5a20c560b2e1e7b98d1343f668f93d9e6441e7c4d63c2b5669d
+  data.tar.gz: e5858f8ff89f2a13e1a1f65e265f4467a1e4017ed2c42bbbd92986e22436d54c46994c79e684384e1288a44ec3bb3dc492aaf305ab65adad08fc8223ceb5284b

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,31 +20,22 @@ 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/
-      query
-    else
-      "print(string.Template(\"=> $result\").substitute(result = #{query}))"
-    end
-  end
-
-  def build_state(cookie)
+  def compile_state(cookie)
     (cookie||[]).map do |statement|
-    <<~python
-    try:
-      #{statement}
-    except:
-      pass
+<<~python
+try:
+  #{statement}
+except:
+  pass
 python
     end
   end
 
   def compile_cookie(cookie)
-    build_state(cookie).join("\n")
+    compile_state(cookie).join("\n")
   end
 
   def error_patterns
@@ -50,13 +45,6 @@ python
   end
 
   def syntax_error_regexp
-    /\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError))/
+    /(SyntheticMumukiSyntaxError: )|((\A  File .*\n)?(?m)(?=.*(SyntaxError|IndentationError)))/
   end
 end
-
-
-
-
-
-
-

data/lib/base/version.rb

@@ -1,3 +1,4 @@
+
 module BasePythonVersionHook
-  VERSION = '1.5.2'
+  VERSION = '1.8.0'
 end

data/lib/python2/query_hook.rb

@@ -1,4 +1,23 @@
 class Python2QueryHook < BasePythonQueryHook
+  def compile_query(query, output_prefix = "=> ")
+    if query.match /print *(\(| ).*|.*[^=><!]=[^=].*|^raise\b/
+      query
+    else
+<<~python
+  __mumuki_error__ = None
+  try:
+    __mumuki_args__ = {'mumuki_query_result': eval("""#{query.gsub('"', '\"')}""")}
+    print(string.Template(\"\${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
 end
 
 PythonQueryHook = Python2QueryHook

data/lib/python3/query_hook.rb

@@ -1,2 +1,24 @@
 class Python3QueryHook < BasePythonQueryHook
+  def compile_query(query, output_prefix = "=> ")
+<<~python
+import code
+import itertools
+import traceback
+import sys
+
+__mumuki_console__ = code.InteractiveConsole()
+
+try:
+  __mumuki_result__ = __mumuki_console__.compile("""#{query.gsub('"', '\"')}""")
+  if __mumuki_result__ != None:
+    exec(__mumuki_result__)
+  else:
+    raise SyntaxError('unexpected EOF while parsing')
+except:
+  error = sys.exc_info()
+  stack = traceback.format_exception(*error)
+  print(*itertools.dropwhile(lambda it: 'File "<input>"' not in it and not it.startswith("SyntaxError"), stack))
+  exit(1)
+python
+  end
 end

data/lib/python3/try_hook.rb

@@ -0,0 +1,53 @@
+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
+
+  def checker_options
+    { strip_mode: :right_only }
+  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.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.30'
+        version: '2.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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'
+        version: '2.41'
 - !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