mumuki-python-runner 1.4.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e612f940397a2348ef6d4c158bcbed0a3717de566d041c14adcbf80e96dfef4a
-  data.tar.gz: 7c54b548c81131d82db8ee1bdc57eb6cd11e416d9ba3096ef99740f245c19608
+  metadata.gz: 0275bf8b0f0c205ce0e5ceda01999f39a417013d9490750b91cf3b88ca57e437
+  data.tar.gz: d1ca4344541694ca5ed8ef244943f5e4fb1f8df94fac3d7cefc271c79db9608c
 SHA512:
-  metadata.gz: fbf8986fe189ce8a4b7ece4d851aefd0db54ec44fb322085121a703b1acc62d4172fadd09d38eba19b972079c346035c30d800bf19b70c96f65463b208d19158
-  data.tar.gz: 75fb4c21302155911644257a2738ce5cfd23f5d81fe3c02051c0a41d91f115cad1acc8e4047c496f140f1035dbba659f6cf99f8a1670e08ef7bb0c1191ab75a7
+  metadata.gz: 46f823c0f7034521637dd08853948ef34e114fd11be5fbd6293ad264a4318a42a764b3709f237a45b8b5ad90755ff28b9c3cbcd14af480320ffb71c60c76fa72
+  data.tar.gz: 78517e84935997c70ab4c8ff24728caf909c9f4e1109b031f33f5ec80ecb6165557d6150bcb9dd8f399f7642bcfc4c33f8f1d6e1ea8ecc4e252b388e7953676e

data/lib/base.rb

@@ -0,0 +1,10 @@
+require 'mumukit'
+require 'nokogiri'
+
+I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
+
+require_relative './base/version'
+require_relative './base/test_hook'
+require_relative './base/query_hook'
+require_relative './base/expectations_hook'
+require_relative './base/metadata_hook'

data/lib/base/expectations_hook.rb

@@ -0,0 +1,15 @@
+class BasePythonExpectationsHook < Mumukit::Templates::MulangExpectationsHook
+  include_smells true
+
+  def default_smell_exceptions
+    LOGIC_SMELLS + FUNCTIONAL_SMELLS
+  end
+
+  def domain_language
+    {
+      caseStyle: 'RubyCase',
+      minimumIdentifierSize: 3,
+      jargon: []
+    }
+  end
+end

data/lib/{metadata_hook.rb → base/metadata_hook.rb}

@@ -1,9 +1,9 @@
-class PythonMetadataHook < Mumukit::Hook
+class BasePythonMetadataHook < Mumukit::Hook
   def metadata
     {language: {
         name: 'python',
         icon: {type: 'devicon', name: 'python'},
-        version: '2.7.6',
+        version: version,
         extension: 'py',
         ace_mode: 'python'
     },
@@ -18,4 +18,6 @@ class Test(unittest.TestCase):
 python
      }}
   end
-end
+
+  required :version
+end

data/lib/{query_hook.rb → base/query_hook.rb}

@@ -1,4 +1,4 @@
-class PythonQueryHook < Mumukit::Templates::FileHook
+class BasePythonQueryHook < Mumukit::Templates::FileHook
   with_error_patterns
   isolated true
 
@@ -7,7 +7,12 @@ class PythonQueryHook < 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
 
 #{req.extra}
@@ -15,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)
-    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=.*|^raise\b/
+  def compile_query(query, output_prefix = "=> ")
+    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}\${mumuki_query_result}\").safe_substitute(mumuki_query_result = #{query}))"
     end
   end
 
-  def build_state(cookie)
+  def compile_state(cookie)
     (cookie||[]).map do |statement|
     <<~python
     try:
@@ -39,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/{test_hook.rb → base/test_hook.rb}

@@ -1,4 +1,4 @@
-class PythonTestHook < Mumukit::Templates::FileHook
+class BasePythonTestHook < Mumukit::Templates::FileHook
   isolated true
 
   def tempfile_extension
@@ -6,21 +6,23 @@ class PythonTestHook < Mumukit::Templates::FileHook
   end
 
   def command_line(filename)
-    "python #{filename}"
+    "rununittest #{filename}"
   end
 
   def compile_file_content(request)
     <<python
+# -*- coding: UTF-8 -*-
+
 import unittest
 import xmlrunner
 import sys
 
-#{request.content}
 #{request.extra}
+#{request.content}
 #{test_class(request.test)}
 
 unittest.main(
-  testRunner=xmlrunner.XMLTestRunner(output=sys.__stdout__),
+  testRunner=xmlrunner.XMLTestRunner(output='./xml-unittest-output'),
   failfast=False,
   buffer=False,
   catchbreak=False

data/lib/base/version.rb

@@ -0,0 +1,4 @@
+
+module BasePythonVersionHook
+  VERSION = '1.6.1'
+end

data/lib/python2/expectations_hook.rb

@@ -0,0 +1,7 @@
+class Python2ExpectationsHook < BasePythonExpectationsHook
+  def language
+    'Python2'
+  end
+end
+
+PythonExpectationsHook = Python2ExpectationsHook

data/lib/python2/metadata_hook.rb

@@ -0,0 +1,8 @@
+class Python2MetadataHook < BasePythonMetadataHook
+  def version
+    '2.7.16'
+  end
+end
+
+PythonMetadataHook = Python2MetadataHook
+

data/lib/python2/query_hook.rb

@@ -0,0 +1,4 @@
+class Python2QueryHook < BasePythonQueryHook
+end
+
+PythonQueryHook = Python2QueryHook

data/lib/python2/test_hook.rb

@@ -0,0 +1,4 @@
+class Python2TestHook < BasePythonTestHook
+end
+
+PythonTestHook = Python2TestHook

data/lib/python2/version.rb

@@ -0,0 +1,3 @@
+Python2VersionHook = BasePythonVersionHook
+PythonVersionHook = Python2VersionHook
+

data/lib/python2_runner.rb

@@ -0,0 +1,21 @@
+require_relative './base'
+
+def reload_python2_runner!
+  Mumukit.runner_name = 'python'
+  Mumukit.configure do |config|
+    config.docker_image = 'mumuki/mumuki-python2-worker:0.1'
+    # comment type should be Mumukit::Directives::CommentType::Ruby, but it is
+    # Mumukit::Directives::CommentType::Cpp for backward compatibility
+    config.stateful = true
+    config.structured = true
+  end
+end
+
+# for testing only
+reload_python2_runner!
+
+require_relative './python2/version'
+require_relative './python2/test_hook'
+require_relative './python2/query_hook'
+require_relative './python2/expectations_hook'
+require_relative './python2/metadata_hook'

data/lib/python3/expectations_hook.rb

@@ -0,0 +1,5 @@
+class Python3ExpectationsHook < BasePythonExpectationsHook
+  def language
+    'Python3'
+  end
+end

data/lib/python3/metadata_hook.rb

@@ -0,0 +1,6 @@
+class Python3MetadataHook < BasePythonMetadataHook
+  def version
+    '3.7.3'
+  end
+end
+

data/lib/python3/query_hook.rb

@@ -0,0 +1,2 @@
+class Python3QueryHook < BasePythonQueryHook
+end

data/lib/python3/test_hook.rb

@@ -0,0 +1,2 @@
+class Python3TestHook < BasePythonTestHook
+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/version.rb

@@ -0,0 +1 @@
+Python3VersionHook = BasePythonVersionHook

data/lib/python3_runner.rb

@@ -0,0 +1,21 @@
+require_relative './base'
+
+def reload_python3_runner!
+  Mumukit.runner_name = 'python3'
+  Mumukit.configure do |config|
+    config.docker_image = 'mumuki/mumuki-python3-worker:0.1'
+    config.comment_type = Mumukit::Directives::CommentType::Ruby
+    config.structured = true
+    config.stateful = true
+  end
+end
+
+# for testing only
+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'

data/lib/python_runner.rb

@@ -1,15 +1 @@
-require 'mumukit'
-require 'nokogiri'
-
-I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
-
-Mumukit.runner_name = 'python'
-Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-python-worker:1.1'
-  config.stateful = true
-end
-
-require_relative 'version'
-require_relative 'test_hook'
-require_relative 'query_hook'
-require_relative 'metadata_hook'
+require_relative './python2_runner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -24,6 +24,20 @@ 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
@@ -44,14 +58,14 @@ dependencies:
     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
@@ -115,14 +129,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/base.rb
+- lib/base/expectations_hook.rb
+- lib/base/metadata_hook.rb
+- lib/base/query_hook.rb
+- lib/base/test_hook.rb
+- lib/base/version.rb
 - lib/locales/en.yml
 - lib/locales/es.yml
-- lib/metadata_hook.rb
+- lib/python2/expectations_hook.rb
+- lib/python2/metadata_hook.rb
+- lib/python2/query_hook.rb
+- lib/python2/test_hook.rb
+- lib/python2/version.rb
+- lib/python2_runner.rb
+- lib/python3/expectations_hook.rb
+- 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
-- lib/query_hook.rb
-- lib/test_hook.rb
-- lib/version.rb
-homepage: http://github.com/mumuki/mumuki-python-server
+homepage: http://github.com/mumuki/mumuki-python-runner
 licenses:
 - MIT
 metadata: {}
@@ -141,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Python Runner for Mumuki

data/lib/version.rb

@@ -1,3 +0,0 @@
-module PythonVersionHook
-  VERSION = '1.4.0'
-end