cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

parent | child

Description:

locks dir based on temp file, does not copy dir when copying scripts, added proper rescue for ln_s

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

r103:933325ce824a - Sun, 25 Apr 2010 02:11:41 - 4 files changed: 4 inserted, 3 deleted

lib/dir_init.rb ¶ +1 -1

               module DirInit
                 class Manager
                   def initialize(dir_name, usage_filename='.usage_counter')
                     @dir_name = dir_name
                     @usage_filename = usage_filename
                   end
                   # Check if someone has initialized the dir.  If not, call block.
                   def setup    # :yields: block
-            -       dir = File.new(@dir_name)
+            +       dir = File.new(@dir_name + '/lockfile',"w+")
                     dir.flock(File::LOCK_EX)
                     begin
                       counter_filename = get_counter_filename
                       if File.exist? counter_filename
                         # someone is here
                         f = File.new(counter_filename,"r+")
                         counter = f.read.to_i
                         f.seek(0)
                         f.write("#{counter+1}\n")
                         f.close
                       else
                         # i'm the first, create the counter file

lib/engine.rb ¶ +1

                   def copy_script(problem_home)
                     script_dir = "#{problem_home}/script"
                     std_script_dir = get_std_script_dir
                     raise "std-script directory not found" if !FileTest.exist?(std_script_dir)
                     scripts = Dir[std_script_dir + '/*']
                     copied = []
                     scripts.each do |s|
                       fname = File.basename(s)
+            +         next if FileTest.directory?(s)
                       if !FileTest.exist?("#{script_dir}/#{fname}")
                         copied << fname
                         FileUtils.cp(s, "#{script_dir}")
                       end
                     end
                     return copied
                   end
                   def copy_log_filename(problem_home)
                     return File.join(problem_home, '.scripts_copied')
                   end

lib/test_request_helper.rb ¶ +1 -1

               #
               # 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
+            +     rescue NotImplementedError
                     FileUtils.cp(src,des)
                   end
                 end
                 def self.call_and_log(error_message)
                   begin
                     yield
                   rescue
                     msg = "ERROR: #{error_message}"
                     raise msg
                   end
                 end

std-script/.gitignore ¶ +1 -1

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

	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