git-contest 0.0.3 → 0.1.0

data/lib/contest/driver/base.rb

@@ -1,7 +1,7 @@
 #
 # base.rb
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -11,7 +11,22 @@ require 'contest/driver/driver_event'
 
 module Contest
   module Driver
+    DEFAULT_SOURCE_PATH = "main.*"
+    DEFAULT_COMMIT_MESSAGE ="${site} ${problem-id}: ${status}"
+
     class DriverBase < DriverEvent
+      attr_accessor :config, :options
+
+      def initialize
+        # submit options
+        @options ||= {}
+        # site config
+        @config ||= {}
+        @config["submit_rules"] ||= {}
+        # call DriverEvent#initialize
+        super
+      end
+
       def get_opts_ext
         # Example:
         # define_options do
@@ -51,7 +66,7 @@ module Contest
       end
 
       def get_opts
-        get_opts_ext
+        get_opts_ext()
         define_options do
           opt(
             :source,
@@ -65,9 +80,16 @@ module Contest
             :type => :string,
             :required => false,
           )
+          opt(
+            :message,
+            "Set git-commit message",
+            :type => :string,
+            :required => false,
+          )
         end
         Trollop::options ARGV, @blocks do |blocks|
           version "git-contest driver"
+          # set driver options
           blocks.each do |b|
             instance_eval &b
           end
@@ -78,25 +100,28 @@ module Contest
         nil
       end
 
-      def get_commit_message rule, status, options
-        message = rule
-        message = message.gsub '${site}', get_site_name
-        message = message.gsub '${problem-id}', get_problem_id(options)
-        message = message.gsub '${status}', status
-        message = "\n#{get_commit_message_ext}" unless get_commit_message_ext.nil?
-        return message
+      def get_commit_message status
+        if @options[:message].nil?
+          message = @config["submit_rules"]["message"] || DEFAULT_COMMIT_MESSAGE
+          message = message.gsub '${site}', get_site_name
+          message = message.gsub '${problem-id}', get_problem_id(options)
+          message = message.gsub '${status}', status
+          message = "\n#{get_commit_message_ext}" unless get_commit_message_ext.nil?
+        else
+          message = @options[:message]
+        end
+        message
       end
 
-      def submit(config, source_path, options)
-        $config = get_config
-        $config["submit_rules"] ||= {}
-        $config["submit_rules"]["message"] ||= "${site} ${problem-id}: ${status}"
-        source_path = Utils.resolve_path(options[:source] || $config["submit_rules"]["source"] || source_path)
-        options[:source] = source_path
-        options[:language] ||= Utils.resolve_language(source_path)
-        options[:language] = resolve_language Utils.normalize_language(options[:language])
-        status = submit_ext(config, source_path, options)
-        get_commit_message($config["submit_rules"]["message"], status, options)
+      # submit a solution
+      def submit
+        @options[:source] = Utils.resolve_path(
+          @options[:source] || @config["submit_rules"]["source"] || DEFAULT_SOURCE_PATH
+        )
+        @options[:language] ||= Utils.resolve_language(@options[:source])
+        @options[:language] = resolve_language Utils.normalize_language(@options[:language])
+
+        submit_ext()
       end
     end
   end

data/lib/contest/driver/codeforces.rb

@@ -1,7 +1,7 @@
 #
 # codeforces.rb
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -80,11 +80,11 @@ module Contest
         end
       end
 
-      def submit_ext(config, source_path, options)
+      def submit_ext()
         # start
         trigger 'start'
-        contest_id = options[:contest_id]
-        problem_id = options[:problem_id]
+        contest_id = @options[:contest_id]
+        problem_id = @options[:problem_id]
 
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'
@@ -94,21 +94,21 @@ module Contest
         trigger 'before_login'
         login_page = @client.get 'http://codeforces.com/enter'
         login_page.form_with(:action => '') do |form|
-          form.handle = config["user"]
-          form.password = config["password"]
+          form.handle = @config["user"]
+          form.password = @config["password"]
         end.submit
         trigger 'after_login'
 
         # submit
-        trigger 'before_submit', options
+        trigger 'before_submit', @options
         # retry once
         retries = 1
         begin
           submit_page = @client.get "http://codeforces.com/contest/#{contest_id}/submit"
           res_page = submit_page.form_with(:class => 'submit-form') do |form|
             form.submittedProblemIndex = problem_id
-            form.programTypeId = options[:language]
-            form.source = File.read(source_path)
+            form.programTypeId = @options[:language]
+            form.source = File.read(@options[:source])
           end.submit
         rescue => e
           raise if retries == 0
@@ -131,8 +131,13 @@ module Contest
         trigger 'after_submit'
 
         # need to get the newest waiting submissionId
-        trigger 'before_wait',
-          submission_id = get_submission_id(res_page.body)
+        submission_id = get_submission_id(res_page.body)
+        trigger(
+          'before_wait',
+          {
+            :submission_id => submission_id,
+          }
+        )
 
         # wait result
         status = get_status_wait(contest_id, submission_id)
@@ -141,12 +146,12 @@ module Contest
           {
             :submission_id => submission_id,
             :status => status,
-            :result => get_commit_message($config["submit_rules"]["message"], status, options),
+            :result => get_commit_message(status),
           }
         )
 
         trigger 'finish'
-        get_commit_message($config["submit_rules"]["message"], status, options)
+        get_commit_message(status)
       end
 
       def get_status_wait(contest_id, submission_id)
@@ -178,8 +183,9 @@ module Contest
 
       def get_submission_id(body)
         doc = Nokogiri::HTML(body)
-        # get td.status-cell
-        elements = doc.xpath('//td[contains(concat(" ",@class," "), " status-cell ")][@waiting="true"]')
+        # get first td.status-cell
+        line = doc.xpath('//td/a[contains(./text() , "' + @config["user"] + '")]').xpath('../..')[0]
+        elements = line.xpath('//td[contains(concat(" ",@class," "), " status-cell ")]')
         elements[0].attributes()["submissionid"].value.strip
       end
 

data/lib/contest/driver/common.rb

@@ -1,7 +1,7 @@
 #
 # common.rb
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -13,12 +13,26 @@ require 'contest/driver/base'
 module Contest
   module Driver
     module Utils
-      def self.resolve_path path
-        path = `ls #{path} | cat | head -n 1`
-        path.strip
+      def self.resolve_wild_card path
+        `ls #{path} | cat | head -n 1`.strip
+      end
+
+      # resolve wild card
+      def self.resolve_path src
+        if src.match ','
+          src.split(',').map do |path|
+            resolve_wild_card(path)
+          end
+        else
+          resolve_wild_card(src)
+        end
       end
 
       def self.resolve_language path
+        # set first element if path is array
+        if path.is_a? Array
+          path = path[0]
+        end
         regexp = /\.([a-z0-9]+)$/
         if path.match(regexp)
           return path.match(regexp)[1]
@@ -31,7 +45,7 @@ module Contest
         case label
         when "c", "C"
           return "clang"
-        when "cpp", "C++", "c++"
+        when "cpp", "C++", "c++", "cc", "cxx"
           return "cpp"
         when "c++11", "C++11"
           return "cpp11"
@@ -45,6 +59,8 @@ module Contest
           return "haskell"
         when "java", "Java"
           return "java"
+        when "objc", "m"
+          return "objc"
         when "ocaml", "ml", "OCaml"
           return "ocaml"
         when "Delphi", "delphi"

data/lib/contest/driver/driver_event.rb

@@ -1,7 +1,7 @@
 #
 # driver_event.rb
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 

data/lib/contest/driver/kattis.rb

@@ -0,0 +1,168 @@
+#
+# kattis.rb
+#
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2014 Oskar Sundström <oskar.sundstrom@gmail.com>
+# Licensed under the MIT-License.
+#
+# An official Python submission script can be found at
+# https://open.kattis.com/doc/submit
+#
+# Using the Python script you would write:
+#  $ python3 submit3.py -p aaah Main.java
+# 
+# To do the same thing using git-contest you instead write:
+#  $ git contest submit kattis -p aaah -s Main.java
+
+require 'contest/driver/common'
+
+module Contest
+  module Driver
+    class Kattis < DriverBase
+      def get_opts_ext
+        define_options do
+          opt(
+            :contest_id,
+            "Contest ID (Ex: open, kth, liu, etc...)",
+            :type => :string,
+            :required => false,
+          )
+          opt(
+            :problem_id,
+            "Problem ID (Ex: aaah, listgame2, etc...)",
+            :type => :string,
+            :required => true,
+          )
+        end
+      end
+
+      def get_site_name
+        "Kattis"
+      end
+
+      def get_desc
+        "Kattis (URL: https://open.kattis.com/)"
+      end
+
+      def get_problem_id(options)
+        "#{options[:problem_id]}"
+      end      
+
+      def resolve_language(label)
+        case label
+        when 'cpp'
+          return '1'
+        when 'c'
+          return '2'
+        when 'java'
+          return '3'
+        when 'python2'
+          return '6'
+        when 'python3'
+          return '8'
+        when 'cs'
+          return '9'
+        when 'golang'
+          return '10'
+        when 'objc'
+           return '11'
+        else
+          abort 'unknown language'
+        end
+      end
+
+      def submit_ext
+        trigger 'start'
+        problem_id = @options[:problem_id]
+
+        if (@options[:contest_id])
+          subdomain = @options[:contest_id]
+        else
+          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"
+        login_page.form_with(:action => 'login?email_login=true') do |form|
+          form.user = @config['user']
+          form.password = @config['password']
+        end.submit
+        trigger 'after_login'
+
+        # Submit
+        trigger 'before_submit', @options
+        submit_page = @client.get "https://#{subdomain}.kattis.com/submit"
+        res_page = submit_page.form_with(:name => 'upload') do |form|
+          form.problem = problem_id
+          form['lang'] = @options[:language]
+          form.sub_code = File.read(@options[:source])
+          # Use file name as main class for Java
+          if (@options[:language] == resolve_language('java'))
+            form['mainclass'] = @options[:source].rpartition('.')[0]
+          end
+          form.submit(form.button_with(:name => 'submit'))
+        end.submit
+        trigger 'after_submit'
+
+        # Result
+        trigger 'before_wait'
+        user = @config['user']
+        doc = Nokogiri::HTML(res_page.body)
+        # Check for error messages
+        error = doc.xpath('//p[@class="error"]')[0];
+        if ((/Problem ID not found in database./ =~ error) ||
+            (/Problem-id inte funnet i databasen./ =~ error))
+          abort "Problem ID not found in database."
+        end
+        submissions_page = @client.get "https://#{subdomain}.kattis.com/users/#{user}?show=submissions"
+        submission_id = get_submission_id(submissions_page.body)
+        status = get_status_wait(submission_id, subdomain)
+        trigger(
+          'after_wait',
+          {
+            :submission_id => submission_id,
+            :status => status,
+            :result => get_commit_message(status),
+          }
+        )
+
+        trigger 'finish'
+        get_commit_message(status)
+      end
+
+      def get_status_wait(submission_id, subdomain)
+        submission_id = submission_id.to_s
+        # Wait for result
+        12.times do
+          sleep 10
+          submission_page = @client.get "https://#{subdomain}.kattis.com/submission?id=#{submission_id}"
+          status = get_submission_status(submission_id, submission_page.body)
+          return status unless status == 'Running'
+          trigger 'retry'
+        end
+        trigger 'timeout'
+        return 'timeout'
+      end
+
+      def get_submission_id(body)
+        doc = Nokogiri::HTML(body)
+        return doc.xpath('//a[starts-with(@href,"submission")]')[0].inner_text().strip
+      end
+
+      def get_submission_status(submission_id, body)
+        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

@@ -1,7 +1,7 @@
 #
 # uva_online_judge.rb
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -21,6 +21,10 @@ module Contest
         end
       end
 
+      def get_problem_id(options)
+        "#{options[:problem_id]}"
+      end
+
       def get_site_name
         "UVa"
       end
@@ -44,9 +48,9 @@ module Contest
         end
       end
 
-      def submit_ext(config, source_path, options)
+      def submit_ext
         trigger 'start'
-        problem_id = options[:problem_id]
+        problem_id = @options[:problem_id]
 
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'
@@ -56,17 +60,17 @@ module Contest
         trigger 'before_login'
         login_page = @client.get 'http://uva.onlinejudge.org/'
         login_page.form_with(:id => 'mod_loginform') do |form|
-          form.username = config["user"]
-          form.passwd = config["password"]
+          form.username = @config["user"]
+          form.passwd = @config["password"]
         end.submit
         trigger 'after_login'
 
-        trigger 'before_submit', options
+        trigger 'before_submit', @options
         submit_page = @client.get 'http://uva.onlinejudge.org/index.php?option=com_onlinejudge&Itemid=25'
         res_page = submit_page.form_with(:action => 'index.php?option=com_onlinejudge&Itemid=25&page=save_submission') do |form|
           form.localid = problem_id
-          form.radiobutton_with(:name => 'language', :value => options[:language]).check
-          form.code = File.read(source_path)
+          form.radiobutton_with(:name => 'language', :value => @options[:language]).check
+          form.code = File.read(@options[:source])
         end.submit
         trigger 'after_submit'
 
@@ -79,12 +83,12 @@ module Contest
           {
             :submission_id => submission_id,
             :status => status,
-            :result => get_commit_message($config["submit_rules"]["message"], status, options),
+            :result => get_commit_message(status),
           }
         )
 
         trigger 'finish'
-        get_commit_message($config["submit_rules"]["message"], status, options)
+        get_commit_message(status)
       end
 
       def get_status_wait(submission_id)
@@ -104,7 +108,6 @@ module Contest
       def get_submission_id(body)
         doc = Nokogiri::HTML(body)
         text = doc.xpath('//div[@class="message"]')[0].text().strip
-        # Submission received with ID 12500010
         text.match(/Submission received with ID ([0-9]+)/)[1]
       end