mumuki-python-runner 1.6.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb623be34bb249818161740a8eeb299fb3d8db1c0513c76769a5379f3c959e6
-  data.tar.gz: ec5e53117030aa1228715ae86a43f9670b0878aa0c1db16f7a49f9b3d2689a4c
+  metadata.gz: 89a420abcb59de7ed38a51511b8fb5ec96c3649c89e2ae59f703927204934871
+  data.tar.gz: 2d08a9831ed7b49972fcf1d863a9b0ec0284cc200fd104a5c79cf1f006db8e8a
 SHA512:
-  metadata.gz: 6e4610071f25ff2e3d50825c745fad561247375c63e8edcbde1ece7cbc9665f82583612fa01a264bc79226c5fc37e55713af7e38e577bba40ba9ddb3213aaf51
-  data.tar.gz: c82f05190f3a999bdbbf0bcc1b531398b649912b1f3db61835a9e9ee0fa6cceee5741514e225b0a04ca92833bf0edfc9d18530be4a70bc72294965ab0badea18
+  metadata.gz: b0a1dab1ce1ebfd01db007ee8b0b56bff51b2217679a1018901d396ec05c544edb8cf9a4e508da02cc226590b78e926e61b9e2cb664a1540ce3e9da553818750
+  data.tar.gz: 6d85cdf41b0c5fb71395ec128b657f2b5923b9cf50618f8a4e6d034c21c604a68a9e63c4f3c065b80134385042922283ad77e2b4bd5612bedc8351e74bdf88f6

data/lib/base/query_hook.rb

@@ -23,21 +23,13 @@ sys.stdout = sys.__stdout__
 python
   end
 
-  def compile_query(query, output_prefix = "=> ", output_var = "__mumuki_query_result__")
-    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=.*|^raise\b/
-      query
-    else
-      "print(string.Template(\"#{output_prefix}$#{output_var}\").substitute(#{output_var} = #{query}))"
-    end
-  end
-
   def compile_state(cookie)
     (cookie||[]).map do |statement|
-    <<~python
-    try:
-      #{statement}
-    except:
-      pass
+<<~python
+try:
+  #{statement}
+except:
+  pass
 python
     end
   end
@@ -53,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.6.0'
+  VERSION = '1.8.1'
 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', '', '__mumuki_goal_query_result__')}
+#{@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.6.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2021-03-12 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
@@ -170,8 +156,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.3
 signing_key: 
 specification_version: 4
 summary: Python Runner for Mumuki