cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r101:65a501bec36b` public

parent | child

Description:

removed many 'system' invokations

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r101:65a501bec36b - Sat, 24 Apr 2010 12:18:00 - 4 files changed: 84 inserted, 41 deleted

lib/engine.rb ¶ +2 -3

               require 'fileutils'
-            - require 'ftools'
               require File.join(File.dirname(__FILE__),'dir_init')
               module Grader
                 #
                 # A grader engine grades a submission, against anything: a test
                     copied = []
                     scripts.each do |s|
                       fname = File.basename(s)
                       if !FileTest.exist?("#{script_dir}/#{fname}")
                         copied << fname
-            -           system("cp #{s} #{script_dir}")
+            +           FileUtils.cp(s, "#{script_dir}")
                       end
                     end
                     return copied
                   end
                   def clear_copy_log(problem_home)
                     File.delete(copy_log_filename(problem_home))
                   end
                   def clear_script(log,problem_home)
                     log.each do |s|
-            -         system("rm #{problem_home}/script/#{s}")
+            +         FileUtils.rm("#{problem_home}/script/#{s}")
                     end
                   end
                   def mkdir_if_does_not_exist(dirname)
                     Dir.mkdir(dirname) if !FileTest.exist?(dirname)
                   end

lib/test_request_helper.rb ¶ +29 -20

               # This part contains various test_request helpers for interfacing
               # with Grader::Engine.  There are TestRequestRoomMaker and
               # TestRequestReporter.
               module Grader
+            +   def self.link_or_copy(src, des)
+            +     begin
+            +       FileUtils.ln_s(src, des)
+            +     rescue
+            +       FileUtils.cp(src,des)
+            +     end
+            +   end
+            +
+            +   def self.call_and_log(error_message)
+            +     begin
+            +       yield
+            +     rescue
+            +       msg = "ERROR: #{error_message}"
+            +       raise msg
+            +     end
+            +   end
+            +
                 #
                 # A TestRequestRoomMaker is a helper object for Engine
                 # - finds grading room: in user_result_dir/(user)/test_request/ ...
                 # - prepare problem configuration for grading --- basically it copy
                 #   all config files, and copy user's input into the testcase
                 #   directory.  First, it finds the template from problem template
                     #
                     # Also copy additional submitted file to this directory as well.
                     # The program would see this file only if it is copied
                     #    to the sandbox directory later.  The run script should do it.
                     #
                     if FileTest.exists?("#{test_request.input_file_name}.files")
-            -         cmd = "cp #{test_request.input_file_name}.files/* #{grading_room}"
-            -         system(cmd)
+            +         FileUtils.cp_r("#{test_request.input_file_name}.files/.",
+            +                        "#{grading_room}")
                     end
                     grading_room
                   end
                   def find_problem_home(test_request)
                     user = test_request.user
                     "#{@config.user_result_dir}" +
                       "/#{user.login}/test_request/#{problem_name}"
                   end
                   def copy_problem_template(template_dir,problem_home)
-            -       cmd = "cp -R #{template_dir}/* #{problem_home}"
-            -       system_and_raise_when_fail(cmd,"Test Request: cannot copy problem template")
+            +       Grader::call_and_log("Test Request: cannot copy problem template") {
+            +         FileUtils.cp_r("#{template_dir}/.","#{problem_home}")
+            +       }
                   end
+            -
-            -     def link_input_file(test_request,problem_home)
+            +
+            +     def link_input_file(test_request, problem_home)
                     input_fname = "#{test_request.input_file_name}"
                     if !File.exists?(input_fname)
                       raise "Test Request: input file not found."
                     end
                     input_fname_problem_home = "#{problem_home}/test_cases/1/input-1.txt"
                     if File.exists?(input_fname_problem_home)
                       FileUtils.rm([input_fname_problem_home], :force => true)
                     end
-            -       cmd = "ln -s #{input_fname} #{input_fname_problem_home}"
-            -       system_and_raise_when_fail(cmd,"Test Request: cannot link input file")
+            +       Grader::link_or_copy("#{input_fname}", "#{input_fname_problem_home}")
                   end
                   def remove_data_files(problem_home)
                     if File.exists?("#{problem_home}/test_cases/1/input-1.txt")
-            -         cmd = "rm #{problem_home}/test_cases/1/*"
-            -         system_and_raise_when_fail(cmd,"Test Request: cannot remove data files")
-            -       end
-            -     end
+            -
-            -     def system_and_raise_when_fail(cmd,msg)
-            -       if !system(cmd)
-            -         raise msg
+            +         Grader::call_and_log("Test Request: cannot remove data files") {
+            +           FileUtils.rm Dir.glob("#{problem_home}/test_cases/1/*")
+            +         }
                     end
                   end
                 end
                 class TestRequestReporter
                   protected
                   def link_output_file(test_request, fname)
                     target_file_name = random_output_file_name(test_request.user,
                                                                test_request.problem)
                     FileUtils.mkdir_p(File.dirname(target_file_name))
-            -       cmd = "ln -s #{fname} #{target_file_name}"
-            -       if !system(cmd)
-            -         raise "TestRequestReporter: cannot move output file"
-            -       end
+            +       Grader::link_or_copy("#{fname}", "#{target_file_name}")
                     return target_file_name
                   end
                   def random_output_file_name(user,problem)
                     problem_name = TestRequest.name_of(problem)
                     begin

std-script/judge ¶ +48 -14

               #!/usr/bin/ruby
+            + require 'fileutils'
+            +
               def log(str='')
                 if ENV['TALKATIVE']!=nil
                   puts str
                 end
                 if ENV['GRADER_LOGGING']!=nil
                   log_fname = ENV['GRADER_LOGGING']
                   msg = "ERROR: #{error_message}"
                   log msg
                   raise msg
                 end
               end
+            + def call_and_log(error_message)
+            +   begin
+            +     yield
+            +   rescue
+            +     msg = "ERROR: #{error_message}"
+            +     log msg
+            +     raise msg
+            +   end
+            + end
+            +
+            + def clear_and_create_empty_dir(dir)
+            +   FileUtils.rm_rf(dir, :secure => true)
+            +   call_and_log("Cannot make directory #{dir}.") { FileUtils.mkdir(dir) }
+            + end
+            +
               # ARGV[0] --- language
               # ARGV[1] --- program source file
               # ARGV[2] --- test result directory
               # ARGV[3] --- sandbox directory
               if ARGV.length < 2 || ARGV.length > 4
               if ARGV.length >= 3
                 test_result_dir = ARGV[2]
               else
                 test_result_dir = "#{current_dir}/test-result"
               end
+            +
               log "Test result directory: #{test_result_dir}"
-            - system("rm -Rf #{test_result_dir}")
-            - execute("mkdir #{test_result_dir}", "Cannot make directory #{test_result_dir}.")
+            + clear_and_create_empty_dir(test_result_dir)
               if ARGV.length >= 4
                 sandbox_dir = ARGV[3]
               else
                 sandbox_dir = "#{current_dir}/sandbox"
               end
               log "Sandbox directory: #{sandbox_dir}"
-            - system("rm -Rf #{sandbox_dir}")
-            - execute("mkdir #{sandbox_dir}", "Cannot make directory #{sandbox_dir}")
+            + clear_and_create_empty_dir(sandbox_dir)
               # Compile
               log
               log "Compiling..."
-            - execute("cp #{source_file} #{sandbox_dir}", "Cannot copy the source file to #{sandbox_dir}")
+            + call_and_log("Cannot copy the source file to #{sandbox_dir}") {
+            +   FileUtils.cp(source_file, sandbox_dir)
+            + }
               begin
                 Dir.chdir sandbox_dir
               rescue
                 log "ERROR: Cannot change directory to #{sandbox_dir}."
                 exit(127)
               end
               execute("#{problem_home}/script/compile #{language} #{source_file}", "Compilation error!")
               compile_message = `cat compiler_message`
               compile_message.strip!
-            - execute("mv compiler_message #{test_result_dir}", "Cannot move the compiler message to #{test_result_dir}.")
+            + call_and_log("Cannot move the compiler message to #{test_result_dir}.") {
+            +   FileUtils.mv("compiler_message", test_result_dir)
+            + }
               if !FileTest.exist?("a.out")
                 log "Cannot compile the source code. See message in #{test_result_dir}/compile_message"
                 exit(127)
               else
-            -   execute("mv a.out #{test_result_dir}", "Cannot move the compiled program to #{test_result_dir}")
-            -   system("rm -Rf #{sandbox_dir}/*")
+            +   call_and_log("Cannot move the compiled program to #{test_result_dir}") {
+            +     FileUtils.mv("a.out",test_result_dir)
+            +   }
+            +   FileUtils.rm_rf("#{sandbox_dir}/.")
               end
               require "#{problem_home}/script/test_dsl.rb"
               load "#{problem_home}/test_cases/all_tests.cfg"
               problem = Problem.get_instance
               (1..(problem.num_tests)).each do |test_num|
                 $stdout.print "[#{test_num}]"
                 $stdout.flush
                 log "Test number: #{test_num}"
-            -   execute("cp #{test_result_dir}/a.out #{sandbox_dir}", "Cannot copy the compiled program into #{sandbox_dir}")
+            +   call_and_log("Cannot copy the compiled program into #{sandbox_dir}") {
+            +     FileUtils.cp("#{test_result_dir}/a.out", sandbox_dir)
+            +   }
                 begin
                   execute("#{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
                 rescue
                   # do nothing
                 end
-            -   execute("mkdir #{test_result_dir}/#{test_num}", "Cannot create directory #{test_result_dir}/#{test_num}")
-            -   execute("mv #{sandbox_dir}/result #{test_result_dir}/#{test_num}", "Cannot copy the result file into #{test_result_dir}/#{test_num}")
-            -   execute("mv #{sandbox_dir}/comment #{test_result_dir}/#{test_num}", "Cannot copy the comment file into #{test_result_dir}/#{test_num}")
-            -   execute("mv #{sandbox_dir}/output.txt #{test_result_dir}/#{test_num}", "Cannot copy the output file into #{test_result_dir}/#{test_num}")
-            -   execute("rm -Rf #{sandbox_dir}/*", "Cannot clear #{sandbox_dir}")
+            +   call_and_log("Cannot create directory #{test_result_dir}/#{test_num}") {
+            +     FileUtils.mkdir "#{test_result_dir}/#{test_num}"
+            +   }
+            +   call_and_log("Cannot copy the result file into #{test_result_dir}/#{test_num}") {
+            +     FileUtils.mv "#{sandbox_dir}/result", "#{test_result_dir}/#{test_num}"
+            +   }
+            +   call_and_log("Cannot copy the comment file into #{test_result_dir}/#{test_num}") {
+            +     FileUtils.mv "#{sandbox_dir}/comment", "#{test_result_dir}/#{test_num}"
+            +   }
+            +   call_and_log("Cannot copy the output file into #{test_result_dir}/#{test_num}") {
+            +     FileUtils.mv "#{sandbox_dir}/output.txt", "#{test_result_dir}/#{test_num}"
+            +   }
+            +   call_and_log("Cannot clear #{sandbox_dir}") {
+            +     FileUtils.rm_rf(Dir.glob("#{sandbox_dir}/*"), :secure => true)
+            +   }
               end
               $stdout.print "[done]\n"
               # Grade
               log

test/engine_spec_helper.rb ¶ +5 -4

+            + require 'fileutils'
+            +
               module GraderEngineHelperMethods
                 def clear_sandbox
                   config = Grader::Configuration.get_instance
-            -     clear_cmd = "rm -rf #{config.test_sandbox_dir}/*"
-            -     system(clear_cmd)
+            +     FileUtils.rm_rf(Dir.glob("#{config.test_sandbox_dir}/*"),
+            +                     :secure => true)
                 end
                 def init_sandbox
                   config = Grader::Configuration.get_instance
                   clear_sandbox
                   FileUtils.mkdir_p config.user_result_dir
-            -     cp_cmd = "cp -R #{config.test_data_dir}/ev #{config.test_sandbox_dir}"
-            -     system(cp_cmd)
+            +     FileUtils.cp_r("#{config.test_data_dir}/ev", "#{config.test_sandbox_dir}")
                 end
                 def create_submission_from_file(id, user, problem,
                                                 source_fname, language=nil)
                   language = stub(Language, :name => 'c', :ext => 'c') if language==nil

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r101:65a501bec36b - Sat, 24 Apr 2010 12:18:00 - 4 files changed: 84 inserted, 41 deleted

Sign in to your account

Commit r101:65a501bec36b public

Author

r101:65a501bec36b - Sat, 24 Apr 2010 12:18:00 - 4 files changed: 84 inserted, 41 deleted

Commit `r101:65a501bec36b` public