atcoder_greedy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f2b89e384eba68f987b92e8834a0e34c9f22e5
-  data.tar.gz: cd16013e2bd6e3277607904fea4922eda54948ed
+  metadata.gz: 02ce08f02c28c663958ba6d89dcac332515dce41
+  data.tar.gz: e685ca727b9bddf4d8ba65172b2ec56e8ccd3d36
 SHA512:
-  metadata.gz: 86c4da3eacd3c8b5ae044a0373d6c2d14a68de51630214efd0ecbb2813d4057e697848617e19696c988b1652bc5bc184b1b768c32b56a1df7e3f8d67ff4f52de
-  data.tar.gz: 0a899cf524a11805e2f0b5370fe8b18bf2987f73f01e9da31b6707fe4b0e9c03acb077e110b9318220e76ce127b956f7fec57da73cf6bc58134bf034b1403086
+  metadata.gz: 18d4b206ee22ea32e6d91f31d2c276d6b4f186714856b33b9a9980461eb8efa7beead044d553a1970bd97111aa645b9469dc1868dc3c2ff3a851240c5144e765
+  data.tar.gz: dccb6400815a5ed90d6da2c5bc4140c39c1e5998d4b888bbc43b20e8ea86fb129c31bb5f22aed638eff3987284d1fdb5cd5345b00ce7769215c69c669034e1aa

data/README.md

@@ -7,63 +7,71 @@
 
 ## Usage
 
+### テンプレートファイルの作成
 ```
+# create contest templates
 $ atcoder_greedy create CONTESTNAME
 ```
 
-example: ABC008の場合
+### テストの実行
+```
+$ cd CONTESTNAME
+$ atcoder_greedy test PROBLEMNAME
+```
+
+## 使用例
+ABC009の場合
 
 ```
-$ atcoder_greedy create abc008
+$ atcoder_greedy create abc009
 ```
 
 とすると、以下のようなファイルが生成される。
 
 ```
 .
-├── abc008_1
-│   ├── abc008_1.rb
-│   ├── input.txt
-│   ├── output.txt
-│   └── test_abc008_1.rb
-├── abc008_2
-│   ├── abc008_2.rb
-│   ├── input.txt
-│   ├── output.txt
-│   └── test_abc008_2.rb
-├── abc008_3
-│   ├── abc008_3.rb
-│   ├── input.txt
-│   ├── output.txt
-│   └── test_abc008_3.rb
-└── abc008_4
-    ├── abc008_4.rb
-    ├── input.txt
-    ├── output.txt
-    └── test_abc008_4.rb
+├── A.rb
+├── B.rb
+├── C.rb
+├── D.rb
+├── input_A.txt
+├── input_B.txt
+├── input_C.txt
+└── input_D.txt
 ```
 
-各問題について,input.txtがインプット,output.txtがアウトプット,abc_00X_Y.rbが解答ファイル,test_abc_00X_Y.rbがテストファイルとなる。
+各問題について,X.rbに自分の解答を記述すれば良い。
+input_X.txtにはX.rbのサンプルインプット，アウトプットが記載されている.
 
-abc00X_Y.rbのsolveメソッドに問題の解答を書く。
-
-テストを実行するには、
+A問題についてテストを実行するには、
 
 ```
-$ cd abc00X_Y/
-$ ruby test_abc00X_Y.rb
+$ atcoder_greedy test A.rb
 ```
 
-とすれば良い。
+とすると、以下のようにテスト結果が表示される。
+
+```
+Running a test for problem A...
+Testcase #0 ... PASSED! Time: 0.04137948894640431s
+Testcase #1 ... FAILED! Time: 0.051738745998591185s
+Your Output:
+3
+
+Correct Answer:
+2
+
+Testcase #2 ... PASSED! Time: 0.05054747499525547s
+Test done.
+```
 
 ## 実装した機能
+- 解答ファイルのテンプレート生成
 - サンプルインプット、アウトプットを用いたテストファイルの生成
-- 解答のテンプレート生成
+- テスト実行コマンド
 
 
 ## TODO,実装したい機能
-- リファクタリング
-- テスト結果を見やすく
 - 問題を指定してその問題のみ生成
 - 提出機能
 - 多言語もテンプレートから生成したい

data/lib/atcoder_greedy/command/create.rb

@@ -4,17 +4,19 @@ require 'atcoder_greedy/command'
 module AtcoderGreedy
   class Command < Thor
     desc 'create CONTESTNAME', 'create contest templates for CONTESTNAME'
+
     def create(contest_name)
       Contest.new(contest_name.downcase)
     end
   end
 
   TEMPLATE_PATH = File.join(File.dirname(__dir__), '/templates')
-  TEST_TEMPLATE = open(TEMPLATE_PATH + '/ruby/test.rb', &:read)
   SOLVE_TEMPLATE = open(TEMPLATE_PATH + '/ruby/solve.rb', &:read)
+  PROBLEM_NAMES = %w(A B C D)
 
   class Contest
     attr_accessor :name, :url
+
     def initialize(name)
       @name = name
       puts "Create #{name} contest files"
@@ -23,6 +25,7 @@ module AtcoderGreedy
       @problem_urls = create_contest_problem_urls(name)
       puts 'Create directories'
       create_directories
+      create_templates
       puts 'Set up done.'
     end
 
@@ -40,16 +43,14 @@ module AtcoderGreedy
       end
 
       4.times do |i|
-        urls.push(name: "#{contest_name}_#{task_num[i]}", path: @base_url + "/tasks/#{contest_name}_#{task_num[i]}")
+        urls.push(name: "#{PROBLEM_NAMES[i]}", path: @base_url + "/tasks/#{contest_name}_#{task_num[i]}")
       end
       urls
     end
 
-    def create_directories
-      # コンテストディレクトリ作成
-      FileUtils.mkdir(@name)
-
-      @problem_urls.each do |url|
+    def create_templates
+      @problem_urls.each_with_index do |url, pro_i|
+        problem_dir = "./#{@name}"
         # urlからインプット、アウトプットパラメータをとってきてファイルにしまう
         charset = nil
         html = open(url[:path]) do |f|
@@ -57,40 +58,34 @@ module AtcoderGreedy
           f.read
         end
         doc = Nokogiri::HTML.parse(html, nil, charset)
-
-        problem_dir = "./#{@name}/#{url[:name]}"
-        FileUtils.mkdir(problem_dir)
-
-        in_file = File.new(problem_dir + '/input.txt', 'w')
-        out_file = File.new(problem_dir + '/output.txt', 'w')
+        in_file = File.new(problem_dir + "/input_#{PROBLEM_NAMES[pro_i]}.txt", 'w')
 
         params = doc.xpath('//pre')
         params.shift
         params.each_with_index do |p, i|
           if i % 2 == 0
-            in_file.print "#{p.text}"
+            in_file.puts "-- Example #{i/2}"
+            in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
           else
-            out_file.print "#{p.text}"
+            in_file.puts "-- Answer #{(i-1)/2}"
+            in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
           end
         end
 
         in_file.close
-        out_file.close
-
-        # テストファイル,解答ファイルの生成
-        test_file_content = TEST_TEMPLATE.clone
-        test_file_content.gsub!(/NAME/, url[:name].capitalize)
-        test_file_content.gsub!(/PROBLEM/, url[:name])
-        test_file = File.new(problem_dir + "/test_#{url[:name]}.rb", 'w')
-        test_file.print test_file_content
-        test_file.close
 
         solve_file_content = SOLVE_TEMPLATE.clone
-        solve_file_content.gsub!(/NAME/, url[:name].capitalize)
+        solve_file_content.gsub!(/CONTEST/, @name.upcase)
+        solve_file_content.gsub!(/PROBLEM/, url[:name].upcase)
         solve_file = File.new(problem_dir + "/#{url[:name]}.rb", 'w')
         solve_file.print solve_file_content
         solve_file.close
       end
     end
+
+    def create_directories
+      # コンテストディレクトリ作成
+      FileUtils.mkdir(@name)
+    end
   end
-end
+end

data/lib/atcoder_greedy/command/test.rb

@@ -0,0 +1,84 @@
+require 'atcoder_greedy'
+require 'atcoder_greedy/command'
+require 'diff/lcs'
+require 'tempfile'
+require 'benchmark'
+
+
+module AtcoderGreedy
+  class Command < Thor
+    desc 'test PROBLEMNAME', 'test your solution'
+
+    def test(problem_name)
+      name = File.basename(problem_name, '.*')
+      puts "Running a test for problem #{name}..."
+      TestCase.new(name).validate
+      puts "Test done."
+    end
+  end
+
+  class TestCase
+    def initialize(problem_name)
+      @input_file = File.open("./input_#{problem_name}.txt", 'r')
+      @exec_file = "./#{problem_name}.rb"
+      get_in_out
+    end
+
+    def get_in_out
+      i = 0
+      @input = []
+      @output = []
+      now = nil
+      while (t = @input_file.gets) != nil
+        example_string = "-- Example #{i}"
+        answer_string = "-- Answer #{i}"
+
+        if t.chomp == example_string
+          now.close(false) unless now.nil?
+          now = Tempfile.new(['in', '.txt'], './')
+          @input.push(now)
+          now.open
+        elsif t.chomp == answer_string
+          now.close(false) unless now.nil?
+          now = Tempfile.new(['out', '.txt'], './')
+          @output.push(now)
+          now.open
+          i += 1
+        else
+          now.puts t
+        end
+      end
+      @input[-1].close(false)
+      @output[-1].close(false)
+    end
+
+    def validate
+      @input.size.times do |j|
+        myout_file = Tempfile.new(['myout', '.txt'], './')
+        myout_file.open
+        result = Benchmark.realtime do
+          pid = Process.fork do
+            exec "ruby #{@exec_file} < #{@input[j].path} > #{myout_file.path}"
+            @input[j].close
+            myout_file.close(false)
+          end
+          Process.waitpid pid
+        end
+
+        myout = myout_file.open.read
+        myout_file.close
+        correct = File.open("#{@output[j].path}").read
+        diffs = Diff::LCS.diff(myout, correct)
+        if diffs.size == 0
+          puts "Testcase ##{j} ... PASSED! Time: #{result}s"
+        else
+          puts "Testcase ##{j} ... FAILED! Time: #{result}s"
+          puts "Your Output:"
+          puts "#{myout}\n"
+          puts "Correct Answer:"
+          puts "#{correct}\n"
+        end
+      end
+    end
+  end
+end

data/lib/atcoder_greedy/command.rb

@@ -1,8 +1,9 @@
 require 'atcoder_greedy'
 require 'thor'
 require 'atcoder_greedy/command/create'
+require 'atcoder_greedy/command/test'
 
 module AtcoderGreedy
   class Command < Thor
   end
-end
+end

data/lib/atcoder_greedy/templates/ruby/solve.rb

@@ -1,22 +1,2 @@
-# coding: utf-8
-require 'stringio'
-
-class NAME
-  alias :puts_original :puts
-  def initialize(input)
-    @f = StringIO.new(input)
-  end
-
-  def gets
-    @f.gets
-  end
-
-  def puts(a)
-    puts_original a
-    a
-  end
-
-  def solve
-    # write your program here
-  end
-end
+# CONTEST PROBLEM
+# Your code here

data/lib/atcoder_greedy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atcoder_greedy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - keigo-brook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,8 +104,8 @@ files:
 - lib/atcoder_greedy.rb
 - lib/atcoder_greedy/command.rb
 - lib/atcoder_greedy/command/create.rb
+- lib/atcoder_greedy/command/test.rb
 - lib/atcoder_greedy/templates/ruby/solve.rb
-- lib/atcoder_greedy/templates/ruby/test.rb
 - lib/atcoder_greedy/version.rb
 homepage: https://github.com/keigo-brook/atcoder_greedy
 licenses:

data/lib/atcoder_greedy/templates/ruby/test.rb

@@ -1,61 +0,0 @@
-# coding: utf-8
-require 'test/unit'
-require_relative 'PROBLEM.rb'
-
-class Test_NAME < Test::Unit::TestCase
-  def setup
-    @test_cases = create_test_cases
-    @sample_outputs = get_outputs
-  end
-
-  def create_test_cases
-    test_cases = []
-    in_file = File.open('./input.txt', 'r+:utf-8')
-    loop do
-      s = ''
-      loop do
-        t = in_file.gets
-        if t != nil && t.chomp.length > 0
-          s += t
-        else
-          break
-        end
-      end
-      if s.length == 0 && test_cases.size > 0
-        break
-      elsif s.length > 0
-        test_case = NAME.new(s)
-        test_cases.push(test_case)
-      end
-    end
-    test_cases
-  end
-
-  def get_outputs
-    outputs = []
-    out_file = File.open('./output.txt', 'r+:utf-8')
-    loop do
-      s = ''
-      loop do
-        t = out_file.gets
-        if t != nil && t.chomp.length > 0
-          s += t
-        else
-          break
-        end
-      end
-      if s.length == 0 && outputs.size > 0
-        break
-      elsif s.length > 0
-        outputs.push(s.chomp)
-      end
-    end
-    outputs
-  end
-
-  def test_PROBLEM
-    @test_cases.each_with_index do |obj, i|
-      assert_equal(@sample_outputs[i], obj.solve.to_s)
-    end
-  end
-end