atcoder_greedy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c615d8f8d5392732a0823c7ca87250e7f85fb7eb
-  data.tar.gz: 0977f4aa39c014bd11a8b7621bcc72b5c183dc23
+  metadata.gz: 928824c14d381c4389a42fb8ae036233b3069fe0
+  data.tar.gz: 4e3c5477494c91ed4baba3ce6be5bbdd8926b8ce
 SHA512:
-  metadata.gz: d0550d84633c1740b05e459c324caec19fc15897d42066979360af402e2cf084a3f0b4d796a12cf1cc2ec98b1bccf1d51dd2c682e12fb4dbb5e31fb90d8af93b
-  data.tar.gz: 6a92836715a6a1633ce91aea0d99589667e4574035ea7458f9f36ce244692f878bb839b58991b38667c4a1c5cc472a3e803063d1d438f10fa7fd51fef634bece
+  metadata.gz: 7f5dca1b5d28dfe2808f37b1126b12c293e9b09246a98910988dbe59c39d5714e6115a7959f93c1e8ae76dbd4f93fc47e404dc6ca249100163979d8c56976e1b
+  data.tar.gz: 428b4d2a9e8e72be9d18f2e1679749a917d0248c5b321ec872b3835d791751fc6e042c3efadac89a5fbc88b393d2af96a4ec620a8d9c34e0f2e9b0dc9c9e703d

data/README.md

@@ -6,6 +6,7 @@
 - コンテストフォルダ, 問題ファイルの生成
 - サンプルインプット、アウトプットを用いたテストファイルの生成, テスト実行
 - ユーザーテンプレート機能
+- 提出機能
 - ruby, c/c++ に対応
 
 ## Installation
@@ -63,6 +64,12 @@ $ atcoder_greedy template OPTION
 | --set-default FILE_NAME | -s    | FILE_NAMEで指定されたテンプレートをその言語のデフォルトに設定します. |
 | --delete FILE_NAME      | -d    | FILE_NAMEで指定されたテンプレートを削除します. |
 
+### submitコマンド
+問題の提出を行います. コンテストディレクトリ内で実行してください.提出が成功した場合, 結果画面をブラウザで開きます.
+```
+$ atcoder_greedy submit [SUBMIT_FILE]
+```
+
 ## 使用例
 ### 例1
 ARC014の場合
@@ -75,6 +82,7 @@ $ atcoder_greedy create http://arc014.contest.atcoder.jp
 
 ```
 .
+├── .contest_info.yml
 ├── A.rb
 ├── B.rb
 ├── C.rb
@@ -116,6 +124,12 @@ Correct Answer:
 Test done.
 ```
 
+A問題を提出したい場合は, 
+```
+$ atcoder_greedy submit A.rb
+Submit [A.rb] ... Done!
+```
+
 ### 例2
 ARC015にて, カレントディレクトリにA問題のインプットファイルのみ生成したい場合
 
@@ -125,7 +139,6 @@ ARC015にて, カレントディレクトリにA問題のインプットファ
 
 ## TODO,実装したい機能
 
-- 提出機能
 - 言語対応の拡大
 - gemのテスト作成
 

data/atcoder_greedy.gemspec

@@ -33,4 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'thor'
+  spec.add_dependency 'mechanize'
+  spec.add_dependency 'launchy'
 end

data/lib/atcoder_greedy.rb

@@ -2,6 +2,8 @@ require 'open-uri'
 require 'nokogiri'
 require 'fileutils'
 require 'yaml'
+require 'mechanize'
+require 'launchy'
 
 require "atcoder_greedy/version"
 require 'atcoder_greedy/command'

data/lib/atcoder_greedy/command.rb

@@ -1,10 +1,11 @@
-require 'atcoder_greedy'
 require 'thor'
+require 'atcoder_greedy'
 require 'atcoder_greedy/command/create'
 require 'atcoder_greedy/command/destroy'
 require 'atcoder_greedy/command/test'
 require 'atcoder_greedy/command/config'
 require 'atcoder_greedy/command/template'
+require 'atcoder_greedy/command/submit'
 
 module AtcoderGreedy
   class Command < Thor

data/lib/atcoder_greedy/command/config.rb

@@ -1,6 +1,7 @@
 require 'atcoder_greedy'
 require 'atcoder_greedy/command'
 require 'atcoder_greedy/lib/languages'
+
 module AtcoderGreedy
   class Command < Thor
     desc 'config', 'change settings'
@@ -9,26 +10,56 @@ module AtcoderGreedy
       languages = Languages::ALL_LANGUAGES
       config_path = Dir.home + '/.atcoder_greedy'
       if Dir.exists?(config_path)
-        puts "Your current language is [#{AtcoderGreedy.config[:language]}]."
+        puts "Your current user_id is #{AtcoderGreedy.config[:user_id]} and current language is [#{AtcoderGreedy.config[:language]}]."
       else
         Dir.mkdir(config_path)
         yml_path = AtcoderGreedy.get_config_path + '/settings.yml'
         File.open(yml_path, 'w').close
       end
+
+      # user setting
+      agent = Mechanize.new
+      loop do
+        print 'Input your user_id: '
+        user_id = $stdin.gets.chomp!
+        print 'Input your password: '
+        password = $stdin.gets.chomp!
+        break if user_id.size == 0 || password.size == 0
+
+        print 'Doing test login ...'
+        response = nil
+        agent.get('http://abc032.contest.atcoder.jp/login') do |page|
+          response = page.form_with(action: '/login') do |f|
+            f.field_with(name: 'name').value = user_id
+            f.field_with(name: 'password').value = password
+          end.submit
+        end
+
+        if response.response['x-imojudge-simpleauth'] == 'Passed'
+          puts 'OK!'
+          AtcoderGreedy.configure(user_id: user_id)
+          AtcoderGreedy.configure(password: password)
+          break
+        else
+          puts 'Failed! Confirm input and try again.'
+        end
+      end
+
+      # language setting
       puts "Choose default language from: #{languages}"
       print "Input languages: "
       loop do
         s = $stdin.gets.chomp!
         if languages.include?(s)
           AtcoderGreedy.configure(language: s)
+          puts "Update Your default language to [#{AtcoderGreedy.config[:language]}]."
           break
         elsif s.size == 0
           break
-        elsif puts "Invalid language. please try again:"
+        else
+          puts "Invalid language. please try again:"
         end
       end
-
-      puts "Update Your default language to [#{AtcoderGreedy.config[:language]}]."
     end
   end
 end

data/lib/atcoder_greedy/command/create.rb

@@ -14,18 +14,33 @@ module AtcoderGreedy
 
     def create(contest_url)
       user_options = {
-          without: {input: false, template: false},
+          no: {input: false, template: false},
           problems: [],
           directory: options[:select_directory],
           language: options[:select_language],
           template: options[:select_template]
       }
 
-      user_options[:without][:input] = true if options[:no_input]
-      user_options[:without][:template] = true if options[:no_templates]
+      user_options[:no][:input] = true if options[:no_input]
+      user_options[:no][:template] = true if options[:no_templates]
       user_options[:problems] = options[:select_problem].split unless options[:select_problem].nil?
 
-      Contest.new(contest_url, user_options)
+      contest = Contest.new(contest_url, user_options)
+      # TODO: contest_infoが存在したときの処理
+      File.open("#{contest.dir}/.contest_info.yml", 'w') do |f|
+        info = {
+            name: contest.name,
+            url: contest.url,
+            task: {}
+        }
+        contest.problems.each do |p|
+          info[:task][:"#{p[:name]}"] = {
+              id: p[:task_id]
+          }
+        end
+
+        f.puts info.to_yaml
+      end
     end
   end
 end

data/lib/atcoder_greedy/command/submit.rb

@@ -0,0 +1,48 @@
+require 'atcoder_greedy'
+require 'atcoder_greedy/command'
+require 'atcoder_greedy/lib/atcoder'
+
+def get_language_id(extname)
+  case extname
+    when '.rb'
+      2010
+    when '.cpp'
+      2003
+    when '.c'
+      2001
+    else
+      raise "Unknown extname: #{extname}"
+  end
+end
+
+module AtcoderGreedy
+  class Command < Thor
+    desc 'submit [SUBMIT_FILE]', 'submit your solution'
+
+    # TODO: 提出言語のオプション
+    def submit(submit_file)
+      print "Submit [#{submit_file}] ... "
+      contest_info = YAML.load_file("./.contest_info.yml")
+      problem = File.basename(submit_file, '.*')
+      if contest_info[:task].include?(:"#{problem}")
+        task_id = contest_info[:task][:"#{problem}"][:id]
+      else
+        raise "Unknown problem: #{problem}"
+      end
+
+      atcoder = Atcoder.new
+      atcoder.login(contest_info[:url])
+
+      submit_url = contest_info[:url] + "/submit?task_id=#{task_id}"
+      atcoder.agent.get(submit_url) do |page|
+        p = page.form_with(action: "/submit?task_id=#{task_id}") do |f|
+          f.field_with(name: 'source_code').value = File.open(submit_file).read
+          f.field_with(name: 'task_id').value = task_id
+          f.field_with(name: "language_id_#{task_id}").value = get_language_id(File.extname(submit_file))
+        end.submit
+        puts 'Done!'
+        Launchy.open p.uri
+      end
+    end
+  end
+end

data/lib/atcoder_greedy/lib/atcoder.rb

@@ -0,0 +1,34 @@
+require 'mechanize'
+require 'atcoder_greedy'
+
+class Atcoder
+  attr_accessor :agent
+  def initialize
+    @agent = Mechanize.new
+  end
+
+  def login(url)
+    print 'Login ... '
+    if AtcoderGreedy.config[:user_id].nil? || AtcoderGreedy.config[:user_id].size == 0
+      puts 'You still not set account info.'
+      print 'Input User id: '
+      user_id = $stdin.gets.chomp!
+      print 'Input password: '
+      password = $stdin.gets.chomp!
+    else
+      user_id = AtcoderGreedy.config[:user_id]
+      password = AtcoderGreedy.config[:password]
+    end
+
+    response = nil
+    @agent.get(url + '/login') do |page|
+      response = page.form_with(action: '/login') do |f|
+        f.field_with(name: 'name').value = user_id
+        f.field_with(name: 'password').value = password
+      end.submit
+      raise 'Login error' unless response.response['x-imojudge-simpleauth'] == 'Passed'
+    end
+    puts 'Done!'
+    response
+  end
+end

data/lib/atcoder_greedy/lib/contest.rb

@@ -1,9 +1,11 @@
 require 'uri'
+require 'cgi'
+require 'atcoder_greedy/lib/atcoder'
 require 'atcoder_greedy'
 require 'atcoder_greedy/lib/greedy_template'
 
 class Contest
-  attr_accessor :name, :url
+  attr_accessor :name, :url, :dir, :problems
 
   def initialize(url, **options)
     if options[:language] != ''
@@ -12,39 +14,51 @@ class Contest
       @language = AtcoderGreedy.config[:language]
     end
     @url = url
+
+    set_agent
     set_contest_info(options[:problems])
     set_directories(options[:directory])
 
-    create_inputs unless options[:without][:input]
-    create_templates(options[:template]) unless options[:without][:template]
+    create_inputs unless options[:no][:input]
+    create_templates(options[:template]) unless options[:no][:template]
 
     puts 'Set up done. Go for it!'
   end
 
+  def set_agent
+    atcoder = Atcoder.new
+    atcoder.login(@url)
+    @agent = atcoder.agent
+  end
+
   def set_contest_info(option_problems)
     print 'Set contest info ... '
     @name = URI.parse(@url).host.split('.').first
-    charset = nil
-    html = open(@url + '/assignments') do |f|
-      charset = f.charset
-      f.read
-    end
-    doc = Nokogiri::HTML.parse(html, nil, charset)
+    html = @agent.get(@url + '/assignments').content.toutf8
+    doc = Nokogiri::HTML.parse(html, nil, 'utf8')
 
-    all_problems = nil
+    all_problems = []
+    task_ids = []
     doc.xpath('//tbody').each do |tbody|
+      tbody.xpath('.//a[starts-with(@href,"/submit")]').each do |a|
+        task_ids.push(CGI.parse(URI.parse(a.attributes['href'].value).query)['task_id'].first)
+      end
       all_problems = tbody.xpath('.//a[@class="linkwrapper"]')
     end
 
     @problems = []
-    until all_problems.empty?
-      path = all_problems[0].attributes['href'].value
-      pro = all_problems.select { |l| l.attributes['href'].value == path }
-      all_problems = all_problems.reject { |l| l.attributes['href'].value == path }
-      name = pro[0].inner_text
-      if option_problems.empty? || (!option_problems.empty? && option_problems.include?(name))
-        @problems.push(name: pro[0].inner_text, path: path)
-        print "#{name} "
+    if all_problems.nil?
+      raise 'Failed to get info. Do you participate this contest?'
+    else
+      until all_problems.empty?
+        path = all_problems[0].attributes['href'].value
+        pro = all_problems.select { |l| l.attributes['href'].value == path }
+        all_problems = all_problems.reject { |l| l.attributes['href'].value == path }
+        name = pro[0].inner_text
+        if option_problems.empty? || (!option_problems.empty? && option_problems.include?(name))
+          @problems.push(name: pro[0].inner_text, path: path, task_id: task_ids.shift)
+          print "#{name} "
+        end
       end
     end
     puts 'Done!'
@@ -54,12 +68,8 @@ class Contest
     print 'Create inputs ... '
     @problems.each do |problem|
       # take input and output params from url and save to file
-      charset = nil
-      html = open(@url + problem[:path]) do |f|
-        charset = f.charset
-        f.read
-      end
-      doc = Nokogiri::HTML.parse(html, nil, charset)
+      html = @agent.get(@url + problem[:path]).content.toutf8
+      doc = Nokogiri::HTML.parse(html, nil, 'utf8')
       in_file = File.new(@dir + "/input_#{problem[:name]}.txt", 'w')
 
       params = doc.xpath('//pre')

data/lib/atcoder_greedy/lib/test_case.rb

@@ -48,6 +48,7 @@ class TestCase
 
   def validate
     my_solve = get_solve(@exec_file)
+    passed = 0
     begin
       if my_solve.compile(@problem_name)
         puts '-------------------- Compile Done --------------------'
@@ -71,16 +72,17 @@ class TestCase
         correct = File.open("#{@output[j].path}").read
         diffs = Diff::LCS.diff(myout, correct)
         if diffs.size == 0
+          passed += 1
           puts "-------------------- Testcase ##{j} -------------------- PASSED! Time: #{sprintf("%.5f", result)}s"
         else
           puts "-------------------- Testcase ##{j} -------------------- FAILED! Time: #{sprintf("%.5f", result)}s"
-          puts "Your Output:"
+          puts 'Your Output:'
           puts "#{myout}\n"
-          puts "Correct Answer:"
+          puts 'Correct Answer:'
           puts "#{correct}\n"
         end
       end
-      puts "Test done."
+      puts "Test done. #{passed}/#{@input.size} passed."
     rescue => e
       puts e
     end

data/lib/atcoder_greedy/version.rb

@@ -1,3 +1,3 @@
 module AtcoderGreedy
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atcoder_greedy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - keigo-brook
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: By using this plugin, You can create atcoder-contest templates.
 email:
 - goog@brookbach.com
@@ -104,8 +132,10 @@ files:
 - lib/atcoder_greedy/command/config.rb
 - lib/atcoder_greedy/command/create.rb
 - lib/atcoder_greedy/command/destroy.rb
+- lib/atcoder_greedy/command/submit.rb
 - lib/atcoder_greedy/command/template.rb
 - lib/atcoder_greedy/command/test.rb
+- lib/atcoder_greedy/lib/atcoder.rb
 - lib/atcoder_greedy/lib/contest.rb
 - lib/atcoder_greedy/lib/greedy_template.rb
 - lib/atcoder_greedy/lib/languages.rb