mumuki-python-runner 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e7167e2bb88c00b9533ab2180a1e70ab4a328716ea3aa6a00d57ee59373c059
-  data.tar.gz: cc200d20a917577925591f9c7aea6277c8c9cbbf859d5a3023fcc8eb24b64b6b
+  metadata.gz: dcb623be34bb249818161740a8eeb299fb3d8db1c0513c76769a5379f3c959e6
+  data.tar.gz: ec5e53117030aa1228715ae86a43f9670b0878aa0c1db16f7a49f9b3d2689a4c
 SHA512:
-  metadata.gz: 440297a480a73a7906564e6f91e46ed4666c9f780028574a86d6a8b6616dc25ce16ca040fabc4f97dbfde656d1b874b17957f73decab044c3f1089155dbe1ede
-  data.tar.gz: d2be4041b961a5b9ab90a99961b2813314c9ead96a13d37d065055b774d31e9814fae56e2da64ce584d316005f3cba5c11473b3bb74e82d3fa7a6cc6fba817e3
+  metadata.gz: 6e4610071f25ff2e3d50825c745fad561247375c63e8edcbde1ece7cbc9665f82583612fa01a264bc79226c5fc37e55713af7e38e577bba40ba9ddb3213aaf51
+  data.tar.gz: c82f05190f3a999bdbbf0bcc1b531398b649912b1f3db61835a9e9ee0fa6cceee5741514e225b0a04ca92833bf0edfc9d18530be4a70bc72294965ab0badea18

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,18 @@ 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)
+  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(\"=> $result\").substitute(result = #{query}))"
+      "print(string.Template(\"#{output_prefix}$#{output_var}\").substitute(#{output_var} = #{query}))"
     end
   end
 
-  def build_state(cookie)
+  def compile_state(cookie)
     (cookie||[]).map do |statement|
     <<~python
     try:
@@ -40,7 +43,7 @@ python
   end
 
   def compile_cookie(cookie)
-    build_state(cookie).join("\n")
+    compile_state(cookie).join("\n")
   end
 
   def error_patterns

data/lib/base/version.rb

@@ -1,3 +1,3 @@
 module BasePythonVersionHook
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 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', '', '__mumuki_goal_query_result__')}
+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.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -147,6 +147,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
@@ -169,7 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Python Runner for Mumuki