ojsubmitter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3badcb98563b660a732a2167ea7f9ced96bd2162
-  data.tar.gz: 6a6b7ec27b6576c4ba5c9a3655efc6ea832b18a4
+  metadata.gz: c15735be1e373f3a239bca938b6c01aa5e7fb023
+  data.tar.gz: 3ee561981631575f8db2667388c76584ed5edef4
 SHA512:
-  metadata.gz: c46b109eb64ca7abc17ed3e14a71b01e784655c12571fdeb7e0e2693a0ed52350c278005dbde89980f3a1a78fc0579ce5cfdf238241421435d0c8133b6b6a69a
-  data.tar.gz: 30eb84adf3449d88b55213f98f867d32a68bb5012ab05f968823a8472b34326a346ea144e9079e0a3654f40d49554d8fce84de397430a9722dfa2c7aefd5f8bb
+  metadata.gz: 553aa70b1faf82eba5004510d5550d891d200f045b1a5877d778db45be791f0cb0c20372c809fec1c353fb97dfe07d61dff6fe204689bb48161d544af87a9145
+  data.tar.gz: 6e8900f7ccc3ff3c33c0b45aaaa3241c32c099c46baef4ed64aa12a7439293a3ec14bb75e950c75652f7ff9dc97edd689a217e55513d969b18f673f86807f08f

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - 2.3.0
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -1,9 +1,18 @@
 # Ojsubmitter
 
-This script allows you submit a source code to the online judge from CLI.
+[![Gem Version](https://badge.fury.io/rb/ojsubmitter.svg)](https://badge.fury.io/rb/ojsubmitter) [![Build Status](https://travis-ci.org/hadrori/ojsubmitter.svg?branch=master)](https://travis-ci.org/hadrori/ojsubmitter) [![Coverage Status](https://coveralls.io/repos/github/hadrori/ojsubmitter/badge.svg?branch=master)](https://coveralls.io/github/hadrori/ojsubmitter?branch=master) [![Dependency Status](https://gemnasium.com/hadrori/ojsubmitter.svg)](https://gemnasium.com/hadrori/ojsubmitter)
+
+Submit a source code to the online judge from CLI.
+
+## Requirements
+
+- ruby >= 2.0.0
 
 ### Enabled Judges
 - [AIZU ONLINE JUDGE](http://judge.u-aizu.ac.jp)
+- [PKU JudgeOnline](http://poj.org)
+
+You can also get this list from `ojsubmitter list` command.
 
 ## Installation
 
@@ -21,9 +30,25 @@ Or install it yourself as:
 
     $ gem install ojsubmitter
 
+## Configure
+
+Please run below command to create config file to home directory.
+You can set the default options of ojsubmitter command.
+
+    $ ojsubmitter init
+
+
 ## Usage
 
-Please read the help command.
+#### Submit
+
+    $ ojsubmitter -j [JUDGE_NAME] -u [USER_NAME] -p [PASSWORD] -l [LANGUAGE] -f [SOURCE_FILE]
+
+To omit these options, you can use config file `.ojsconf.yml` located in your home directory.
+
+#### Help
+
+Please read the help command to get more info.
 
     $ ojsubmitter help
 

data/lib/ojsubmitter/cli.rb

@@ -37,9 +37,11 @@ module OJS
            :desc    => "Don't show status page after submitting."
     def submit
       @config = set_options_from_config_file(options.to_h)
-      case @config['judge']
+      case @config['judge'].to_s.downcase
       when 'aoj'
         OJS::AOJ.submit @config
+      when 'poj'
+        OJS::POJ.submit @config
       else
         list
       end

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/poj.rb

@@ -0,0 +1,54 @@
+require 'ojsubmitter/judge'
+
+module OJS
+  class POJ < Judge
+    class << self
+      LANGUAGE_ID = {
+        'g++'     => '0',
+        'gcc'     => '1',
+        'java'    => '2',
+        'pascal'  => '3',
+        'c++'     => '4',
+        'c'       => '5',
+        'fortran' => '6',
+      }
+
+      def login
+        res = hclient.post(
+          'http://poj.org/login',
+          { :user_id1  => user,
+            :password1 => password }
+        )
+        raise Judge::LoginFailedError if res.body =~ /Login failed!/
+        Logger.info "Logged in successfully."
+      end
+
+      def post
+        res = hclient.post(
+          'http://poj.org/submit',
+          { :problem_id => problem_id,
+            :language   => language,
+            :source     => code,
+            :encoded    => 'UTF-8',
+          }
+        )
+        raise Judge::SubmissionError if res.body =~ /(Error Occurred)|(Error report)/
+      end
+
+      def status_url
+        "http://poj.org/status?problem_id=#{problem_id}&user_id=#{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]
+        end
+        sprintf "%04d", @config['problem_id'].to_i
+      end
+    end
+  end
+end

data/lib/ojsubmitter/judge.rb

@@ -3,22 +3,29 @@ require 'httpclient'
 
 module OJS
   class Judge
+    class LoginFailedError < StandardError; end
+    class SubmissionError < StandardError; end
+
     class << self
       def valid_judges
-        %w[aoj]
+        %w[AOJ POJ]
       end
 
       def login
-        false
       end
 
       def submit(*options)
         @config = options[0].to_h if options
+        login
         post
         Logger.info "Your source code has submitted successfully."
-        Logger.info "Opening browser..."
+        Logger.info "Open browser..."
         sleep 1
         open_status
+      rescue LoginFailedError => err
+        Logger.error "Login failed!"
+      rescue SubmissionError => err
+        Logger.error "Failed to submit. Check your config."
       end
 
       def post

data/lib/ojsubmitter/version.rb

@@ -1,3 +1,3 @@
 module OJS
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/ojsubmitter.rb

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

data/ojsubmitter.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   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_dependency 'httpclient', '~> 2.7.0'
   spec.add_dependency 'thor', '~> 0.19.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ojsubmitter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - hadrori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ files:
 - lib/ojsubmitter/cli.rb
 - lib/ojsubmitter/judge.rb
 - lib/ojsubmitter/judge/aoj.rb
+- lib/ojsubmitter/judge/poj.rb
 - lib/ojsubmitter/logger.rb
 - lib/ojsubmitter/util.rb
 - lib/ojsubmitter/version.rb