mumukit 2.16.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e35034a18e718c5fbb858ea5cfac9f9649220592
-  data.tar.gz: fb2ecc4462e4d0a6701923abbfbf597c9241945a
+SHA256:
+  metadata.gz: b678748b9bbd865a42951a22eb71244968362faf551452fdfe4d0a9f14889fda
+  data.tar.gz: 42ea663c41b564d65222f11d7baa5b7447a2e49b053eb8579b4ec2d8ad814268
 SHA512:
-  metadata.gz: de54775cd4ae02a5958a81900563dd50ec1e6c05dc720ffebe0d5d2abfa3016deee4f9a70953416eedd2669917c05b7549fac8e3d765fe287dca1ba30b27e244
-  data.tar.gz: daef558311281ceffda4ae6d6fc6152f9bd9d02721496cda1532dbbfd1eb21939b153a7678afcca40f1f4c986b06672f94f1b359b400b13d46e8f3f937e6775b
+  metadata.gz: bbb8f3d2905dc3b02b600efb96609bbfb888410228822d40ad55977e59aee51683d1842afb8faa5816b3c76a846639bd4de364f707bc0600d4817c8184b6f785
+  data.tar.gz: 0cfadb4c1dc8c55e3ed8b903c0d3d05c2217f56d39845bca17fcc97ac6888b8d5bfa7ca2c48f87f714849ed52a86302eb2893d3168b64c553d915bb975331ba5

data/lib/mumukit/isolated_environment.rb

@@ -16,21 +16,22 @@ module Mumukit
 
       command = yield(*filenames).split
 
+      configure_container! command, binds, volumes
+    end
+
+    def configure_container!(command, binds, volumes)
       self.container = Docker::Container.create(
-          'Image' => Mumukit.config.docker_image,
-          'Cmd' => command,
-          'NetworkDisabled' => true,
-          'HostConfig' => {
-              'Binds' => binds},
-          'Volumes' => volumes)
+        'Image' => Mumukit.config.docker_image,
+        'Cmd' => command,
+        'NetworkDisabled' => true,
+        'HostConfig' => {
+            'Binds' => binds},
+        'Volumes' => volumes)
     end
 
     def run!
-      container.start
-      container.wait(Mumukit.config.command_time_limit)
-
-      exit = container.json['State']['ExitCode']
-      out = container.streaming_logs(stdout: true, stderr: true)
+      run_container!
+      exit, out = fetch_container_state!
 
       if exit == 0
         [out, :passed]
@@ -41,6 +42,17 @@ module Mumukit
       [I18n.t('mumukit.time_exceeded', limit: Mumukit.config.command_time_limit), :aborted]
     end
 
+    def run_container!
+      container.start
+      container.wait(Mumukit.config.command_time_limit)
+    end
+
+    def fetch_container_state!
+      exit = container.json['State']['ExitCode']
+      out = container.streaming_logs(stdout: true, stderr: true)
+      [exit, out]
+    end
+
     def destroy!
       if container
         container.stop
@@ -48,4 +60,4 @@ module Mumukit
       end
     end
   end
-end
+end

data/lib/mumukit/server.rb

@@ -4,4 +4,5 @@ module Mumukit
 end
 
 require_relative './server/response_builder'
+require_relative './server/test_pipeline'
 require_relative './server/test_server'

data/lib/mumukit/server/test_pipeline.rb

@@ -0,0 +1,30 @@
+class Mumukit::Server::TestPipeline
+  def initialize(server, request)
+    @server = server
+    @request = request
+  end
+
+  def evaluate!
+    @test_results = @server.run_tests! @request
+    @expectation_results = @server.run_expectations!(@request).try do |raw|
+      static_errors?(raw) ? [] : raw
+    end
+  end
+
+  def generate_feedback!
+    @feedback = @server.run_feedback! @request,
+                                     struct(test_results: @test_results, expectation_results: @expectation_results)
+  end
+
+  def response
+    builder = Mumukit::Server::ResponseBuilder.new
+    builder.add_test_results @test_results
+    builder.add_expectation_results @expectation_results
+    builder.add_feedback @feedback
+    builder.build
+  end
+
+  def static_errors?(raw)
+    raw.size == 2 && raw[1] == :errored
+  end
+end

data/lib/mumukit/server/test_server.rb

@@ -32,19 +32,10 @@ class Mumukit::Server::TestServer
 
   def test!(request)
     respond_to(request) do |r|
-      test_results = run_tests! r
-      expectation_results = run_expectations! r
-
-      results = OpenStruct.new(test_results: test_results,
-                               expectation_results: expectation_results)
-
-      feedback = run_feedback! r, results
-
-      Mumukit::Server::ResponseBuilder.build do
-        add_test_results(test_results)
-        add_expectation_results(expectation_results)
-        add_feedback(feedback)
-      end
+      pipeline = Mumukit::Server::TestPipeline.new self, r
+      pipeline.evaluate!
+      pipeline.generate_feedback!
+      pipeline.response
     end
   end
 
@@ -66,14 +57,6 @@ class Mumukit::Server::TestServer
     end
   end
 
-  def run_query!(request)
-    compile_and_run runtime.query_hook, request
-  end
-
-  def run_try!(request)
-    compile_and_run runtime.try_hook, request
-  end
-
   def run_tests!(request)
     return ['', :passed] if request.test.blank?
 
@@ -81,11 +64,9 @@ class Mumukit::Server::TestServer
   end
 
   def run_expectations!(request)
-    if request.expectations
-      compile_and_run(runtime.expectations_hook, request) { [] }
-    else
-      []
-    end
+    return [] if request.expectations.nil? || request.content.nil?
+
+    compile_and_run runtime.expectations_hook, request
   end
 
   def run_feedback!(request, results)
@@ -94,11 +75,19 @@ class Mumukit::Server::TestServer
 
   private
 
+  def run_query!(request)
+    compile_and_run runtime.query_hook, request
+  end
+
+  def run_try!(request)
+    compile_and_run runtime.try_hook, request
+  end
+
   def compile_and_run(hook, request)
-    compilation = hook.compile(preprocess request)
+    compilation = hook.compile(request)
     hook.run!(compilation)
   rescue Mumukit::CompilationError => e
-    block_given? ? yield(e) : [e.message, :errored]
+    [e.message, :errored]
   end
 
   def preprocess(request)
@@ -110,7 +99,7 @@ class Mumukit::Server::TestServer
   end
 
   def respond_to(request)
-    yield request.tap { |r| validate_request! r }
+    yield preprocess request.tap { |r| validate_request! r }
   rescue Mumukit::RequestValidationError => e
     {exit: :aborted, out: e.message}
   rescue Exception => e

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -1,7 +1,8 @@
 require 'mumukit/inspection'
+require 'mulang'
 
 module Mumukit
-  class Templates::MulangExpectationsHook < Mumukit::Templates::FileHook
+  class Templates::MulangExpectationsHook < Mumukit::Hook
     LOGIC_SMELLS = %w(UsesCut UsesFail UsesUnificationOperator HasRedundantReduction)
     FUNCTIONAL_SMELLS = %w(HasRedundantParameter HasRedundantGuards)
     OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
@@ -9,42 +10,25 @@ module Mumukit
     EXPRESSIVENESS_SMELLS = %w(HasTooShortBindings HasWrongCaseBindings HasMisspelledBindings)
     GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison)
 
-    isolated false
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'
 
-    def tempfile_extension
-      '.json'
-    end
-
-    def command_line(filename)
-      # TODO avoid file generation
-      "cat #{filename} | #{mulang_path} -s 2>&1"
+    def compile(request)
+      expectations, exceptions = compile_expectations_and_exceptions request
+      mulang_code(request).analysis(
+        expectations: expectations,
+        smellsSet: {
+          tag: 'AllSmells',
+          exclude: (exceptions + default_smell_exceptions)
+        },
+        domainLanguage: domain_language)
     end
 
-    def post_process_file(file, result, status)
-      parse_response JSON.pretty_parse(result)
+    def run!(analysis)
+      parse_response Mulang.analyse(analysis)
     rescue JSON::ParserError
-      raise Mumukit::CompilationError, "Can not handle mulang results #{result}"
+      raise Mumukit::CompilationError, "Can not handle mulang results for analysis #{analysis}"
     end
 
-    def compile_file_content(request)
-      compile_json_file_content(request).to_json
-    end
-
-    def compile_json_file_content(request)
-      expectations, exceptions = compile_expectations_and_exceptions request
-      {
-        sample: compile_sample(request),
-        spec: {
-          expectations: expectations,
-          smellsSet: {
-            tag: 'AllSmells',
-            exclude: (exceptions + default_smell_exceptions)
-          },
-          domainLanguage: domain_language
-        }
-      }
-    end
 
     def domain_language
       {
@@ -58,20 +42,12 @@ module Mumukit
       []
     end
 
-    def compile_sample(request)
-      compiled_content = compile_content(request[:content])
-      if language == 'Mulang'
-        {
-          tag: 'MulangSample',
-          ast: compiled_content
-        }
-      else
-        {
-          tag: 'CodeSample',
-          language: language,
-          content: compiled_content
-        }
-      end
+    def mulang_code(request)
+      Mulang::Code.new(mulang_language, compile_content(request[:content]))
+    end
+
+    def mulang_language
+      language == 'Mulang' ? Mulang::Language::External.new :  Mulang::Language::Native.new(language)
     end
 
     def compile_expectations_and_exceptions(request)

data/lib/mumukit/templates/try_hook.rb

@@ -6,8 +6,12 @@ module Mumukit
       super request
     end
 
-    def check(results)
-      @checker.check(results, @goal)
+    def post_process_file(file, result, status)
+      structured_results = to_structured_results(file, result, status)
+      check_results = @checker.check structured_results, @goal
+      [check_results[2], check_results[1], structured_results[:query]]
     end
+
+    required :to_structured_results
   end
 end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.16.1'
+  VERSION = '2.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.46'
+- !ruby/object:Gem::Dependency
+  name: mulang
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: mumukit-inspection
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +288,7 @@ files:
 - lib/mumukit/server.rb
 - lib/mumukit/server/app.rb
 - lib/mumukit/server/response_builder.rb
+- lib/mumukit/server/test_pipeline.rb
 - lib/mumukit/server/test_server.rb
 - lib/mumukit/templates.rb
 - lib/mumukit/templates/file_hook.rb
@@ -313,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit