cafe-grader-web Commit - r188:0b607f9b89c1

r188:0b607f9b89c1 - Wed, 13 May 2009 04:52:53 - 12 files changed: 15 inserted, 401 deleted

judge/scripts/config/environment.rb.SAMPLE created 644 ¶ +10

@@ -0,0 +1,10
	1	+ # Rails app directory
	2	+ RAILS_ROOT = "/home/jittat/web_grader"
	3	+
	4	+ GRADER_ROOT = "/home/jittat/grader/scripts"
	5	+
	6	+ # This load all required codes
	7	+ require File.join(File.dirname(__FILE__),'../lib/boot')
	8	+
	9	+ # load the required environment file
	10	+ require File.dirname(__FILE__) + "/env_#{GRADER_ENV}.rb"

db/schema.rb ¶ +1 -12

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20090429014554) do
+            + ActiveRecord::Schema.define(:version => 20090426131044) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
-            -   create_table "grader_messages", :force => true do |t|
-            -     t.integer  "grader_process_id"
-            -     t.integer  "command"
-            -     t.string   "options"
-            -     t.integer  "target_id"
-            -     t.boolean  "taken"
-            -     t.integer  "taken_grader_process_id"
-            -     t.datetime "created_at"
-            -     t.datetime "updated_at"
-            -   end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end

judge/scripts/config/.gitignore ¶ +1 -1

@@ -1,2 +1,2
1	- env_*.rb	1	+ env*.rb
2		2

judge/scripts/grader ¶ +1 -1

                 end
               end
               def config
                 Grader::Configuration.get_instance
               end
               def log_file_name
                 if !File.exists?(config.log_dir)
                   raise "Log directory does not exist: #{config.log_dir}"
                 end
                 config.log_dir +
-            -     "/#{GRADER_ENV}.#{Process.pid}"
+            +     "/#{GRADER_ENV}_#{config.grader_mode}.#{Process.pid}"
               end
               def log(str)
                 if config.talkative
                   puts str
                 end
                 if config.logging
                   fp = File.open(log_file_name,"a")
                   fp.puts("GRADER: #{Time.new.strftime("%H:%M")} #{str}")
                   fp.close
                 end
               end

judge/scripts/lib/engine.rb ¶ +2 -2

                       @room_maker.save_source(submission,source_name)
                       problem_home = @room_maker.find_problem_home(submission)
                       # puts "GRADING DIR: #{grading_dir}"
                       # puts "PROBLEM DIR: #{problem_home}"
                       dinit = DirInit::Manager.new(problem_home)
                       dinit.setup do
                         copy_log = copy_script(problem_home)
                         save_copy_log(problem_home,copy_log)
                       end
+            +
                       call_judge(problem_home,language,grading_dir,source_name)
                       @reporter.report(submission,"#{grading_dir}/test-result")
                       dinit.teardown do
                         copy_log = load_copy_log(problem_home)
                         clear_copy_log(problem_home)
                         clear_script(copy_log,problem_home)
                       end
                     rescue RuntimeError => msg
                       @reporter.report_error(submission,"Grading error: #{msg}")
                   protected
                   def talk(str)
                     if @config.talkative
                       puts str
                     end
                   end
                   def call_judge(problem_home,language,grading_dir,fname)
                     ENV['PROBLEM_HOME'] = problem_home
-            -       talk "Grading in #{grading_dir}"
+            +       talk grading_dir
                     Dir.chdir grading_dir
                     cmd = "#{problem_home}/script/judge #{language} #{fname}"
                     talk "CMD: #{cmd}"
                     system(cmd)
                   end
                   def get_std_script_dir
                     GRADER_ROOT + '/std-script'
                   end
                   def copy_script(problem_home)
                     script_dir = "#{problem_home}/script"

app/models/grader_message.rb removed ¶ -90

deleted file

db/migrate/20090429014554_create_grader_messages.rb removed ¶ -17

deleted file

judge/scripts/config/environment.rb removed ¶ -9

deleted file

judge/scripts/grader-batch removed ¶ -135

deleted file

spec/models/grader_message_spec.rb removed ¶ -119

deleted file

test/fixtures/grader_messages.yml removed ¶ -7

deleted file

test/unit/grader_message_test.rb removed ¶ -8

deleted file

	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

r188:0b607f9b89c1 - Wed, 13 May 2009 04:52:53 - 12 files changed: 15 inserted, 401 deleted

Sign in to your account

Commit r188:0b607f9b89c1 public

Author

r188:0b607f9b89c1 - Wed, 13 May 2009 04:52:53 - 12 files changed: 15 inserted, 401 deleted

Commit `r188:0b607f9b89c1` public