git-contest 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d9380d569b25210d2ba83322e33665663b897a23
-  data.tar.gz: 29d1b93735dd8e5dc0bd6a3cb69f6dd3595ffe29
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGQ2NTE5NDhhOWRkNzE0NzFmZjUzNzJkNjJlYWY1OGFiNzhkOThjNw==
+  data.tar.gz: !binary |-
+    NGM5NDUwYzU4MjY4MDM0Mjg1ZDcxZmEzZWIyNzE1ZmUxZmFjNWFjYg==
 SHA512:
-  metadata.gz: a0be028034d747a1d3702c80e48ca7b9ca91fec51b8b13d4bb452655d6a5b356993cda8eb383435e5e23061382f04cfb85486dbcb8575959600c2b7187b5bdb8
-  data.tar.gz: 01b766f664b1f742938d5ac1aeb7f278cba8e2a7b3e530a9a224fbeefa7236c06e60e1c0d9dd68e1daa921cb61899a97e2f998310b59ae5dfa51a4a3598a2898
+  metadata.gz: !binary |-
+    NTBjYTRhYjdmMmQ1MDJiNzNjYmQwNTdjZThmYTczNmQ5Y2JkYTZiMmE3NzY3
+    NjBmMmJmNzkxNzFkNDJjM2NmZTBlMTA0Mjg2Mzk0OTBmZWJmMGY3ZTMzYjAw
+    ZjQyM2ExYzExNjYwZWMzNDhhMWYyZmMwZTViM2M5Y2QyMGY5MzU=
+  data.tar.gz: !binary |-
+    MzhiOTBkOWI2OTQ5Y2Q0YmQ0Y2E1OGY3Mjk0NDU1M2QyYWM1YWE0YjQzMzg0
+    ZTI2NGE1NTQ4MjQ4NTkwMjljYTM4NDE1YTg2ZTIyZjQ1MTU1MWViODI4NGY3
+    NzI5ZmRkYjFmNTE4ZTUyMjBlMGYzMDY3NmYyZjQwYzA0MzJkOWU=

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2

data/LICENSE.txt

@@ -1,7 +1,7 @@
 
 MIT License
 
-Copyright (c) 2013 Hiroyuki Sano
+Copyright (c) 2013-2014 Hiroyuki Sano
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -12,6 +12,8 @@ Currently support the following online judges:
     * [http://judge.u-aizu.ac.jp/onlinejudge/](http://judge.u-aizu.ac.jp/onlinejudge/)
 * UVa Online Judge
     * [http://uva.onlinejudge.org/](http://uva.onlinejudge.org/)
+* Kattis
+    * [https://open.kattis.com/](https://open.kattis.com/)
 
 ## Branching Model
 ![image](https://googledrive.com/host/0Bz19k_5gA4wVZWJEcW1XS25NRWM/git-contest.png)
@@ -162,6 +164,10 @@ sites:
         driver:     uva_online_judge
         user:       your_uva_id
         password:   your_uva_password
+    kattis:
+        driver:     kattis
+        user:       your_kattis_id
+        password:   your_kattis_password
 ```
 
 #### About contest drivers
@@ -184,31 +190,23 @@ to be written here.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Links
-`git-contest` is inspired by [nvie/gitflow](https://github.com/nvie/gitflow).
+## Contributors
 
-* A successful Git branching model
-    * [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/)
-* nvie/gitflow
-    * [https://github.com/nvie/gitflow](https://github.com/nvie/gitflow)
-* ruby
-    * [https://www.ruby-lang.org/](https://www.ruby-lang.org/)
-* git
-    * [http://git-scm.com/](http://git-scm.com/)
+* [Oskar Sundström](https://github.com/osund)
+    * Added Kattis Driver
 
 ## Author Information
+
 * [Hiroyuki Sano](http://yomogimochi.com/)
     * [GitHub - sh19910711](https://github.com/sh19910711)
     * [Google+](https://plus.google.com/+HiroyukiSano)
-    * [Twitter - @sh19910711](https://twitter.com/sh19910711)
-
 
 ## License Information
 **git-contest** is licensed under the MIT-License, see details followings:
 
 The MIT License (MIT)
 
-Copyright (c) 2013 **Hiroyuki Sano** \<sh19910711 at gmail.com\>
+Copyright (c) 2013-2014 **Hiroyuki Sano** \<sh19910711 at gmail.com\>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -228,16 +226,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-## Index
-* [Branching Model](#branching-model)
-* [Commit Message Examples](#commit-message-examples)
-* [Installation](#installation)
-    * [Requirements](#requirements)
-* [Command Usage](#command-usage)
-* [More Documentation](#more-documentation)
-* [Configuration](#configuration)
-* [Contributing](#contributing)
-* [Links](#links)
-* [Author Information](#author-information)
-* [License Information](#license-information)
+## Links
+`git-contest` is inspired by [nvie/gitflow](https://github.com/nvie/gitflow).
+
+* A successful Git branching model
+    * [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/)
+* nvie/gitflow
+    * [https://github.com/nvie/gitflow](https://github.com/nvie/gitflow)
+* ruby
+    * [https://www.ruby-lang.org/](https://www.ruby-lang.org/)
+* git
+    * [http://git-scm.com/](http://git-scm.com/)
 

data/bin/git-contest

@@ -4,7 +4,7 @@
 # git-contest
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -28,7 +28,7 @@ init
 
 sub_commands = %w(init start finish submit rebase)
 global_opts = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   stop_on sub_commands
 end
 

data/bin/git-contest-finish

@@ -4,7 +4,7 @@
 # git-contest-finish
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -62,7 +62,7 @@ init
 
 sub_commands = %w()
 $options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   opt(
     :no_edit,
     "Use default commit message.",

data/bin/git-contest-init

@@ -4,7 +4,7 @@
 # git-contest-init
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -17,7 +17,7 @@ init
 
 sub_commands = %w()
 options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   opt(
     :defaults,
     "Use default branch naming conventions.",

data/bin/git-contest-rebase

@@ -4,7 +4,7 @@
 # git-contest-rebase
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -48,7 +48,7 @@ init
 
 sub_commands = %w()
 $options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   opt(
     :interactive,
     "Do an interactive rebase.",

data/bin/git-contest-start

@@ -4,7 +4,7 @@
 # git-contest-start
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -16,7 +16,7 @@ init
 
 sub_commands = %w()
 options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   opt(
     :fetch,
     "fetch from origin before performing operation.",

data/bin/git-contest-submit

@@ -4,7 +4,7 @@
 # git-contest-submit
 # https://github.com/sh19910711/git-contest
 #
-# Copyright (c) 2013 Hiroyuki Sano <sh19910711 at gmail.com>
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
 # Licensed under the MIT-License.
 #
 
@@ -12,14 +12,6 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'git/contest/common'
 require 'trollop'
 
-init
-
-$config = get_config() || {}
-$sites  = {}
-if $config.has_key? 'sites'
-  $sites = $config["sites"]
-end
-
 #
 # Load Plugins
 #
@@ -30,8 +22,6 @@ def load_plugins
   end
 end
 
-load_plugins
-
 #
 # Load Drivers
 #
@@ -45,9 +35,6 @@ def load_drivers
   end
 end
 
-$drivers = {}
-load_drivers
-
 #
 # Command Utils
 #
@@ -80,10 +67,23 @@ def get_git_add_target rule
   str
 end
 
+init
+
+$config = get_config() || {}
+$sites  = {}
+if $config.has_key? 'sites'
+  $sites = $config["sites"]
+end
+
+load_plugins
+
+$drivers = {}
+load_drivers
+
 # check options
 sub_commands = $sites.keys
 global_opts = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013 Hiroyuki Sano"
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   banner get_banner
   stop_on sub_commands
 end
@@ -122,18 +122,21 @@ driver.on(
     puts "@start: submit"
   end
 )
+
 driver.on(
   'before_login',
   Proc.new do
     puts "@submit: logging in..."
   end
 )
+
 driver.on(
   'after_login',
   Proc.new do
     puts "@submit: login ok"
   end
 )
+
 driver.on(
   'before_submit',
   Proc.new do |submit_info|
@@ -141,24 +144,28 @@ driver.on(
     puts "@submit: doing..."
   end
 )
+
 driver.on(
   'after_submit',
   Proc.new do
     puts "@submit: done"
   end
 )
+
 driver.on(
   'before_wait',
   Proc.new do
     print "@result: waiting..."
   end
 )
+
 driver.on(
   'retry',
   Proc.new do
     print "."
   end
 )
+
 driver.on(
   'after_wait',
   Proc.new do |submission_info|
@@ -169,12 +176,14 @@ driver.on(
     puts "  %s: %s" % ["submission id", "#{submission_info[:submission_id]}"]
     puts "  %s: %s" % ["status", "#{submission_info[:status]}"]
     puts ""
+    p submission_info
     if git_contest_is_initialized
       git_do "add #{get_git_add_target($config["submit_rules"]["add"] || ".")}"
       git_do "commit --allow-empty -m '#{submission_info[:result]}'"
     end
   end
 )
+
 driver.on(
   'finish',
   Proc.new do
@@ -182,7 +191,15 @@ driver.on(
   end
 )
 
-opts = driver.get_opts()
-result = driver.submit $sites[site], "main.*", opts
+# global config
+$config["submit_rules"] ||= {}
+
+# set config
+driver.config = $sites[site]
+driver.config.merge! $config
+
+# parse driver options
+driver.options = driver.get_opts()
 
+result = driver.submit()
 

data/git-contest.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.version       = Git::Contest::VERSION
   spec.authors       = ["Hiroyuki Sano"]
   spec.email         = ["sh19910711@gmail.com"]
-  spec.description   = %q{the Git Extension for online judge (Codeforces, etc...)}
-  spec.summary       = %q{the Git Extension for online judge (Codeforces, etc...)}
+  spec.description   = %q{The Git Extension for online judges (Codeforces, etc...)}
+  spec.summary       = %q{The Git Extension for online judges (Codeforces, etc...)}
   spec.homepage      = "https://github.com/sh19910711/git-contest"
   spec.license       = "MIT"
 

data/lib/contest/driver.rb

@@ -13,3 +13,6 @@ require 'contest/driver/codeforces'
 
 # http://uva.onlinejudge.org/
 require 'contest/driver/uva_online_judge'
+
+# https://open.kattis.com/
+require 'contest/driver/kattis'

data/lib/contest/driver/aizu_online_judge.rb

@@ -1,7 +1,7 @@
 #
 # aizu_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.
 #
 
@@ -57,29 +57,29 @@ module Contest
         when "javascript"
           return "JavaScript"
         else
-          abort "unknown languag"
+          abort "unknown language"
         end
       end
 
-      def submit_ext(config, source_path, options)
+      def submit_ext
         # start
         trigger 'start'
-        problem_id = "%04d" % options[:problem_id]
+        problem_id = "%04d" % @options[:problem_id]
 
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'
         }
 
         # submit
-        trigger 'before_submit', options
+        trigger 'before_submit', @options
         submit_page = @client.get "http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=0000"
         submit_page.parser.encoding = "SHIFT_JIS"
         res_page = submit_page.form_with(:action => '/onlinejudge/servlet/Submit') do |form|
-          form.userID = config["user"]
-          form.password = config["password"]
+          form.userID = @config["user"]
+          form.password = @config["password"]
           form.problemNO = problem_id
-          form.language = options[:language]
-          form.sourceCode = File.read(source_path)
+          form.language = @options[:language]
+          form.sourceCode = File.read(@options[:source])
         end.submit
         trigger 'after_submit'
 
@@ -89,18 +89,18 @@ module Contest
         submission_id = get_submission_id status_page.body
 
         # wait result
-        status = get_status_wait config["user"], submission_id
+        status = get_status_wait @config["user"], submission_id
         trigger(
           'after_wait',
           {
             :submission_id => submission_id,
             :status => status,
-            :result => get_commit_message($config["submit_rules"]["message"], status, options),
+            :result => get_commit_message(status),
           }
         )
         trigger 'finish'
 
-        return "AOJ %s: %s\nhttp://judge.u-aizu.ac.jp/onlinejudge/review.jsp?rid=#{submission_id}" % [problem_id, status]
+        get_commit_message(status)
       end
 
       def get_status_wait(user_id, submission_id)