git-contest 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTU4MGU4ZDMzZDI2YTg0NDZkM2YwYjI4MzRiNzY0MjIyZTExMGMyMQ==
-  data.tar.gz: !binary |-
-    OGE1NDk3ZTMxODExNWM0YzY1ZjEzNzViOWQ4YjhiNTljYjU4M2RjZQ==
+SHA1:
+  metadata.gz: 8b2aca1112bbb292e1a81ae6df50ce2cd7cef637
+  data.tar.gz: c2cd797387cd5cc27240b372d0f8ab0671a368fd
 SHA512:
-  metadata.gz: !binary |-
-    YmU5NGFlMDEwNTYzMTA4ZGZkM2Y1ZWUzOTkwNjc5YzdmMDlhMzU2ZTRjY2Jm
-    MmI3MzYyNmRhNDI0N2FmZDliNzEwNjMzODJiYzA0MDlkZjllMjM2YzcwNTE5
-    YzkzMjM0MDQzMmZmZDAxODk4MmU2ZTE1YTE2YWNiOWExNTg3ZDU=
-  data.tar.gz: !binary |-
-    YjgxYzc2NDc3YjUyNjVjZGU0ZDYxZTI0ZThmODk0ZGQ1MTVhZWVlOWU1ODdm
-    YmIxZDZmZGIwODFiOGE0ZWY3MzY3Mzk1YzA3ZTA1MDdiYTAzYTM5ZDgyMTJl
-    YjEyMjdmNzQ3ZDMzNzk2OTAwMzQ2MDA3MmQ5YzI2MjM0OTRjMmM=
+  metadata.gz: 202a71a7e921f2f88f0a1ac2ea5d9965d0c5bf1816fdfbffd588a5c32fd0b4747b22102f617ea8b8247aea63d2cf16560321cc13254ed25ccea4402c06b806b6
+  data.tar.gz: 90bf6681ee74840e455dc547ddc2423e880f5df4c309a1b30cbf48d4318b9911c82c085d8f170b41436b61de8403c80ccd5fdb23ead3bb6e46d69befa4e222b3

data/lib/contest/driver/aizu_online_judge.rb

@@ -11,6 +11,12 @@ require 'rexml/document'
 module Contest
   module Driver
     class AizuOnlineJudge < DriverBase
+      def initialize_ext
+        @client = Mechanize.new {|agent|
+          agent.user_agent_alias = 'Windows IE 7'
+        }
+      end
+
       def get_opts_ext
         define_options do
           opt(
@@ -64,11 +70,7 @@ module Contest
       def submit_ext
         # start
         trigger 'start'
-        problem_id = "%04d" % @options[:problem_id]
-
-        @client = Mechanize.new {|agent|
-          agent.user_agent_alias = 'Windows IE 7'
-        }
+        problem_id = normalize_problem_id(@options[:problem_id])
 
         # submit
         trigger 'before_submit', @options
@@ -103,6 +105,12 @@ module Contest
         get_commit_message(status)
       end
 
+      private
+      # 180 -> 0180
+      def normalize_problem_id(problem_id)
+        "%04d" % problem_id.to_i
+      end
+
       def get_status_wait(user_id, submission_id)
         # wait result
         5.times do
@@ -144,16 +152,6 @@ module Contest
         doc = Nokogiri::HTML body
         doc.xpath('//table[@id="tableRanking"]//tr[@class="dat"]')[0].search('td')[0].text.strip
       end
-
-      if is_test_mode?
-        attr_writer :client
-      else
-        private :status_loop
-        private :get_status_wait
-        private :is_waiting
-        private :get_status
-        private :get_submission_id
-      end
     end
   end
 end

data/lib/contest/driver/base.rb

@@ -25,6 +25,11 @@ module Contest
         @config["submit_rules"] ||= {}
         # call DriverEvent#initialize
         super
+        initialize_ext
+      end
+      
+      def initialize_ext
+        nil
       end
 
       def get_opts_ext

data/lib/contest/driver/codeforces.rb

@@ -9,7 +9,13 @@ require 'contest/driver/common'
 
 module Contest
   module Driver
-    class Codeforces < DriverBase 
+    class Codeforces < DriverBase
+      def initialize_ext
+        @client = Mechanize.new {|agent|
+          agent.user_agent_alias = 'Windows IE 7'
+        }
+      end
+
       def get_opts_ext
         define_options do
           opt(
@@ -86,10 +92,6 @@ module Contest
         contest_id = @options[:contest_id]
         problem_id = @options[:problem_id]
 
-        @client = Mechanize.new {|agent|
-          agent.user_agent_alias = 'Windows IE 7'
-        }
-
         # login
         trigger 'before_login'
         login_page = @client.get 'http://codeforces.com/enter'
@@ -154,6 +156,7 @@ module Contest
         get_commit_message(status)
       end
 
+      private
       def get_status_wait(contest_id, submission_id)
         contest_id = contest_id.to_s
         submission_id = submission_id.to_s
@@ -188,15 +191,6 @@ module Contest
         elements = line.xpath('//td[contains(concat(" ",@class," "), " status-cell ")]')
         elements[0].attributes()["submissionid"].value.strip
       end
-
-      if is_test_mode?
-        attr_writer :client
-      else
-        private :get_status_wait
-        private :is_waiting
-        private :get_status
-        private :get_submission_id
-      end
     end
   end
 end

data/lib/contest/driver/kattis.rb

@@ -19,6 +19,12 @@ require 'contest/driver/common'
 module Contest
   module Driver
     class Kattis < DriverBase
+      def initialize_ext
+        @client = Mechanize.new {|agent|
+          agent.user_agent_alias = 'Windows IE 7'
+        }
+      end
+
       def get_opts_ext
         define_options do
           opt(
@@ -81,10 +87,6 @@ module Contest
           subdomain = 'open'
         end
 
-        @client = Mechanize.new {|agent|
-          agent.user_agent_alias = 'Windows IE 7'
-        }
-
         # Login
         trigger 'before_login'
         login_page = @client.get "https://#{subdomain}.kattis.com/login?email_login=true"
@@ -158,11 +160,6 @@ module Contest
         doc = Nokogiri::HTML(body)
         return doc.xpath('//td[@class="status"]/span').inner_text().strip
       end
-
-      if is_test_mode?
-        attr_writer :client
-      else
-      end
     end
   end
 end

data/lib/contest/driver/uva_online_judge.rb

@@ -10,6 +10,12 @@ require 'contest/driver/common'
 module Contest
   module Driver
     class UvaOnlineJudge < DriverBase
+      def initialize_ext
+        @client = Mechanize.new {|agent|
+          agent.user_agent_alias = 'Windows IE 7'
+        }
+      end
+
       def get_opts_ext
         define_options do
           opt(
@@ -54,10 +60,6 @@ module Contest
         trigger 'start'
         problem_id = @options[:problem_id]
 
-        @client = Mechanize.new {|agent|
-          agent.user_agent_alias = 'Windows IE 7'
-        }
-
         # submit
         trigger 'before_login'
         login_page = @client.get 'http://uva.onlinejudge.org/'
@@ -135,11 +137,6 @@ module Contest
         end
         'timeout'
       end
-
-      if is_test_mode?
-        attr_writer :client
-      else
-      end
     end
   end
 end

data/lib/git/contest/version.rb

@@ -7,6 +7,6 @@
 
 module Git
   module Contest
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/bin/t004_git_contest_submit_spec.rb

@@ -1,42 +1,50 @@
 require "spec_helper"
 
 describe "T004: git-contest-submit command" do
-  before(:each) do
-    init_env
-    ENV['GIT_CONTEST_HOME'] = get_path('/mock/default_config')
-    ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t004/config.yml')
-    @test_dir = "#{ENV['GIT_CONTEST_TEMP_DIR']}/t004"
-    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
+  before do
+    ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/config.yml"
+    File.open "#{@temp_dir}/config.yml", 'w' do |file|
+      file.write <<EOF
+sites:
+  test_dummy:
+    driver:   dummy
+    user:     dummy
+    password: dummy
+  test_11111:
+    driver:   codeforces
+    user:     dummy
+    password: dummy
+  test_22222:
+    driver:   aizu_online_judge
+    user:     dummy
+    password: dummy
+  test_33333:
+    driver:   uva_online_judge
+    user:     dummy
+    password: dummy
+EOF
+    end
   end
 
   context "A001: --version" do
     it "git-contest-submit --version" do
       ret = `#{bin_path("git-contest-submit")} --version`
-      ret.should match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
+      expect(ret).to match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
     end
 
     it "git-contest submit --version" do
       ret = `#{bin_path("git-contest submit")} --version`
-      ret.should match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
+      expect(ret).to match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
     end
 
     it "git contest submit --version" do
       ret = `git contest submit --version`
-      ret.should match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
+      expect(ret).to match /git-contest [0-9]+\.[0-9]+\.[0-9]+/
     end
   end
 
   context "A002: --help" do
     before do
-      Dir.mkdir '002'
-      Dir.chdir '002'
       Dir.mkdir 'working'
       Dir.chdir 'working'
       File.open 'main.cpp', 'w' do |file|
@@ -47,18 +55,16 @@ describe "T004: git-contest-submit command" do
     context "B001: dummy driver available only test-mode" do
       it "git-contest-submit --help" do
         ret = `#{bin_path('git-contest-submit')} --help`
-        ret.should include 'test_dummy'
-        ret.should include 'test_11111'
-        ret.should include 'test_22222'
-        ret.should include 'test_33333'
+        expect(ret).to include 'test_dummy'
+        expect(ret).to include 'test_11111'
+        expect(ret).to include 'test_22222'
+        expect(ret).to include 'test_33333'
       end
     end
   end
 
   context "A003: after init git repo" do
     before do
-      Dir.mkdir '003'
-      Dir.chdir '003'
       Dir.mkdir 'working'
       Dir.chdir 'working'
       File.open 'main.cpp', 'w' do |file|
@@ -72,17 +78,17 @@ describe "T004: git-contest-submit command" do
 
     it "git-contest-submit test_dummy -c 100 -p A" do
       ret_submit = `#{bin_path("git-contest-submit")} test_dummy -c 100 -p A 2>&1`
-      ret_submit.should include '99999'
-      ret_submit.should include 'Accepted'
+      expect(ret_submit).to include '99999'
+      expect(ret_submit).to include 'Accepted'
       ret_git = `git log --oneline --decorate --graph`
-      ret_git.should include "Dummy 100A: Accepted"
+      expect(ret_git).to include "Dummy 100A: Accepted"
     end
   end
 
   context "A004: with commit message" do
     before do
-      Dir.mkdir '004'
-      Dir.chdir '004'
+      Dir.mkdir 'working'
+      Dir.chdir 'working'
       File.open 'main.cpp', 'w' do |file|
         file.write 'ac-code'
       end
@@ -95,14 +101,14 @@ describe "T004: git-contest-submit command" do
     it "git contest submit test_dummy -c 100 -p A -m '...'" do
       bin_exec "submit test_dummy -c 100 -p A -m 'this is commit message'"
       ret = git_do "log --oneline"
-      ret.should include "this is commit message"
+      expect(ret).to include "this is commit message"
     end
   end
 
   context 'A005: normal submit' do
     before do
-      Dir.mkdir '005'
-      Dir.chdir '005'
+      Dir.mkdir 'working'
+      Dir.chdir 'working'
       File.open 'main.cpp', 'w' do |file|
         file.write 'ac-code'
       end
@@ -110,25 +116,25 @@ describe "T004: git-contest-submit command" do
 
     it "git-contest-submit test_dummy" do
       ret = `#{bin_path('git-contest-submit')} test_dummy 2>&1`
-      ret.should include 'Error'
+      expect(ret).to include 'Error'
     end
 
     it "git-contest-submit test_dummy -c 100" do
       ret = `#{bin_path('git-contest-submit')} test_dummy -c 100 2>&1`
-      ret.should include 'Error'
+      expect(ret).to include 'Error'
     end
 
     it "git-contest-submit test_dummy -c 100 -p A" do
       ret = `#{bin_path('git-contest-submit')} test_dummy -c 100 -p A 2>&1`
-      ret.should include '99999'
-      ret.should include 'Accepted'
+      expect(ret).to include '99999'
+      expect(ret).to include 'Accepted'
     end
   end
 
   context 'A006: --source' do
     before do
-      Dir.mkdir '006'
-      Dir.chdir '006'
+      Dir.mkdir 'working'
+      Dir.chdir 'working'
     end
 
     context "B001: submit single file" do
@@ -143,26 +149,26 @@ describe "T004: git-contest-submit command" do
 
       it "git contest submit test_dummy -c 100 -p A --source ac.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A --source ac.cpp"
-        ret.should include '99999'
-        ret.should include 'Accepted'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Accepted'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s ac.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s ac.cpp"
-        ret.should include '99999'
-        ret.should include 'Accepted'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Accepted'
       end
 
       it "git contest submit test_dummy -c 100 -p A --source wa.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A --source wa.cpp"
-        ret.should include '99999'
-        ret.should include 'Wrong Answer'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Wrong Answer'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s wa.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s wa.cpp"
-        ret.should include '99999'
-        ret.should include 'Wrong Answer'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Wrong Answer'
       end
     end
 
@@ -178,38 +184,38 @@ describe "T004: git-contest-submit command" do
 
       it "git contest submit test_dummy -c 100 -p A --source 1.cpp,2.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A --source 1.cpp,2.cpp"
-        ret.should include '99999'
-        ret.should include 'Wrong Answer'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Wrong Answer'
       end
 
       it "git contest submit test_dummy -c 100 -p A --source 2.cpp,1.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A --source 2.cpp,1.cpp"
-        ret.should include '99999'
-        ret.should include 'Accepted'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Accepted'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s 1.cpp,2.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s 1.cpp,2.cpp"
-        ret.should include '99999'
-        ret.should include 'Wrong Answer'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Wrong Answer'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s 2.cpp,1.cpp" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s 2.cpp,1.cpp"
-        ret.should include '99999'
-        ret.should include 'Accepted'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Accepted'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s 1.*,2.*" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s 1.*,2.*"
-        ret.should include '99999'
-        ret.should include 'Wrong Answer'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Wrong Answer'
       end
 
       it "git contest submit test_dummy -c 100 -p A -s 2.*,1.*" do
         ret = bin_exec "submit test_dummy -c 100 -p A -s 2.*,1.*"
-        ret.should include '99999'
-        ret.should include 'Accepted'
+        expect(ret).to include '99999'
+        expect(ret).to include 'Accepted'
       end
     end
   end