mumuki-python-runner 1.7.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039cd7e8daf34032853b80ad08223b1af629432395e1036d0c141bcd2a81cb4c'
-  data.tar.gz: eb45b266b689d2d13a18d54a1815a6d2f1b5d255c0dea700f67a17b5a34a5b40
+  metadata.gz: 1699ae67a23fd927d959d11b67c4dd207a4fec5154b177f30a90289a9ef21df3
+  data.tar.gz: 43de189d35459491ba444eccfe14f259802e4ac2bfd9fbd9f80d223fc62bc7d7
 SHA512:
-  metadata.gz: a154c8202c04203bfd5a577d2a70d407ebfd98f24a3050fc524f97bbcb60c724f6944fd613911869160418590a80acf9abdf0aef3dd5b3a7e41904e752cb41f7
-  data.tar.gz: b609e0a9fa6624bb99e1e3b5a2db1ed63d5c131af554feee56e488eb6da67fcfb41abe607a8d2ada3ef0dbd38cfd583be8503388bcb1c658408cf64281b26dbc
+  metadata.gz: 9d228f450cac70734257c24dea6a0c47865dd0df166a4ea823d01494b75c592410852fcf7ac0c6fa355b778cc4fafcdcfa3fe9d6589e1568ee4cf0ff54e727f1
+  data.tar.gz: e4c330e7545fa34c3d2cd5ffabef570cc9acf9af4b075c5be58fc071dacb94aac578488fe872ee348203618e971c535f1852f9a9686ed1eb8f6c0bfc4ba29e83

data/lib/base/query_hook.rb

@@ -23,33 +23,13 @@ sys.stdout = sys.__stdout__
 python
   end
 
-  def compile_query(query, output_prefix = "=> ")
-    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=[^=].*|^raise\b/
-      query
-    else
-      <<~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 compile_state(cookie)
     (cookie||[]).map do |statement|
-    <<~python
-    try:
-      #{statement}
-    except:
-      pass
+<<~python
+try:
+  #{statement}
+except:
+  pass
 python
     end
   end
@@ -65,13 +45,6 @@ python
   end
 
   def syntax_error_regexp
-    /(SyntheticMumukiSyntaxError: )|(\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError)))/
+    /(SyntheticMumukiSyntaxError: )|((\A  File .*\n)?(?m)(?=.*(SyntaxError|IndentationError)))/
   end
 end
-
-
-
-
-
-
-

data/lib/base/version.rb

@@ -1,4 +1,4 @@
 
 module BasePythonVersionHook
-  VERSION = '1.7.0'
+  VERSION = '1.8.2'
 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

@@ -1,6 +1,5 @@
 class Python3TryHook < Mumukit::Templates::TryHook
   isolated true
-  attr_reader :query_hook
 
   def initialize(config = nil)
     super config
@@ -9,16 +8,20 @@ class Python3TryHook < Mumukit::Templates::TryHook
 
   def compile_file_content(r)
     <<python
-#{query_hook.compile_file_header(r)}
+#{@query_hook.compile_file_header(r)}
 print("#{query_separator}");
-#{query_hook.compile_query(r.query, '')}
+#{@query_hook.compile_query(r.query, '')}
 print("#{goal_separator}");
-#{query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
+#{@query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
 python
   end
 
-  delegate :tempfile_extension, to: :query_hook
-  delegate :command_line, to: :query_hook
+  delegate :tempfile_extension, to: :@query_hook
+  delegate :command_line, to: :@query_hook
+
+  def post_process_file(file, result, status)
+    super file, *@query_hook.post_process_file(file, result, status)
+  end
 
   def query_separator
     '!!!MUMUKI-QUERY-START!!!'
@@ -29,15 +32,14 @@ python
   end
 
   def to_structured_results(_file, result, status)
-    /#{query_separator}
-?(.*)
-#{goal_separator}
-?(.*)
-/m =~ result
+    result_match = result[/#{query_separator}
+\K.*?(?=(#{goal_separator})|\z)/m]&.rstrip
+    goal_match = result[/#{goal_separator}
+\K.*\z/m]&.rstrip
 
     {
-        query: to_query_result($1, status),
-        goal: $2,
+        query: to_query_result(result_match, status),
+        goal: goal_match,
         status: status
     }
   end
@@ -45,4 +47,9 @@ python
   def to_query_result(result, status)
     { result: result, status: status }
   end
+
+  def checker_options
+    { strip_mode: :right_only }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,42 +16,48 @@ 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'
+        version: '2.41'
 - !ruby/object:Gem::Dependency
   name: mulang
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 6.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: 6.0.8
 - !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
@@ -170,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Python Runner for Mumuki