atcoder_greedy 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928824c14d381c4389a42fb8ae036233b3069fe0
-  data.tar.gz: 4e3c5477494c91ed4baba3ce6be5bbdd8926b8ce
+  metadata.gz: e09653f0be96028ec4cd5ee9bf3a7f32a74ed693
+  data.tar.gz: f8bcde8eb0d2026e27e352b735ca04952c83c990
 SHA512:
-  metadata.gz: 7f5dca1b5d28dfe2808f37b1126b12c293e9b09246a98910988dbe59c39d5714e6115a7959f93c1e8ae76dbd4f93fc47e404dc6ca249100163979d8c56976e1b
-  data.tar.gz: 428b4d2a9e8e72be9d18f2e1679749a917d0248c5b321ec872b3835d791751fc6e042c3efadac89a5fbc88b393d2af96a4ec620a8d9c34e0f2e9b0dc9c9e703d
+  metadata.gz: f823286cf447b8879613b6123314c4ddb5aaf2074dfbab2b12f6aea22b451a22f0ade78da0db34d489095b85498a5a1ace76d8c70c85f02e0dc8d3ac6d557685
+  data.tar.gz: fa16ae8899355334b68d08f0a2ee91fc96658078cfd589222c268963b73fbe350f2b0fd888138c95213019fbeec5b6eac69948e4e7aa1a107a4608eea44f9922

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/atcoder_greedy.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rspec"
 
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'thor'

data/lib/atcoder_greedy.rb

@@ -18,11 +18,12 @@ module AtcoderGreedy
           rb: '',
           cpp: '',
           c: '',
-          py: ''
+          py: '',
+          hs: ''
       }
   }
 
-  @valid_languages = %w(rb cpp c py)
+  @valid_languages = %w(rb cpp c py hs)
   @valid_config_keys = @config.keys
 
   # Configure through hash

data/lib/atcoder_greedy/command/create.rb

@@ -11,6 +11,7 @@ module AtcoderGreedy
     option :select_directory, aliases: '-d', default: '', desc: 'select target directory'
     option :select_language, aliases: '-l', default: '', desc: 'select language'
     option :select_template, aliases: '-t', default: '', desc: 'select generate template'
+    map 'c' => 'create'
 
     def create(contest_url)
       user_options = {
@@ -27,18 +28,18 @@ module AtcoderGreedy
 
       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: {}
+      info = {
+          name: contest.name,
+          date: contest.date,
+          url: contest.url,
+          task: {}
+      }
+      contest.problems.each do |p|
+        info[:task][:"#{p[:name]}"] = {
+            id: p[:task_id]
         }
-        contest.problems.each do |p|
-          info[:task][:"#{p[:name]}"] = {
-              id: p[:task_id]
-          }
-        end
-
+      end
+      File.open("#{contest.dir}/.contest_info.yml", 'w') do |f|
         f.puts info.to_yaml
       end
     end

data/lib/atcoder_greedy/command/submit.rb

@@ -2,16 +2,62 @@ 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}"
+def get_language_id(extname, contest_date)
+  # TODO: 日付の検証
+  if contest_date < Date.new(2015, 3, 1)
+    # ABC001 ~ ABC019
+    case extname
+      when '.rb'
+        # Ruby (1.9.3)
+        9
+      when '.cpp'
+        # C++11 (GCC 4.8.1)
+        10
+      when '.c'
+        # C (GCC 4.6.4)
+        13
+      when '.hs'
+        # Haskell (GHC 7.4.1)
+        11
+      else
+        raise "Unknown extname: #{extname}"
+    end
+  elsif contest_date < Date.new(2016, 3, 20)
+    # ABC020 ~ ABC 034
+    case extname
+      when '.rb'
+        # Ruby (2.1.5p273)
+        2010
+      when '.cpp'
+        # C++11 (GCC 4.9.2)
+        2003
+      when '.c'
+        # C (GCC 4.9.2)
+        2001
+      when '.hs'
+        # Haskell (Haskell Platform 2014.2.0.0)
+        2033
+      else
+        raise "Unknown extname: #{extname}"
+    end
+  else
+    # ABC035~
+    case extname
+      when '.rb'
+        # Ruby (2.3.0)
+        3024
+      when '.cpp'
+        # C++14 (GCC 5.3.0)
+        3003
+      when '.c'
+        # C (GCC 5.3.0)
+        3002
+      when '.hs'
+        # Haskell (GHC 7.10)
+        3014
+      else
+        raise "Unknown extname: #{extname}"
+    end
   end
 end
 
@@ -20,6 +66,7 @@ module AtcoderGreedy
     desc 'submit [SUBMIT_FILE]', 'submit your solution'
 
     # TODO: 提出言語のオプション
+    map 's' => 'submit'
     def submit(submit_file)
       print "Submit [#{submit_file}] ... "
       contest_info = YAML.load_file("./.contest_info.yml")
@@ -38,7 +85,16 @@ module AtcoderGreedy
         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))
+
+          # 日付情報が書いていなかった場合取得する
+          if contest_info[:date].nil?
+            contest_info[:date] = Date.parse(page.xpath('//time').first.text)
+            File.open("./.contest_info.yml", 'w') do |f|
+              f.puts contest_info.to_yaml
+            end
+          end
+          f.field_with(name: "language_id_#{task_id}").value =
+              get_language_id(File.extname(submit_file), contest_info[:date])
         end.submit
         puts 'Done!'
         Launchy.open p.uri

data/lib/atcoder_greedy/command/test.rb

@@ -6,6 +6,7 @@ module AtcoderGreedy
   class Command < Thor
     desc 'test [PROBLEM_FILE_NAME]', 'test your solution'
 
+    map 't' => 'test'
     def test(problem_name)
       TestCase.new(problem_name).validate
     end

data/lib/atcoder_greedy/lib/contest.rb

@@ -5,7 +5,7 @@ require 'atcoder_greedy'
 require 'atcoder_greedy/lib/greedy_template'
 
 class Contest
-  attr_accessor :name, :url, :dir, :problems
+  attr_accessor :name, :url, :dir, :problems, :date
 
   def initialize(url, **options)
     if options[:language] != ''
@@ -36,6 +36,7 @@ class Contest
     @name = URI.parse(@url).host.split('.').first
     html = @agent.get(@url + '/assignments').content.toutf8
     doc = Nokogiri::HTML.parse(html, nil, 'utf8')
+    @date = Date.parse(doc.xpath('//time').first.text)
 
     all_problems = []
     task_ids = []
@@ -91,12 +92,12 @@ class Contest
 
   def create_templates(option_template)
     print 'Create Templates ... '
-    if option_template == ''
-      # use user default or system default template
-      if AtcoderGreedy.config[:default_template][:"#{@language}"] != ''
-        solve_template = open(AtcoderGreedy.config[:default_template][:"#{@language}"], &:read)
-      else
+    if option_template.to_s == ''
+      # use system default or user default template
+      if AtcoderGreedy.config[:default_template][:"#{@language}"].nil? || AtcoderGreedy.config[:default_template][:"#{@language}"].to_s == ''
         solve_template = open(File.dirname(__dir__) + '/templates' + "/#{@language}/solve.#{@language}", &:read)
+      else
+        solve_template = open(AtcoderGreedy.config[:default_template][:"#{@language}"], &:read)
       end
     else
       # use option_template
@@ -122,7 +123,7 @@ class Contest
 
   def set_directories(directory)
     print 'Set contest directory ... '
-    if directory == ''
+    if directory.to_s == ''
       FileUtils.mkdir(@name)
       @dir = "./#{@name}"
     else

data/lib/atcoder_greedy/lib/greedy_template.rb

@@ -1,4 +1,3 @@
-# require 'FileUtils'
 require 'atcoder_greedy'
 
 class GreedyTemplate

data/lib/atcoder_greedy/lib/languages.rb

@@ -1,5 +1,5 @@
 class Languages
-  ALL_LANGUAGES = %w(rb cpp c)
+  ALL_LANGUAGES = %w(rb cpp c hs)
   def initialize(solve_file)
     @solve_file = solve_file
   end
@@ -40,6 +40,17 @@ class C < Languages
     system "gcc #{@solve_file} -o #{problem_name}.out"
   end
 
+  def execute(input_path, output_path)
+    system "./#{@exec_file} < #{input_path} > #{output_path}"
+  end
+end
+
+class Hs < Languages
+  def compile(problem_name)
+    @exec_file = "#{problem_name}.out"
+    system "ghc #{@solve_file} -o #{problem_name}.out"
+  end
+
   def execute(input_path, output_path)
     system "./#{@exec_file} < #{input_path} > #{output_path}"
   end

data/lib/atcoder_greedy/lib/test_case.rb

@@ -73,9 +73,9 @@ class TestCase
         diffs = Diff::LCS.diff(myout, correct)
         if diffs.size == 0
           passed += 1
-          puts "-------------------- Testcase ##{j} -------------------- PASSED! Time: #{sprintf("%.5f", result)}s"
+          puts "-------------------- Testcase ##{j + 1} -------------------- PASSED! Time: #{sprintf("%.5f", result)}s"
         else
-          puts "-------------------- Testcase ##{j} -------------------- FAILED! Time: #{sprintf("%.5f", result)}s"
+          puts "-------------------- Testcase ##{j + 1} -------------------- FAILED! Time: #{sprintf("%.5f", result)}s"
           puts 'Your Output:'
           puts "#{myout}\n"
           puts 'Correct Answer:'
@@ -97,6 +97,8 @@ class TestCase
         Cpp.new(solve_file)
       when '.c'
         C.new(solve_file)
+      when '.hs'
+        Hs.new(solve_file)
       else
         raise 'Unknown Language'
     end

data/lib/atcoder_greedy/templates/hs/solve.hs

@@ -0,0 +1,4 @@
+-- Your function here
+
+main :: IO ()
+main = do

data/lib/atcoder_greedy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atcoder_greedy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - keigo-brook
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -143,6 +144,8 @@ files:
 - lib/atcoder_greedy/settings.yml
 - lib/atcoder_greedy/templates/c/solve.c
 - lib/atcoder_greedy/templates/cpp/solve.cpp
+- lib/atcoder_greedy/templates/hs/solve.hs
+- lib/atcoder_greedy/templates/py/solve.py
 - lib/atcoder_greedy/templates/rb/solve.rb
 - lib/atcoder_greedy/version.rb
 homepage: https://github.com/keigo-brook/atcoder_greedy
@@ -166,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem is very useful atcoder plugin.