atcoder_greedy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ce08f02c28c663958ba6d89dcac332515dce41
-  data.tar.gz: e685ca727b9bddf4d8ba65172b2ec56e8ccd3d36
+  metadata.gz: d42b0f9fe076b3670cff6cdfad10dfba4616024d
+  data.tar.gz: ed0416f152662e1090ffb8afebe4e9132c9b6fa1
 SHA512:
-  metadata.gz: 18d4b206ee22ea32e6d91f31d2c276d6b4f186714856b33b9a9980461eb8efa7beead044d553a1970bd97111aa645b9469dc1868dc3c2ff3a851240c5144e765
-  data.tar.gz: dccb6400815a5ed90d6da2c5bc4140c39c1e5998d4b888bbc43b20e8ea86fb129c31bb5f22aed638eff3987284d1fdb5cd5345b00ce7769215c69c669034e1aa
+  metadata.gz: 5d94fb94d0aa72a7a62df97872b83ebebc080984b2876a1e5356d5a3940f4360e5b1d5ad6d21325dcc0c84e47cc13ea5d65f8828b3226f581e9b8ceaef037028
+  data.tar.gz: 78f2729640bcbd2ba18e9abbc9d5e006a68b81d7a0e87a2b4e9b12692cd2ca0b3e71bebf780f6da8aad4cc372b93ace0765de88c2e9b527002b81f9045c6e5fe

data/README.md

@@ -1,22 +1,33 @@
 # AtcoderGreedy
-楽にatcoderを使いたい
+楽にatcoderを使いたい.
+毎回サンプルインプットをコピペするのめんどくさくないですか？
 
 ## Installation
 
     $ gem install atcoder_greedy
 
+## 初期設定
+
+configコマンドを使用してデフォルト言語の設定をしてください。
+```
+$ atcoder_greedy config
+Choose default language from: ["rb", "cpp"]
+Input languages: cpp
+Update Your default language to [cpp].
+$ 
+```
+
 ## Usage
 
 ### テンプレートファイルの作成
 ```
-# create contest templates
 $ atcoder_greedy create CONTESTNAME
 ```
 
 ### テストの実行
 ```
 $ cd CONTESTNAME
-$ atcoder_greedy test PROBLEMNAME
+$ atcoder_greedy test PROBLEM_FILE_NAME
 ```
 
 ## 使用例
@@ -52,16 +63,22 @@ $ atcoder_greedy test A.rb
 とすると、以下のようにテスト結果が表示される。
 
 ```
-Running a test for problem A...
-Testcase #0 ... PASSED! Time: 0.04137948894640431s
-Testcase #1 ... FAILED! Time: 0.051738745998591185s
+Running a test for problem A.rb...
+-------------------- Compile Done --------------------
+-------------------- Testcase #0 -------------------- FAILED! Time: 0.00727s
 Your Output:
-3
+5
+Correct Answer:
+1
+
+-------------------- Testcase #1 -------------------- PASSED! Time: 0.04882s
 
+-------------------- Testcase #2 -------------------- FAILED! Time: 0.00614s
+Your Output:
+3
 Correct Answer:
-2
+1
 
-Testcase #2 ... PASSED! Time: 0.05054747499525547s
 Test done.
 ```
 
@@ -69,12 +86,13 @@ Test done.
 - 解答ファイルのテンプレート生成
 - サンプルインプット、アウトプットを用いたテストファイルの生成
 - テスト実行コマンド
+- ruby, c++ に対応
 
 
 ## TODO,実装したい機能
 - 問題を指定してその問題のみ生成
 - 提出機能
-- 多言語もテンプレートから生成したい
+- 言語対応の拡大
 
 ## Development
 

data/lib/atcoder_greedy/command/config.rb

@@ -0,0 +1,34 @@
+require 'atcoder_greedy'
+require 'atcoder_greedy/command'
+require 'atcoder_greedy/lib/languages'
+module AtcoderGreedy
+  class Command < Thor
+    desc 'config', 'change settings'
+
+    def config
+      languages = Languages::ALL_LANGUAGES
+      config_path = Dir.home + '/.atcoder_greedy'
+      if Dir.exists?(config_path)
+        puts "Your current language is [#{AtcoderGreedy.config[:language]}]."
+      else
+        Dir.mkdir(config_path)
+        File.new(config_path + '/settings.yml', 'w')
+      end
+      puts "Choose default language from: #{languages}"
+      print "Input languages: "
+      loop do
+        s = $stdin.gets.chomp!
+        if languages.include?(s)
+          AtcoderGreedy.configure(language: s)
+          break
+        elsif s.size == 0
+          break
+        elsif puts "Invalid language. please try again:"
+        end
+      end
+
+      AtcoderGreedy.save_config
+      puts "Update Your default language to [#{AtcoderGreedy.config[:language]}]."
+    end
+  end
+end

data/lib/atcoder_greedy/command/create.rb

@@ -1,91 +1,13 @@
 require 'atcoder_greedy'
 require 'atcoder_greedy/command'
+require 'atcoder_greedy/lib/contest'
 
 module AtcoderGreedy
   class Command < Thor
-    desc 'create CONTESTNAME', 'create contest templates for CONTESTNAME'
+    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')
-  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"
-      @base_url = create_contest_url(name)
-      puts "Contest url is #{@base_url}"
-      @problem_urls = create_contest_problem_urls(name)
-      puts 'Create directories'
-      create_directories
-      create_templates
-      puts 'Set up done.'
-    end
-
-    def create_contest_url(contest_name)
-      'http://' + contest_name + '.contest.atcoder.jp'
-    end
-
-    def create_contest_problem_urls(contest_name)
-      urls = []
-      if (contest_name.include?('abc') && contest_name[3..5].to_i > 19) ||
-          (contest_name.include?('arc') && contest_name[3..5].to_i > 34)
-        task_num = %w(a b c d)
-      else
-        task_num = %w(1 2 3 4)
-      end
-
-      4.times do |i|
-        urls.push(name: "#{PROBLEM_NAMES[i]}", path: @base_url + "/tasks/#{contest_name}_#{task_num[i]}")
-      end
-      urls
-    end
-
-    def create_templates
-      @problem_urls.each_with_index do |url, pro_i|
-        problem_dir = "./#{@name}"
-        # urlからインプット、アウトプットパラメータをとってきてファイルにしまう
-        charset = nil
-        html = open(url[:path]) do |f|
-          charset = f.charset
-          f.read
-        end
-        doc = Nokogiri::HTML.parse(html, nil, charset)
-        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.puts "-- Example #{i/2}"
-            in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
-          else
-            in_file.puts "-- Answer #{(i-1)/2}"
-            in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
-          end
-        end
-
-        in_file.close
-
-        solve_file_content = SOLVE_TEMPLATE.clone
-        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

data/lib/atcoder_greedy/command/destroy.rb

@@ -0,0 +1,20 @@
+require 'atcoder_greedy'
+require 'atcoder_greedy/command'
+
+module AtcoderGreedy
+  class Command < Thor
+    desc 'destroy [CONTESTNAME]', 'destroy contest templates for [CONTESTNAME]'
+
+    def destroy(contest_name)
+      puts "Destroy ./#{contest_name} [y/n]?"
+      s = $stdin.gets
+      if s == 'y' || s == 'yes'
+        if system("rm -r ./#{contest_name}")
+          puts 'deleted.'
+        else
+          raise 'Runtime Error'
+        end
+      end
+    end
+  end
+end

data/lib/atcoder_greedy/command/test.rb

@@ -1,84 +1,14 @@
 require 'atcoder_greedy'
 require 'atcoder_greedy/command'
-require 'diff/lcs'
-require 'tempfile'
-require 'benchmark'
-
+require 'atcoder_greedy/lib/test_case'
 
 module AtcoderGreedy
   class Command < Thor
-    desc 'test PROBLEMNAME', 'test your solution'
+    desc 'test [PROBLEM_FILE_NAME]', '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
+      TestCase.new(problem_name).validate
     end
   end
 end
+

data/lib/atcoder_greedy/command.rb

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

data/lib/atcoder_greedy/lib/contest.rb

@@ -0,0 +1,79 @@
+class Contest
+  attr_accessor :name, :url
+
+  def initialize(name)
+    @language = AtcoderGreedy.config[:language]
+    template_path = File.join(File.dirname(__dir__), '/templates')
+    @solve_template = open(template_path + "/#{@language}/solve.#{@language}", &:read)
+    @problem_names = %w(A B C D)
+    @name = name
+    puts "Create #{name} contest files"
+    @base_url = create_contest_url(name)
+    puts "Contest url is #{@base_url}"
+    @problem_urls = create_contest_problem_urls(name)
+    puts 'Create directories'
+    create_directories
+    create_templates
+    puts 'Set up done.'
+  end
+
+  def create_contest_url(contest_name)
+    'http://' + contest_name + '.contest.atcoder.jp'
+  end
+
+  def create_contest_problem_urls(contest_name)
+    urls = []
+    if (contest_name.include?('abc') && contest_name[3..5].to_i > 19) ||
+        (contest_name.include?('arc') && contest_name[3..5].to_i > 34)
+      task_num = %w(a b c d)
+    else
+      task_num = %w(1 2 3 4)
+    end
+
+    4.times do |i|
+      urls.push(name: "#{@problem_names[i]}", path: @base_url + "/tasks/#{contest_name}_#{task_num[i]}")
+    end
+    urls
+  end
+
+  def create_templates
+    @problem_urls.each_with_index do |url, pro_i|
+      problem_dir = "./#{@name}"
+      # urlからインプット、アウトプットパラメータをとってきてファイルにしまう
+      charset = nil
+      html = open(url[:path]) do |f|
+        charset = f.charset
+        f.read
+      end
+      doc = Nokogiri::HTML.parse(html, nil, charset)
+      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.puts "-- Example #{i/2}"
+          in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
+        else
+          in_file.puts "-- Answer #{(i-1)/2}"
+          in_file.puts "#{p.text.gsub(/\r\n?/, "\n").strip}"
+        end
+      end
+
+      in_file.close
+
+      solve_file_content = @solve_template.clone
+      solve_file_content.gsub!(/DATE/, Time.now.strftime('%F'))
+      solve_file_content.gsub!(/CONTEST/, @name.upcase)
+      solve_file_content.gsub!(/PROBLEM/, url[:name].upcase)
+      solve_file = File.new(problem_dir + "/#{url[:name]}.#{@language}", 'w')
+      solve_file.print solve_file_content
+      solve_file.close
+    end
+  end
+
+  def create_directories
+    # コンテストディレクトリ作成
+    FileUtils.mkdir(@name)
+  end
+end

data/lib/atcoder_greedy/lib/languages.rb

@@ -0,0 +1,35 @@
+class Languages
+  ALL_LANGUAGES = %w(rb cpp)
+  def initialize(solve_file)
+    @solve_file = solve_file
+  end
+
+  def compile(problem_name)
+    raise 'Error: Not Implemented'
+  end
+
+  def execute(input_path, output_path)
+    raise 'Error: Not Implemented'
+  end
+end
+
+class Rb < Languages
+  def compile(problem_name)
+    true
+  end
+
+  def execute(input_path, output_path)
+    system "ruby #{@solve_file} < #{input_path} > #{output_path}"
+  end
+end
+
+class Cpp < Languages
+  def compile(problem_name)
+    @exec_file = "#{problem_name}.out"
+    system "g++ #{@solve_file} -o #{problem_name}.out"
+  end
+
+  def execute(input_path, output_path)
+    system "./#{@exec_file} < #{input_path} > #{output_path}"
+  end
+end

data/lib/atcoder_greedy/lib/test_case.rb

@@ -0,0 +1,99 @@
+require 'diff/lcs'
+require 'tempfile'
+require 'benchmark'
+require 'atcoder_greedy/lib/languages'
+class TestCase
+  def initialize(problem_name)
+    language = File.extname(problem_name)
+    if language.size == 0
+      language = '.' + AtcoderGreedy.config[:language]
+      problem_name = problem_name + language
+    end
+    puts "Running a test for problem #{problem_name}..."
+
+    @problem_name = File.basename(problem_name, '.*')
+    @input_file = File.open("./input_#{@problem_name}.txt", 'r')
+    @exec_file = "./#{@problem_name}#{language}"
+    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
+    my_solve = get_solve(@exec_file)
+    begin
+      if my_solve.compile(@problem_name)
+        puts '-------------------- Compile Done --------------------'
+      else
+        raise 'Compile Error'
+      end
+
+      @input.size.times do |j|
+        myout_file = Tempfile.new(['myout', '.txt'], './')
+        myout_file.open
+        result = Benchmark.realtime do
+          unless my_solve.execute(@input[j].path, myout_file.path)
+            raise "Runtime Error"
+          end
+          @input[j].close
+          myout_file.close(false)
+        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: #{sprintf("%.5f", result)}s"
+        else
+          puts "-------------------- Testcase ##{j} -------------------- FAILED! Time: #{sprintf("%.5f", result)}s"
+          puts "Your Output:"
+          puts "#{myout}\n"
+          puts "Correct Answer:"
+          puts "#{correct}\n"
+        end
+      end
+      puts "Test done."
+    rescue => e
+      puts e
+    end
+  end
+
+  # HACK: move to Languages
+  def get_solve(solve_file)
+    case File.extname(solve_file)
+      when '.rb'
+        Rb.new(solve_file)
+      when '.cpp'
+        Cpp.new(solve_file)
+      else
+        raise 'Unknown Lanugage'
+    end
+  end
+end

data/lib/atcoder_greedy/settings.yml

@@ -0,0 +1,3 @@
+user_id: ''
+password: ''
+language: 'rb'

data/lib/atcoder_greedy/templates/cpp/solve.cpp

@@ -0,0 +1,17 @@
+/*
+ * Generated by AtcoderGreedy on DATE
+ * CONTEST PROBLEM
+ */
+
+#include <cstdio>
+
+using namespace std;
+
+void solve() {
+    // Your code here
+}
+
+int main(void) {
+    solve();
+    return 0;
+}

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

@@ -0,0 +1,3 @@
+# Generated by AtcoderGreedy on DATE
+# CONTEST PROBLEM
+# Your code here

data/lib/atcoder_greedy/version.rb

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

data/lib/atcoder_greedy.rb

@@ -1,9 +1,61 @@
 require 'open-uri'
 require 'nokogiri'
 require 'fileutils'
+require 'yaml'
+require 'psych'
 
 require "atcoder_greedy/version"
 require 'atcoder_greedy/command'
 
 module AtcoderGreedy
+  # Configuration defaults
+  @config = {
+      user_id: '',
+      password: '',
+      language: 'rb'
+  }
+
+  @valid_config_keys = @config.keys
+
+  # Configure through hash
+  def self.configure(opts = {})
+    opts.each { |k, v| @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym }
+  end
+
+  # Configure through yaml file
+  def self.configure_with(path_to_yaml_file)
+    begin
+      config = YAML::load(IO.read(path_to_yaml_file))
+    rescue Errno::ENOENT
+      puts "YAML configuration file couldn't be found. Using defaults."; return
+    rescue Psych::SyntaxError
+      puts "YAML configuration file contains invalid syntax. Using defaults."; return
+    end
+
+    configure(config)
+  end
+
+  def self.get_config_path
+    config_path = Dir.home + '/.atcoder_greedy'
+    if Dir.exists?(config_path)
+      # use user settings
+      config_path
+    else
+      # use default settings
+      File.join(File.dirname(__dir__), '/lib/atcoder_greedy')
+    end
+  end
+
+  def self.config
+    yml_path = get_config_path + '/settings.yml'
+    configure_with(yml_path)
+    @config
+  end
+
+  def self.save_config
+    yml_path = get_config_path + '/settings.yml'
+    f = File.open(yml_path, 'w')
+    f.print(@config.to_yaml)
+    f.close
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atcoder_greedy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - keigo-brook
@@ -103,9 +103,16 @@ files:
 - bin/setup
 - lib/atcoder_greedy.rb
 - lib/atcoder_greedy/command.rb
+- lib/atcoder_greedy/command/config.rb
 - lib/atcoder_greedy/command/create.rb
+- lib/atcoder_greedy/command/destroy.rb
 - lib/atcoder_greedy/command/test.rb
-- lib/atcoder_greedy/templates/ruby/solve.rb
+- lib/atcoder_greedy/lib/contest.rb
+- lib/atcoder_greedy/lib/languages.rb
+- lib/atcoder_greedy/lib/test_case.rb
+- lib/atcoder_greedy/settings.yml
+- lib/atcoder_greedy/templates/cpp/solve.cpp
+- lib/atcoder_greedy/templates/rb/solve.rb
 - lib/atcoder_greedy/version.rb
 homepage: https://github.com/keigo-brook/atcoder_greedy
 licenses:

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

@@ -1,2 +0,0 @@
-# CONTEST PROBLEM
-# Your code here