Backup commit

Gemfile

@@ -60,7 +60,7 @@ group :test do
   gem 'nyan-cat-formatter'
   gem 'rake'
   gem 'rspec-autotest'
-  gem 'rspec-rails', '~> 3.1.0'
+  gem 'rspec-rails'
   gem 'selenium-webdriver'
   gem 'simplecov', require: false
 end

Gemfile.lock

@@ -363,7 +363,7 @@ DEPENDENCIES
   rake
   ransack
   rspec-autotest
-  rspec-rails (~> 3.1.0)
+  rspec-rails
   rubocop
   rubocop-rspec
   rubytree

app/models/exercise.rb

@@ -23,7 +23,7 @@ class Exercise < ActiveRecord::Base
   validates :token, presence: true, uniqueness: true
 
   def average_percentage
-    (average_score / maximum_score * 100).round if average_score
+    (average_score/ maximum_score * 100).round if average_score
   end
 
   def average_score

lib/docker_client.rb

@@ -172,7 +172,12 @@ class DockerClient
   rescue Timeout::Error
     {status: :timeout}
   ensure
-    Concurrent::Future.execute { self.class.destroy_container(container) }
+    Concurrent::Future.execute {
+      #self.class.destroy_container(container)
+      FileUtils.rm_rf(local_workspace_path(container)) if local_workspace_path(container)
+      FileUtils.mkdir(local_workspace_path)
+      DockerContainerPool.return_container(container, @execution_environment)
+    }
   end
   private :send_command
 

lib/docker_container_pool.rb

@@ -20,6 +20,11 @@ class DockerContainerPool
     DockerClient.create_container(execution_environment)
   end
 
+  def self.return_container(container, execution_environment)
+    #container.start()
+    @containers[execution_environment.id].push(container)
+  end
+
   def self.get_container(execution_environment)
     if config[:active]
       @containers[execution_environment.id].try(:shift) || create_container(execution_environment)