mumukit 2.28.1 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b2d5496f455caaf94529b6b558805e7dcd5a47b3a5d3995fbf025bf138b5ca
-  data.tar.gz: 0755adc216b5ac1b3d9915575b5460807cd5cfcb8ba92cfff6a1912c14567ee2
+  metadata.gz: 3a827027f338d223865479f6fbd0bbc8ca7f36f52caf20f3402e08c749e0b3f7
+  data.tar.gz: 5208a95b1fe08adc9864cd0ec0b1dcdd12e6e91fcaf701664a1b9a5a52e1c08c
 SHA512:
-  metadata.gz: b10d93420dc619acf65d42525acd7079c423a4c404a00894c3d7b2a4f6f719e0816470c2170df32fcaf0d9c13fcb03f93d36a65a6b3718ac0bc18d67a5999b3f
-  data.tar.gz: 8e3f3023b3a46aa4806f1094d668874d924385303400eef3fe9424c3c9cad0afa35606f57860bc1f4d48d90392551c3097167eee5a2232d318ec664d72ed46b6
+  metadata.gz: 4fdd7cead0cf6d3d21f1dd89a65a85097c7c0576151e97db14b8d82346559fe0e0c0d257d26811bece79fe3b6cc70aa8117b453cb30b65b74d712f42d56745b9
+  data.tar.gz: 7d34da4a77324f5aaeedc0e3162b8e54902b423e14e7c0d830fbf51d76d956e73da28a3f650d260209f6462d0bc2e7a418e06bcd7bf5c371af1727cc03e91b14

data/lib/mumukit.rb

@@ -53,6 +53,7 @@ end
 
 require 'mumukit/content_type'
 
+require_relative 'mumukit/string'
 require_relative 'mumukit/version'
 require_relative 'mumukit/env'
 require_relative 'mumukit/cookie'

data/lib/mumukit/isolated_environment.rb

@@ -7,12 +7,11 @@ module Mumukit
     attr_accessor :container
 
     def configure!(*files)
-
       filenames = files.map { |it| File.absolute_path(it.path) }
-      dirnames = filenames.map { |it| Pathname.new(it).dirname }
+      dirnames = filenames.map { |it| Pathname.new(it).dirname }.uniq
 
       binds = dirnames.map { |it| "#{it}:#{it}" }
-      volumes = Hash[[dirnames.map { |it| [it, {}] }]]
+      volumes = Hash[dirnames.map { |it| [[it, {}]] }]
 
       command = yield(*filenames).split
 

data/lib/mumukit/server/test_server.rb

@@ -28,9 +28,13 @@ class Mumukit::Server::TestServer
   end
 
   def parse_request_body(sinatra_request)
-    JSON.parse(sinatra_request.body.read).tap do |it|
-      I18n.locale = it['locale'] || :en
-    end rescue {}
+    begin
+      parse_body(sinatra_request).tap do |it|
+        I18n.locale = it['locale'] || :en
+      end
+    rescue StandardError => e
+      raise StandardError.new("Error parsing request body. Cause: #{e}")
+    end
   end
 
   def test!(request)
@@ -120,4 +124,10 @@ class Mumukit::Server::TestServer
   def default_repo_url
     "https://github.com/mumuki/mumuki-#{Mumukit.runner_name}-runner"
   end
+
+  def parse_body(sinatra_request)
+    json = sinatra_request.body.read
+    return {} if json.empty?
+    JSON.parse json
+  end
 end

data/lib/mumukit/string.rb

@@ -0,0 +1,5 @@
+class String
+  def sanitize_as_filename
+    self.gsub /[^0-9A-Z\.-]/i, '_'
+  end
+end

data/lib/mumukit/templates.rb

@@ -15,6 +15,7 @@ require_relative './templates/with_code_smells'
 require_relative './templates/with_cookie'
 
 require_relative './templates/file_hook'
+require_relative './templates/multi_file_hook'
 require_relative './templates/try_hook'
 require_relative './templates/expectations_hook'
 require_relative './templates/mulang_expectations_hook'

data/lib/mumukit/templates/mulang_expectations_hook.rb

@@ -6,7 +6,7 @@ module Mumukit
     FUNCTIONAL_SMELLS = %w(HasRedundantParameter HasRedundantGuards)
     OBJECT_ORIENTED_SMELLS = %w(DoesNullTest ReturnsNull)
     IMPERATIVE_SMELLS = %w(HasRedundantLocalVariableReturn HasAssignmentReturn)
-    EXPRESSIVENESS_SMELLS = %w(HasTooShortBindings HasWrongCaseBindings HasMisspelledBindings)
+    EXPRESSIVENESS_SMELLS = %w(HasTooShortIdentifiers HasWrongCaseIdentifiers HasMisspelledIdentifiers)
     GENERIC_SMELLS = %w(IsLongCode HasCodeDuplication HasRedundantLambda HasRedundantIf DoesTypeTest HasRedundantBooleanComparison HasEmptyIfBranches)
 
     required :language, 'You have to provide a Mulang-compatible language in order to use this hook'

data/lib/mumukit/templates/multi_file_hook.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+
+module Mumukit
+  class Templates::MultiFileHook < Templates::FileHook
+    include Mumukit::Templates::WithMultipleFiles
+
+    def compile(request)
+      return super unless has_files?(request)
+
+      self.request = request
+      write_tempdir! compile_file_content(request)
+    end
+
+    def run!(tempdir)
+      return super unless has_files?(request)
+
+      begin
+        result, status = run_files!(*tempdir.files)
+        post_process_file(tempdir.files, cleanup_raw_result(result), status)
+      ensure
+        FileUtils.rm_rf tempdir.dir
+      end
+    end
+  end
+end

data/lib/mumukit/templates/with_embedded_environment.rb

@@ -5,8 +5,10 @@ module Mumukit
       include Mumukit::WithCommandLine
     end
 
-    def run_file!(file)
-      run_command command_line(file.path)
+    def run_files!(*files)
+      run_command command_line(*files.map {|f| f.path})
     end
+
+    alias_method 'run_file!', 'run_files!'
   end
 end

data/lib/mumukit/templates/with_isolated_environment.rb

@@ -1,11 +1,13 @@
 module Mumukit
   module Templates::WithIsolatedEnvironment
-    def run_file!(file)
+    def run_files!(*files)
       env = Mumukit::IsolatedEnvironment.new
-      env.configure!(file) { |filename| command_line(filename) }
+      env.configure!(*files) { |*filenames| command_line(*filenames) }
       env.run!
     ensure
       env.destroy!
     end
+
+    alias_method 'run_file!', 'run_files!'
   end
 end

data/lib/mumukit/templates/with_multiple_files.rb

@@ -1,6 +1,10 @@
 module Mumukit::Templates::WithMultipleFiles
   def files_of(request)
     raise 'You need to enable Mumukit.config.multifile first!' unless Mumukit.config.multifile
-    request.content.is_a?(Hash) ? request.content : {}
+    has_files?(request) ? request.content : {}
+  end
+
+  def has_files?(request)
+    request.content.is_a?(Hash)
   end
 end

data/lib/mumukit/version.rb

@@ -1,3 +1,3 @@
 module Mumukit
-  VERSION = '2.28.1'
+  VERSION = '2.29.0'
 end

data/lib/mumukit/with_tempfile.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'tmpdir'
 
 module Mumukit
   module WithTempfile
@@ -16,6 +17,13 @@ module Mumukit
       end
     end
 
+    def write_tempdir!(files)
+      dir = Dir.mktmpdir
+      files.map do |filename, content|
+        File.open("#{dir}/#{filename.sanitize_as_filename}", 'w') { |file| file.write content; file }
+      end.try { |it| struct dir: dir, files: it }
+    end
+
     def with_tempfile
       file = create_tempfile
       yield file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit
 version: !ruby/object:Gem::Version
-  version: 2.28.1
+  version: 2.29.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -300,10 +300,12 @@ files:
 - lib/mumukit/server/response_builder.rb
 - lib/mumukit/server/test_pipeline.rb
 - lib/mumukit/server/test_server.rb
+- lib/mumukit/string.rb
 - lib/mumukit/templates.rb
 - lib/mumukit/templates/expectations_hook.rb
 - lib/mumukit/templates/file_hook.rb
 - lib/mumukit/templates/mulang_expectations_hook.rb
+- lib/mumukit/templates/multi_file_hook.rb
 - lib/mumukit/templates/multi_file_precompile_hook.rb
 - lib/mumukit/templates/try_hook.rb
 - lib/mumukit/templates/with_code_smells.rb
@@ -340,8 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Mumuki Test Server Development Kit