mumuki-python-runner 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e612f940397a2348ef6d4c158bcbed0a3717de566d041c14adcbf80e96dfef4a
-  data.tar.gz: 7c54b548c81131d82db8ee1bdc57eb6cd11e416d9ba3096ef99740f245c19608
+  metadata.gz: b96184406c101c4a7b9e627936c5b4a06fa263b5a9de6a3e3f78a0a62f78499b
+  data.tar.gz: d6f7a4575bded83c5f11c368c5aefe0a0b2d93bc3678bcf11b213eee03c2a5bf
 SHA512:
-  metadata.gz: fbf8986fe189ce8a4b7ece4d851aefd0db54ec44fb322085121a703b1acc62d4172fadd09d38eba19b972079c346035c30d800bf19b70c96f65463b208d19158
-  data.tar.gz: 75fb4c21302155911644257a2738ce5cfd23f5d81fe3c02051c0a41d91f115cad1acc8e4047c496f140f1035dbba659f6cf99f8a1670e08ef7bb0c1191ab75a7
+  metadata.gz: 42aeb75b306a206b0d70dbbfee375b687871db2d16f392bdd47c0ce9f7010f79968608542fc0d2e94747dc45600d2736f720784f9ae6a120f8a9bb1cae1b41fa
+  data.tar.gz: 222ba1f7dd0b7096e79eb5723bc08c05af42bbdbc77696d6660a724cf110312b3678ca95114bde71fc71046525e41790f166972bdc9314e29801d3ed4c5c29ae

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
 
@@ -8,6 +8,7 @@ class PythonQueryHook < Mumukit::Templates::FileHook
 
   def compile_file_content(req)
     <<python
+# -*- coding: UTF-8 -*-
 import string, sys, os
 
 #{req.extra}

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,11 +6,13 @@ 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
@@ -20,7 +22,7 @@ import sys
 #{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,3 @@
+module BasePythonVersionHook
+  VERSION = '1.5.0'
+end

data/lib/python2/expectations_hook.rb

@@ -0,0 +1,5 @@
+class Python2ExpectationsHook < BasePythonExpectationsHook
+  def language
+    'Python2'
+  end
+end

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,18 @@
+require_relative './base'
+
+def reload_python2_runner!
+  Mumukit.runner_name = 'python'
+  Mumukit.configure do |config|
+    config.docker_image = 'mumuki/mumuki-python2-worker:0.1'
+    config.stateful = 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/version.rb

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

data/lib/python3_runner.rb

@@ -0,0 +1,18 @@
+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.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/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.5.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-05-01 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
@@ -115,14 +129,28 @@ 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/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 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 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