git-contest 0.1.1 → 0.1.2

data/spec/lib/contest/driver/t001_aizu_online_judge_spec.rb

@@ -1,28 +1,12 @@
 require 'spec_helper'
 
-require 'mechanize'
 require 'contest/driver/aizu_online_judge'
 
-describe "T001: AizuOnlineJudge Driver" do
-  before :each do
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t001"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-  end
-
-  after :each do
-    Dir.chdir @test_dir
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
+describe "T001: AizuOnlineJudge Driver" do 
   before do
     # setup driver
     @driver = Contest::Driver::AizuOnlineJudge.new
     @driver.stub(:sleep).and_return(0)
-    @driver.client = Mechanize.new {|agent|
-      agent.user_agent_alias = 'Windows IE 7'
-    }
     ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t001/config.yml')
     init
 
@@ -72,8 +56,8 @@ describe "T001: AizuOnlineJudge Driver" do
 
   context "A001: #get_status_wait" do
     it "001: Check Status" do
-      ret = @driver.get_status_wait 'test_user', '111'
-      ret.should === "Wrong Answer"
+      ret = @driver.send :get_status_wait, 'test_user', '111'
+      expect(ret).to eq "Wrong Answer"
     end
 
     it "002: Check Timeout" do
@@ -82,9 +66,9 @@ describe "T001: AizuOnlineJudge Driver" do
         @flag = true
       end
       @driver.on 'timeout', proc
-      @driver.get_status_wait 'test_user', '999'
+      @driver.send :get_status_wait, 'test_user', '999'
       @driver.off 'timeout', proc
-      @flag.should === true
+      expect(@flag).to eq true
     end
 
     it "002: Check Timeout noset" do
@@ -94,8 +78,8 @@ describe "T001: AizuOnlineJudge Driver" do
       end
       @driver.on 'timeout', proc
       @driver.off 'timeout', proc
-      @driver.get_status_wait 'test_user', '999'
-      @flag.should === false
+      @driver.send :get_status_wait, 'test_user', '999'
+      expect(@flag).to eq false
     end
   end
 
@@ -115,10 +99,10 @@ describe "T001: AizuOnlineJudge Driver" do
     end
 
     it "001: Check Status" do
-      ret = @driver.get_status_wait 'test_user', '111'
-      ret.should === "Wrong Answer"
-      ret = @driver.get_status_wait 'test_user', '112'
-      ret.should === "Accepted"
+      ret = @driver.send :get_status_wait, 'test_user', '111'
+      expect(ret).to eq "Wrong Answer"
+      ret = @driver.send :get_status_wait, 'test_user', '112'
+      expect(ret).to eq "Accepted"
     end
   end
 
@@ -187,7 +171,19 @@ describe "T001: AizuOnlineJudge Driver" do
       @driver.submit()
 
       @flag = @flag_start && @flag_before_submit && @flag_after_submit && @flag_before_wait && @flag_after_wait && @flag_finish
-      @flag.should === true
+      expect(@flag).to eq true
+    end
+  end
+
+  context "A004: #normalize_problem_id" do
+    it "1234" do
+      expect(@driver.send(:normalize_problem_id, "1234")).to eq "1234"
+    end
+    it "0240" do
+      expect(@driver.send(:normalize_problem_id, "0240")).to eq "0240"
+    end
+    it "10000" do
+      expect(@driver.send(:normalize_problem_id, "10000")).to eq "10000"
     end
   end
 end

data/spec/lib/contest/driver/t002_codeforces_spec.rb

@@ -1,21 +1,8 @@
 require 'spec_helper'
 
 require 'contest/driver/codeforces'
-require 'mechanize'
 
 describe "T002: Codeforces Driver" do
-  before :each do
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t002"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-  end
-
-  after :each do
-    Dir.chdir @test_dir
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
   before(:each) do
     @driver = Contest::Driver::Codeforces.new
     @driver.stub(:sleep).and_return(0)
@@ -34,15 +21,11 @@ describe "T002: Codeforces Driver" do
           'Content-Type' => 'text/html',
         },
       )
-
-      @driver.client = Mechanize.new {|agent|
-        agent.user_agent_alias = 'Windows IE 7'
-      }
     end
 
     it "check status" do
-      ret = @driver.get_status_wait 11111, 22222
-      ret.should include "Accepted"
+      ret = @driver.send :get_status_wait, 11111, 22222
+      expect(ret).to include "Accepted"
     end
   end
 
@@ -132,7 +115,7 @@ describe "T002: Codeforces Driver" do
         :problem_id => 'A',
         :source => 'test_source.rb',
       )
-      @driver.submit.should include "Codeforces 222222A: Accepted"
+      expect(@driver.submit).to include "Codeforces 222222A: Accepted"
     end
 
     it "check events" do
@@ -192,7 +175,7 @@ describe "T002: Codeforces Driver" do
       @driver.submit
 
       @flag = @flag_start && @flag_before_login && @flag_after_login && @flag_before_submit && @flag_after_submit && @flag_before_wait && @flag_after_wait && @flag_finish
-      @flag.should === true
+      expect(@flag).to eq true
     end
   end
 end

data/spec/lib/contest/driver/t003_uva_online_judge_spec.rb

@@ -1,21 +1,8 @@
 require 'spec_helper'
 
 require 'contest/driver/codeforces'
-require 'mechanize'
 
 describe "T003: UvaOnlineJudge Driver" do
-  before :each do
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t003"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-  end
-
-  after :each do
-    Dir.chdir @test_dir
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
   before(:each) do
     @driver = Contest::Driver::UvaOnlineJudge.new
     @driver.stub(:sleep).and_return(0)
@@ -24,19 +11,19 @@ describe "T003: UvaOnlineJudge Driver" do
   context "A001: #get_submission_id" do
     it "should return last submission id" do
       ret = @driver.get_submission_id(read_file('/mock/t003/after_submit.html'))
-      ret.should eq '99999'
+      expect(ret).to eq '99999'
     end
   end
 
   context "A002: #get_submission_status" do
     it "Sent to judge" do
       ret = @driver.get_submission_status('99999', read_file('/mock/t003/my_submissions.sent_to_judge.html'))
-      ret.should eq 'Sent to judge'
+      expect(ret).to eq 'Sent to judge'
     end
 
     it "Compilation error" do
       ret = @driver.get_submission_status('99999', read_file('/mock/t003/my_submissions.compile_error.html'))
-      ret.should eq 'Compilation error'
+      expect(ret).to eq 'Compilation error'
     end
   end
 
@@ -125,7 +112,7 @@ describe "T003: UvaOnlineJudge Driver" do
         :problem_id => '333333',
         :source => 'test_source.java',
       )
-      @driver.submit.should include "UVa 333333: Wrong answer"
+      expect(@driver.submit).to include "UVa 333333: Wrong answer"
     end
 
     it "Check events" do
@@ -173,43 +160,43 @@ describe "T003: UvaOnlineJudge Driver" do
       @driver.submit()
 
       @flag = @flag_start && @flag_before_submit && @flag_after_submit && @flag_before_wait && @flag_after_wait && @flag_finish
-      @flag.should === true
+      expect(@flag).to eq true
     end
   end
 
   context "A004: #is_wait_status" do
     context "wait" do
       it "Sent to judge" do
-        @driver.is_wait_status("Sent to judge").should be true
+        expect(@driver.is_wait_status("Sent to judge")).to be true
       end
       it "Running" do
-        @driver.is_wait_status("Running").should be true
+        expect(@driver.is_wait_status("Running")).to be true
       end
       it "Compiling" do
-        @driver.is_wait_status("Running").should be true
+        expect(@driver.is_wait_status("Running")).to be true
       end
       it "Linking" do
-        @driver.is_wait_status("Linking").should be true
+        expect(@driver.is_wait_status("Linking")).to be true
       end
       it "Received" do
-        @driver.is_wait_status("Received").should be true
+        expect(@driver.is_wait_status("Received")).to be true
       end
       it "empty" do
-        @driver.is_wait_status("").should be true
+        expect(@driver.is_wait_status("")).to be true
       end
     end
     context "no wait" do
       it "Accepted" do
-        @driver.is_wait_status("Accepted").should be false
+        expect(@driver.is_wait_status("Accepted")).to be false
       end
       it "Compilation error" do
-        @driver.is_wait_status("Compilation error").should be false
+        expect(@driver.is_wait_status("Compilation error")).to be false
       end
       it "Wrong answer" do
-        @driver.is_wait_status("Wrong answer").should be false
+        expect(@driver.is_wait_status("Wrong answer")).to be false
       end
       it "Runtime error" do
-        @driver.is_wait_status("Runtime error").should be false
+        expect(@driver.is_wait_status("Runtime error")).to be false
       end
     end
   end

data/spec/lib/contest/driver/t010_kattis_spec.rb

@@ -1,19 +1,7 @@
 require "spec_helper"
 require "contest/driver/kattis"
 
-describe "T010: Kattis Driver" do
-  before :each do
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t010"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-  end
-
-  after :each do
-    Dir.chdir @test_dir
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
+describe "T010: Kattis Driver" do 
   before do
     @driver = Contest::Driver::Kattis.new
     @driver.stub(:sleep).and_return(0)
@@ -200,7 +188,7 @@ describe "T010: Kattis Driver" do
       @driver.submit
 
       @flag = @flag_start && @flag_before_login && @flag_after_login && @flag_before_submit && @flag_after_submit && @flag_before_wait && @flag_after_wait && @flag_finish
-      @flag.should === true
+      expect(@flag).to be true
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,45 +1,59 @@
-def read_file path
-  File.read get_path(path)
-end
-
-def get_path path
-  File.expand_path(File.dirname(__FILE__) + path)
-end
-
-def bin_path path
-  get_path("/../bin/#{path}")
-end
-
-def init_env
-  ENV['TEST_MODE'] = 'TRUE'
-  ENV['PATH'] = bin_path('') + ':' + ENV['PATH']
-  ENV['GIT_CONTEST_HOME'] = "#{ENV['GIT_CONTEST_TEMP_DIR']}/home"
-end
-
-def debug_print
-  puts `pwd`
-  puts `ls -a`
-  puts ""
-end
+require 'webmock'
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'git/contest/common'
 
-def debug_on
-  ENV['GIT_CONTEST_DEBUG'] = 'ON'
+module SpecHelpers
+  def read_file path
+    File.read get_path(path)
+  end
+
+  def get_path path
+    File.expand_path(File.dirname(__FILE__) + path)
+  end
+
+  def bin_path path
+    get_path("/../bin/#{path}")
+  end
+
+  def init_env
+    ENV['TEST_MODE'] = 'TRUE'
+    ENV['PATH'] = bin_path('') + ':' + ENV['PATH']
+    ENV['GIT_CONTEST_HOME'] = get_path('/mock/default_config')
+  end
+
+  def debug_print
+    puts `pwd`
+    puts `ls -a`
+    puts ""
+  end
+
+  def debug_on
+    ENV['GIT_CONTEST_DEBUG'] = 'ON'
+  end
+
+  def bin_exec(args)
+    puts "Commmand: #{bin_path('git-contest')} #{args}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
+    ret = `#{bin_path('git-contest')} #{args} 2>&1`
+    ret
+  end
+
+  def set_git_contest_config(body)
+    ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/home/config.yml"
+    File.open ENV['GIT_CONTEST_CONFIG'], "w" do |file|
+      file.write body
+    end
+  end
 end
 
-def bin_exec args
-  puts "Commmand: #{bin_path('git-contest')} #{args}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
-  ret = `#{bin_path('git-contest')} #{args} 2>&1`
-  ret
+RSpec.configure do |config|
+  config.include SpecHelpers
+  config.before :each do
+    WebMock.disable_net_connect!
+    @temp_dir = `mktemp -d /tmp/XXXXXXXXXXXXX`.strip
+    Dir.chdir "#{@temp_dir}"
+    Dir.mkdir "home"
+    init_env
+  end
+  config.order = 'random'
 end
 
-require 'webmock'
-WebMock.disable_net_connect!
-
-temp_dir = `mktemp -d /tmp/XXXXXXXXXXXXX`.strip
-`mkdir #{temp_dir}/home`
-ENV['GIT_CONTEST_TEMP_DIR'] = temp_dir
-init_env
-
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'git/contest/common'
-

data/spec/t006_config_spec.rb

@@ -1,66 +1,64 @@
 require "spec_helper"
 
-describe "T006: Config Test" do
-
-  before(:each) do
-    init_env
-    ENV['GIT_CONTEST_HOME'] = get_path('/mock/default_config')
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t006"
-    Dir.mkdir @test_dir
-    Dir.chdir @test_dir
-    # debug_on
-  end
-
-  after(:each) do
-    Dir.chdir '..'
-    FileUtils.remove_dir @test_dir, :force => true
-  end
-
-  describe "001: submit_rules" do
-
-    describe "001: commit_message" do
-
+describe "T006: Config Test" do 
+  context "A001: submit_rules" do
+    context "B001: commit_message" do
       before do
-        Dir.mkdir '001'
-        Dir.chdir '001'
         File.open "main.d", "w" do |file|
           file.write "ac-code"
         end
         bin_exec "init --defaults"
       end
 
-      after do
-        Dir.chdir '..'
-      end
-
       it "001: ${site} ${problem-id}: ${status}" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/001/001/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  message:    "${site} ${problem-id}: ${status}"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "log --oneline"
-        ret1.include?('Dummy 100A: Accepted').should === true
+        expect(ret1).to include 'Dummy 100A: Accepted'
       end
 
       it "002: ${site}-${problem-id}-${status}" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/001/002/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  message:    "${site}-${problem-id}-${status}"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "log --oneline"
-        ret1.include?('Dummy-100A-Accepted').should === true
+        expect(ret1).to include 'Dummy-100A-Accepted'
       end
 
       it "003: ${status}-${site}" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/001/003/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  message:    "${status}-${site}"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "log --oneline"
-        ret1.include?('Accepted-Dummy').should === true
+        expect(ret1).to include 'Accepted-Dummy'
       end
 
     end
 
-    describe "002: source" do
-
+    context "B002: source" do
       before do
-        Dir.mkdir '002'
-        Dir.chdir '002'
         File.open "ac.cpp", "w" do |file|
           file.write "ac-code"
         end
@@ -73,44 +71,65 @@ describe "T006: Config Test" do
         bin_exec "init --defaults"
       end
 
-      after do
-        Dir.chdir '..'
-      end
-
       it "001: ac.*" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/002/001/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "ac.*"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
+
         ret1 = git_do "log --oneline"
+        expect(ret1).to include 'Dummy 100A: Accepted'
+
         ret_ls1 = git_do "ls-files"
-        ret1.include?('Dummy 100A: Accepted').should === true
-        ret_ls1.include?('ac.cpp').should === true
+        expect(ret_ls1).to include 'ac.cpp'
       end
 
       it "002: wa.*" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/002/002/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "wa.*"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
+
         ret1 = git_do "log --oneline"
+        expect(ret1).to include 'Dummy 100A: Wrong Answer'
+
         ret_ls1 = git_do "ls-files"
-        ret1.include?('Dummy 100A: Wrong Answer').should === true
-        ret_ls1.include?('wa.d').should === true
+        expect(ret_ls1).to include 'wa.d'
       end
 
       it "003: tle.*" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/002/003/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "tle.*"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "log --oneline"
+        expect(ret1).to include 'Dummy 100A: Time Limit Exceeded'
+
         ret_ls1 = git_do "ls-files"
-        ret1.include?('Dummy 100A: Time Limit Exceeded').should === true
-        ret_ls1.include?('tle.go').should === true
+        expect(ret_ls1).to include 'tle.go'
       end
-
     end
 
-    describe "003: add" do
-
+    context "B003: add" do
       before do
-        Dir.mkdir '003'
-        Dir.chdir '003'
         File.open "test1.cpp", "w" do |file|
           file.write "ac-code"
         end
@@ -125,44 +144,64 @@ describe "T006: Config Test" do
         end
         bin_exec "init --defaults"
       end
-      
-      after do
-        Dir.chdir ".."
-      end
 
       it "001: test*.cpp input1.txt" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/003/001/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "test*.cpp"
+  add:    "test*.cpp input1.txt"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "ls-files"
-        ret1.include?("test1.cpp").should  === true
-        ret1.include?("input1.txt").should === true
-        ret1.include?("test2.c").should    === false
-        ret1.include?("input2.txt").should === false
+        expect(ret1).to include "test1.cpp"
+        expect(ret1).to include "input1.txt"
+        expect(ret1).not_to include "test2.c"
+        expect(ret1).not_to include "input2.txt"
       end
 
       it "002: input2.txt test*.c" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/003/002/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "test*.c"
+  add:    "input2.txt test*.c"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "ls-files"
-        ret1.include?("test1.cpp").should  === false
-        ret1.include?("input1.txt").should === false
-        ret1.include?("test2.c").should    === true
-        ret1.include?("input2.txt").should === true
+        expect(ret1).not_to include "test1.cpp"
+        expect(ret1).not_to include "input1.txt"
+        expect(ret1).to include "test2.c"
+        expect(ret1).to include "input2.txt"
       end
 
       it "003: input1.txt test1.cpp test2.c input2.txt" do
-        ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t006/001/003/003/config.yml')
+        set_git_contest_config <<EOF
+submit_rules:
+  source: "test*.cpp"
+  add:    "input1.txt test1.cpp test2.c input2.txt"
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+EOF
         bin_exec "submit test_dummy -c 100 -p A"
         ret1 = git_do "ls-files"
-        ret1.include?("test1.cpp").should  === true
-        ret1.include?("input1.txt").should === true
-        ret1.include?("test2.c").should    === true
-        ret1.include?("input2.txt").should === true
+        expect(ret1).to include "test1.cpp"
+        expect(ret1).to include "input1.txt"
+        expect(ret1).to include "test2.c"
+        expect(ret1).to include "input2.txt"
       end
-
     end
-
   end
-
 end