ojsubmitter 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124914fec76b8a1b202797e835a73fe4de8385dc
-  data.tar.gz: bb2beaff82cd088c173ccc39e6b187483ff6db46
+  metadata.gz: 3525ee90ceff005c0e0bd6417eb44b6cda07515c
+  data.tar.gz: 2061c12ddf318c3dbedf9ec48d62651cb803bb9a
 SHA512:
-  metadata.gz: 7f50806fb64c218d31eed9ba39c59a703c14d3601e961e9c408837f938d0b54ef001b5bcdaf297db4732fbe3b3b013aacdab98bb66df2d9f01cd28496eb95612
-  data.tar.gz: e83aba4eb5aa6b2838ba2357a0a7bd90d522698dcff948c816e4450ab2c5a1b38d1e9c95624b5c80da431e8a8f8387747f78ddd1d20325ed661a9a209407f6fe
+  metadata.gz: 3fb69b0aea4f371cbea9b415c60e6fbf6fe315c169613f156b8cd5509fd43cb4abf0f75c83c77d370cd273709c9ebc4a0aaef3284ed8e7145c638742a165a0b5
+  data.tar.gz: 0b7657ab8067283d63885906c0d21fdf29265741a966b42f0fd2346af5c388f680681c79e0ea1621fe31ff1e874f7483a5ff6ea4543b603bfc8692a7ad2d9a31

data/README.md

@@ -13,6 +13,7 @@ This gem helps you submit source code to online judges from command line interfa
 - [PKU JudgeOnline](http://poj.org)
 - [Sphere online judge](http://www.spoj.com)
 - [Codeforces](http://codeforces.com)
+- [AtCoder](http://atcoder.jp)
 
 You can also get this list from `ojsubmitter list` command.
 
@@ -32,7 +33,7 @@ You can set the default options of ojsubmitter command.
 
 #### Submit
 
-    $ ojsubmitter -j [JUDGE_NAME] -u [USER_NAME] -p [PASSWORD] -l [LANGUAGE] -f [SOURCE_FILE] -i [PROBLEM_ID]
+    $ ojsubmitter -j [JUDGE_NAME] -u [USER_NAME] -p [PASSWORD] -l [LANGUAGE] -f [SOURCE_FILE] -i [PROBLEM_ID] -c [CONTEST_ID]
 
 This command has too many options, so you can use `.ojsconf.yml` to set default options.
 After submitting, this will open the submission status page with web browser. If you don't want to open browser, please use `-n` option.
@@ -40,16 +41,17 @@ If you don't specify the problem id, this tool assume the problem id from file n
 
 #### Available judges and options to submit.
 
-| online judge | problem | judge (-j) | problem_id (-i) | file name (-f) |
-|:--|:--|:--:|:--:|:--:|
-| Aizu Online Judge | [0000](http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=0000) | aoj | 0000 | 0000.cpp |
-| PKU Judge Online | [1000](http://poj.org/problem?id=1000) | poj | 1000 | 1000.cpp |
-| Sphere Online Judge | [PRIME1](http://www.spoj.com/problems/PRIME1/) | spoj | PRIME1 | prime1.cpp |
-| Codeforces | [1A](http://codeforces.com/problemset/problem/1/A) | cf, codeforces | 1A | 1A.cpp |
-
-When you submit to Codeforces and your file name is like `A.cpp`, this tool assume contest id from your current directory.   For example, if your current directory is `/path/to/cf/1` and file name is `A.cpp`, problem id will be `1A`.
+| online judge | problem | judge (-j) | problem_id (-i) | file name (-f) | contest_id (-c) |
+|:--|:--:|:--:|:--:|:--:|:--:|
+| Aizu Online Judge | [0000](http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=0000) | aoj | 0000 | 0000.cpp | |
+| PKU Judge Online | [1000](http://poj.org/problem?id=1000) | poj | 1000 | 1000.cpp | |
+| Sphere Online Judge | [PRIME1](http://www.spoj.com/problems/PRIME1/) | spoj | PRIME1 | prime1.cpp | |
+| Codeforces | [1A](http://codeforces.com/problemset/problem/1/A) | cf, codeforces | 1A | 1A.cpp | |
+| AtCoder | [abc001 A](http://abc001.contest.atcoder.jp/tasks/abc001_1) | atcoder | A | a.cpp | abc001 |
 
 
+When you submit to Codeforces and your file name is like `A.cpp`, this tool assume contest id from your current directory.   For example, if your current directory is `/path/to/cf/1` and file name is `A.cpp`, problem id will be `1A`.  
+  
 #### Available languages
 
 All languages are case-insensitive.
@@ -183,6 +185,9 @@ Version infomation of Codeforces is [here](http://codeforces.com/blog/entry/79).
 | Scala 2.11.7 | Scala |
 | JavaScript V8 4.8.0 | JavaScript |
 
+#### AtCoder
+
+When you use this for submitting to atcoder, this tool will get languages list from atcoder and submit with matched language. If two more languages are matched, you have to select one.
 
 #### Help
 

data/exe/ojsubmitter

@@ -5,5 +5,7 @@ if File.exists?(File.join(File.expand_path('../..', __FILE__), '.gitignore'))
   $:.unshift(ojs_path)
 end
 
+$VERBOSE = nil
+
 require 'ojsubmitter/cli'
 OJS::CLI.start

data/lib/ojsubmitter.rb

@@ -5,6 +5,7 @@ require 'ojsubmitter/judge/aoj'
 require 'ojsubmitter/judge/poj'
 require 'ojsubmitter/judge/spoj'
 require 'ojsubmitter/judge/codeforces'
+require 'ojsubmitter/judge/atcoder'
 
 module OJS
   ROOT_DIR = File.expand_path(File.join(__FILE__, '..', '..'))

data/lib/ojsubmitter/cli.rb

@@ -40,6 +40,9 @@ module OJS
            aliases: "-n",
            type:    :boolean,
            desc:    "Don't show status page after submitting."
+    option :contest_id,
+           aliases: "-c",
+           desc:    "Specify a contest id of AtCoder"
     def submit
       @config = set_options_from_config_file(options.to_h)
       judge_class.submit @config
@@ -78,6 +81,8 @@ module OJS
         OJS.const_get @config['judge'].upcase
       when 'codeforces', 'cf'
         OJS::Codeforces
+      when 'atcoder'
+        OJS::AtCoder
       else
         raise UnknownJudgeError
       end

data/lib/ojsubmitter/judge.rb

@@ -5,10 +5,11 @@ module OJS
   class Judge
     class LoginFailedError < StandardError; end
     class SubmissionError < StandardError; end
+    class UnknownLanguageError < StandardError; end
 
     class << self
       def valid_judges
-        %w[AOJ POJ SPOJ Codeforces]
+        %w[AOJ POJ SPOJ Codeforces AtCoder]
       end
 
       def login
@@ -26,6 +27,8 @@ module OJS
         Logger.error "Login failed!"
       rescue SubmissionError => err
         Logger.error "Failed to submit. Check your config."
+      rescue UnknownLanguageError => err
+        Logger.error "No languages are matched."
       end
 
       def post

data/lib/ojsubmitter/judge/atcoder.rb

@@ -0,0 +1,106 @@
+require 'ojsubmitter/judge'
+require 'nokogiri'
+
+module OJS
+  class AtCoder < Judge
+    class << self
+      def login
+        res = hclient.post(
+          "https://#{contest_url}/login",
+          { name:     user,
+            password: password,
+            submit:   'Login' }
+        )
+        hclient.cookies.each do |ck|
+          ck.domain = contest_url if ck.domain == 'atcoder.jp'
+        end
+        raise Judge::LoginFailedError unless hclient.cookies.any? { |ck| ck.name == '_user_id' }
+        Logger.info "Logged in successfully."
+      end
+
+      def post
+        res = hclient.post(
+          "https://#{contest_url}/submit",
+          { __session:   session,
+            task_id:     task_id,
+            :"language_id_#{task_id}" => language,
+            source_code: code,
+            submit:      'submit',
+          }
+        )
+        raise Judge::SubmissionError if res.body =~ /Error/
+      end
+
+      def contest_url
+        "#{contest_id}.contest.atcoder.jp"
+      end
+
+      def status_url
+        "https://#{contest_url}/submissions/me"
+      end
+
+      def language
+        set_extra_values unless @languages
+        cands = []
+        @languages.each do |id, name|
+          cands << [id,name] if name.downcase.match Regexp.escape(@config['language'].downcase)
+        end
+        raise Judge::UnknownLanguageError if cands.empty?
+        return cands[0][0] if cands.size == 1
+        select_language cands
+      end
+
+      def select_language(cands)
+        Logger.info "Two more languages are matched. Please select one."
+        cands.each_with_index do |cand, idx|
+          Logger.info "#{idx} : #{cand[1]}"
+        end
+        while true
+          inp = STDIN.gets.chomp
+          next Logger.info "Please input number." unless inp =~ /\A\d+\z/
+          idx = inp.to_i
+          next Logger.info "Please input valid number." unless cands[idx]
+          return cands[idx][0]
+        end
+      end
+
+      def contest_id
+        unless @config['contest_id']
+          @config['contest_id'] = Dir.pwd.split('/').last
+        end
+        @config['contest_id'].downcase
+      end
+
+      def task_id
+        unless @task_id
+          set_extra_values
+        end
+        @task_id
+      end
+
+      def problem_id
+        unless @config['problem_id']
+          @config['problem_id'] = File.basename(file).split('.')[0]
+        end
+        @config['problem_id'].upcase
+      end
+
+      def session
+        unless @session
+          set_extra_values
+        end
+        @session
+      end
+
+      def set_extra_values
+        res = @hclient.get("https://#{contest_url}/submit")
+        html = Nokogiri::HTML.parse(res.body)
+        @session = html.xpath('//input[@name="__session"]/@value').first.value
+        @task_id = html.xpath('//select[@name="task_id"]/option').first.attribute('value').value.to_i + problem_id.ord - 'A'.ord
+        @languages = html.xpath("//select[@name=\"language_id_#{@task_id}\"]/option").map { |lang|
+          [lang.attribute('value').value, lang.content]
+        }
+      end
+    end
+  end
+end

data/lib/ojsubmitter/version.rb

@@ -1,3 +1,3 @@
 module OJS
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ojsubmitter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - hadrori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,6 +188,7 @@ files:
 - lib/ojsubmitter/cli.rb
 - lib/ojsubmitter/judge.rb
 - lib/ojsubmitter/judge/aoj.rb
+- lib/ojsubmitter/judge/atcoder.rb
 - lib/ojsubmitter/judge/codeforces.rb
 - lib/ojsubmitter/judge/poj.rb
 - lib/ojsubmitter/judge/spoj.rb