ojsubmitter 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e09460f877c47644d23150a3c3479d03fea45b
-  data.tar.gz: 5e2424eb3262f1c2be86470dfc861ae115244665
+  metadata.gz: 4c31db1fd2585d4ed4427c155dfa5aa995773c74
+  data.tar.gz: 9399f3e6179459f81314f50205224afbc94ce3c7
 SHA512:
-  metadata.gz: 5de9ad732e98acb2310b945d0d4315ec6c995669bc752a0745560c56411aae8f0bc08846db46d294d5477f87d6b037c7253255c8455faae984272e7a05681619
-  data.tar.gz: 5ee1531964bbd18240024d6b2bfa0312d7294844afd7a2f09ae79af862b47ce10c759fd8ef030f595f4754d83d7068053c890908fe52871d620bd28db2bb1de2
+  metadata.gz: a602d458dd531e674b253579a01c55aff2641b4a73f838c88e6222686f9c52e5856913af81378f29b9d0e2d0637fad32d97a423e314db1927a31d12c628479c7
+  data.tar.gz: cee4338c534b173fc6b3e90e46eda0e4a08279cd246e9be74f55a49aa05e7d2259af35cbf4cc6297582cfdd73405cb21a6ca7e2201ccf663212479c465661e74

data/README.md

@@ -12,6 +12,7 @@ Submit a source code to the online judge from CLI.
 - [AIZU ONLINE JUDGE](http://judge.u-aizu.ac.jp)
 - [PKU JudgeOnline](http://poj.org)
 - [Sphere online judge](http://www.spoj.com)
+- [Codeforces](http://codeforces.com)
 
 You can also get this list from `ojsubmitter list` command.
 

data/lib/ojsubmitter.rb

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

data/lib/ojsubmitter/cli.rb

@@ -4,6 +4,8 @@ require 'yaml'
 
 module OJS
   class CLI < Thor
+    class UnknownJudgeError < StandardError; end
+
     default_command :submit
 
     def initialize(*)
@@ -17,36 +19,29 @@ module OJS
 
     desc "submit", "Submit your source code."
     option :judge,
-           :aliases => "-j",
-           :desc    => "Specify a target judge."
+           aliases: "-j",
+           desc:    "Specify a target judge."
     option :file,
-           :aliases => "-f",
-           :desc    => "Specify your source file to submit."
+           aliases: "-f",
+           desc:    "Specify your source file to submit."
     option :user,
-           :aliases => "-u",
-           :desc    => "Specify your user_name."
+           aliases: "-u",
+           desc:    "Specify your user_name."
     option :password,
-           :aliases => "-p",
-           :desc    => "Specify your password."
+           aliases: "-p",
+           desc:    "Specify your password."
     option :language,
-           :aliases => "-l",
-           :desc    => "Specify a programming language."
+           aliases: "-l",
+           desc:    "Specify a programming language."
     option :nostatus,
-           :aliases => "-n",
-           :type    => :boolean,
-           :desc    => "Don't show status page after submitting."
+           aliases: "-n",
+           type:    :boolean,
+           desc:    "Don't show status page after submitting."
     def submit
       @config = set_options_from_config_file(options.to_h)
-      case @config['judge'].to_s.downcase
-      when 'aoj'
-        OJS::AOJ.submit @config
-      when 'poj'
-        OJS::POJ.submit @config
-      when 'spoj'
-        OJS::SPOJ.submit @config        
-      else
-        list
-      end
+      judge_class.submit @config
+    rescue UnknownJudgeError => err
+      list
     end
 
     SAMPLE_CONFIG_PATH = File.join(OJS::ROOT_DIR, '.ojsconf.yml.sample')
@@ -73,5 +68,16 @@ module OJS
       end
       config
     end
+
+    def judge_class
+      case @config['judge'].to_s.downcase
+      when 'aoj', 'poj', 'spoj'
+        OJS.const_get @config['judge'].upcase
+      when 'codeforces', 'cf'
+        OJS::Codeforces
+      else
+        raise UnknownJudgeError
+      end
+    end
   end
 end

data/lib/ojsubmitter/judge.rb

@@ -8,7 +8,7 @@ module OJS
 
     class << self
       def valid_judges
-        %w[AOJ POJ SPOJ]
+        %w[AOJ POJ SPOJ Codeforces]
       end
 
       def login

data/lib/ojsubmitter/judge/aoj.rb

@@ -20,11 +20,11 @@ module OJS
       def post
         hclient.post(
           'http://judge.u-aizu.ac.jp/onlinejudge/servlet/Submit',
-          { :userID     => user,
-            :password   => password,
-            :problemNO  => problem_id,
-            :language   => language,
-            :sourceCode => code }
+          { userID:     user,
+            password:   password,
+            problemNO:  problem_id,
+            language:   language,
+            sourceCode: code }
         )
       end
 

data/lib/ojsubmitter/judge/codeforces.rb

@@ -0,0 +1,99 @@
+require 'ojsubmitter/judge'
+require 'nokogiri'
+
+module OJS
+  class Codeforces < Judge
+    class << self
+      LANGUAGE_ID = {
+        'gcc' => '10',
+        'g++' => '43',
+        'g++11' => '1',
+        'msc++' => '2',
+        'c#' => '9',
+        'msc#' => '29',
+        'd' => '28',
+        'go' => '32',
+        'haskell' => '12',
+        'java7' => '23',
+        'java' => '36',
+        'ocaml' => '19',
+        'delphi' => '3',
+        'pascal' => '4',
+        'perl' => '13',
+        'php' => '6',
+        'python' => '7',
+        'python3' => '31',
+        'pypy' => '40',
+        'pypy3' => '41',
+        'ruby' => '8',
+        'scala' => '20',
+        'javascript' => '34',
+        'activetcl' => '14',
+        'io' => '15',
+        'pike' => '17',
+        'befunge' => '18',
+        'cobol' => '22',
+        'factor' => '25',
+        'secret' => '26',
+        'roco' => '27',
+        'ada' => '33',
+        'mysterious' => '28',
+        'false' => '39',
+        'picat' => '44',
+      }
+
+      def login
+        res = hclient.post(
+          'http://codeforces.com/enter',
+          { handle:     user,
+            password:   password,
+            action:     'enter',
+            ftaa:       '',
+            bfaa:       '',
+            csrf_token: csrf_token,
+          }
+        )
+        raise Judge::LoginFailedError if res.body =~ /(Invalid handle or password)|(Fill in the form to login into Codeforces.)/
+        Logger.info "Logged in successfully."
+      end
+
+      def post
+        res = hclient.post(
+          'http://codeforces.com/problemset/submit',
+          { submittedProblemCode: problem_id,
+            programTypeId:        language,
+            source:               code,
+            csrf_token:           csrf_token,
+            action:               'submitSolutionFormSubmitted',
+          }
+        )
+      end
+
+      def status_url
+        "http://codeforces.com/submissions/#{user}"
+      end
+
+      def language
+        LANGUAGE_ID[@config['language'].to_s.downcase]
+      end
+
+      def problem_id
+        unless @config['problem_id']
+          @config['problem_id'] = File.basename(file).split('.')[0]
+          unless @config['problem_id'] =~ /\d+/
+            @config['problem_id'] = Dir.pwd.split('/').last + @config['problem_id']
+          end
+        end
+        @config['problem_id'].to_s.upcase
+      end
+
+      def csrf_token
+        unless @csrf_token
+          res = hclient.get('http://codeforces.com')
+          @csrf_token = Nokogiri::HTML.parse(res.body).xpath('/html/head/meta[@name="X-Csrf-Token"]/@content').to_s
+        end
+        @csrf_token
+      end
+    end
+  end
+end

data/lib/ojsubmitter/judge/poj.rb

@@ -16,8 +16,8 @@ module OJS
       def login
         res = hclient.post(
           'http://poj.org/login',
-          { :user_id1  => user,
-            :password1 => password }
+          { user_id1:  user,
+            password1: password }
         )
         raise Judge::LoginFailedError if res.body =~ /Login failed!/
         Logger.info "Logged in successfully."
@@ -26,10 +26,10 @@ module OJS
       def post
         res = hclient.post(
           'http://poj.org/submit',
-          { :problem_id => problem_id,
-            :language   => language,
-            :source     => code,
-            :encoded    => 'UTF-8',
+          { problem_id: problem_id,
+            language:   language,
+            source:     code,
+            encoded:    'UTF-8',
           }
         )
         raise Judge::SubmissionError if res.body =~ /(Error Occurred)|(Error report)/

data/lib/ojsubmitter/judge/spoj.rb

@@ -63,8 +63,8 @@ module OJS
       def login
         res = hclient.post(
           'http://www.spoj.com/login/',
-          { :login_user => user,
-            :password   => password }
+          { login_user: user,
+            password:   password }
         )
         raise Judge::LoginFailedError if res.body =~ /Authentication failed!/
         Logger.info "Logged in successfully."
@@ -73,9 +73,9 @@ module OJS
       def post
         res = hclient.post(
           'http://www.spoj.com/submit/complete/',
-          { :problemcode => problem_id, 
-            :lang        => language,
-            :file        => code }
+          { problemcode: problem_id, 
+            lang:        language,
+            file:        code }
         )
         raise Judge::SubmissionError if res.body =~ /Error/
       end

data/lib/ojsubmitter/version.rb

@@ -1,3 +1,3 @@
 module OJS
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/ojsubmitter.gemspec

@@ -18,13 +18,18 @@ Gem::Specification.new do |spec|
   spec.executables   = ["ojsubmitter"]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0.0'
+
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.11.0"
   spec.add_development_dependency "coveralls", "~> 0.8.0"
   spec.add_development_dependency "fakefs", "~> 0.8.0"
+  spec.add_development_dependency "vcr", "~> 3.0.0"
+  spec.add_development_dependency "webmock", "~> 1.22.0"
 
   spec.add_dependency 'httpclient', '~> 2.7.0'
   spec.add_dependency 'thor', '~> 0.19.0'
+  spec.add_dependency 'nokogiri', '~> 1.6.8.rc3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ojsubmitter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - hadrori
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.rc3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.rc3
 description: 
 email:
 - hadrori.hs@gmail.com
@@ -146,6 +188,7 @@ files:
 - lib/ojsubmitter/cli.rb
 - lib/ojsubmitter/judge.rb
 - lib/ojsubmitter/judge/aoj.rb
+- lib/ojsubmitter/judge/codeforces.rb
 - lib/ojsubmitter/judge/poj.rb
 - lib/ojsubmitter/judge/spoj.rb
 - lib/ojsubmitter/logger.rb
@@ -164,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="