atcoder_greedy 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105272b2cb7e939a47af8dcdf2133f8b71342bf4
-  data.tar.gz: 2720cca358f94d5ee3f67d477353c91a4ade9d12
+  metadata.gz: c615d8f8d5392732a0823c7ca87250e7f85fb7eb
+  data.tar.gz: 0977f4aa39c014bd11a8b7621bcc72b5c183dc23
 SHA512:
-  metadata.gz: 7199153eb58e547d7d0e01e2d518fd9d0fa087088edd3f981566fddfc4690e32ad131a1cafe5ccfbc95e82110f35c863609b9f30ad892572efe786465a780258
-  data.tar.gz: ed9240b1d5ccf583f6b08cb7c830774d382de62ac66b7cbbcf7154bd24bde0c82e8d70b247527f19de11b2f87897b59ee291d5eb731a9d8262422a961d17fa3a
+  metadata.gz: d0550d84633c1740b05e459c324caec19fc15897d42066979360af402e2cf084a3f0b4d796a12cf1cc2ec98b1bccf1d51dd2c682e12fb4dbb5e31fb90d8af93b
+  data.tar.gz: 6a92836715a6a1633ce91aea0d99589667e4574035ea7458f9f36ce244692f878bb839b58991b38667c4a1c5cc472a3e803063d1d438f10fa7fd51fef634bece

data/README.md

@@ -1,6 +1,12 @@
 # AtcoderGreedy
-楽にatcoderを使いたい.
-毎回サンプルインプットをコピペするのめんどくさくないですか？
+楽にatcoderを使いたい. Atcoderで行われるコンテストにおいて, 自動でテンプレートやインプットを生成するGemです. 
+何かありましたらtwitter: @brook_bachまでお願いします. 
+
+## 実装した機能
+- コンテストフォルダ, 問題ファイルの生成
+- サンプルインプット、アウトプットを用いたテストファイルの生成, テスト実行
+- ユーザーテンプレート機能
+- ruby, c/c++ に対応
 
 ## Installation
 
@@ -11,7 +17,7 @@
 configコマンドを使用してデフォルト言語の設定をしてください。
 ```
 $ atcoder_greedy config
-Choose default language from: ["rb", "cpp"]
+Choose default language from: ["rb", "cpp", "c"]
 Input languages: cpp
 Update Your default language to [cpp].
 $ 
@@ -19,22 +25,50 @@ $
 
 ## Usage
 
-### テンプレートファイルの作成
+### Createコマンド
+コンテスト用のフォルダ, ファイルを作成します.
 ```
-$ atcoder_greedy create CONTESTNAME
+$ atcoder_greedy create CONTEST_URL OPTION
 ```
-
-### テストの実行
+作成時に使用できるオプション
+
+| option name ARGUMENT                         | alias | detail  |
+| ------------------------------------ | ----- | ------- |
+| --no-templates                       | --nt  | テンプレートファイルを生成しません. |
+| --no-input                           | --ni  | 入力ファイルを生成しません. |
+| --select-problem PROBLEM_NAMES       | -p    | 指定した問題のみ生成します. 複数の問題を指定する場合は'A B' のように''で囲ってください. |
+| --select-directory DIR_PATH          | -d    | 指定したディレクトリに生成します. |
+| --select-language LANGUAGE           | -l    | 指定した言語でテンプレートを生成します. |
+| --select-template TEMP_NAME          | -t    | 指定したテンプレートで生成します. |
+
+### testコマンド
+テストを実行します. 入力ファイルが生成されている必要があります.
 ```
 $ cd CONTESTNAME
 $ atcoder_greedy test PROBLEM_FILE_NAME
 ```
 
+### templateコマンド
+テンプレートの設定を行います. テンプレートは複数保存でき, 言語毎に一つデフォルトテンプレートを設定することができます.
+デフォルトに設定されたテンプレートは, createコマンドで作成するときに使用されます.
+```
+$ atcoder_greedy template OPTION
+```
+使用できるオプション
+
+| option name             | alias |  detail  |
+| ------------------------| ----- | -------  |
+| --add FILE_PATH         | -a    | FILE_PATHで指定されたファイルをテンプレートに追加します. |
+| --list                  | -l    | テンプレート一覧を表示します. |
+| --set-default FILE_NAME | -s    | FILE_NAMEで指定されたテンプレートをその言語のデフォルトに設定します. |
+| --delete FILE_NAME      | -d    | FILE_NAMEで指定されたテンプレートを削除します. |
+
 ## 使用例
-ABC009の場合
+### 例1
+ARC014の場合
 
 ```
-$ atcoder_greedy create abc009
+$ atcoder_greedy create http://arc014.contest.atcoder.jp
 ```
 
 とすると、以下のようなファイルが生成される。
@@ -82,21 +116,19 @@ Correct Answer:
 Test done.
 ```
 
-## 実装した機能
-- 解答ファイルのテンプレート生成
-- サンプルインプット、アウトプットを用いたテストファイルの生成
-- テスト実行コマンド
-- ruby, c++ に対応
+### 例2
+ARC015にて, カレントディレクトリにA問題のインプットファイルのみ生成したい場合
 
+```
+ $ atcoder_greedy create http://arc015.contest.atcoder.jp --nt -p A -d ./
+```
 
 ## TODO,実装したい機能
-- 問題を指定してその問題のみ生成
-- ユーザーテンプレート機能
+
 - 提出機能
 - 言語対応の拡大
 - gemのテスト作成
 
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -106,8 +138,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/atcoder_greedy. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/atcoder_greedy.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/atcoder_greedy.rb

@@ -2,7 +2,6 @@ require 'open-uri'
 require 'nokogiri'
 require 'fileutils'
 require 'yaml'
-require 'psych'
 
 require "atcoder_greedy/version"
 require 'atcoder_greedy/command'
@@ -12,50 +11,58 @@ module AtcoderGreedy
   @config = {
       user_id: '',
       password: '',
-      language: 'rb'
+      language: '',
+      default_template: {
+          rb: '',
+          cpp: '',
+          c: '',
+          py: ''
+      }
   }
 
+  @valid_languages = %w(rb cpp c py)
   @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
+    self.config
+    opts.each do |k, v|
+      if v.is_a?(Hash)
+        v.each do |ck, cv|
+          @config[k.to_sym][ck.to_sym] = cv if @valid_languages.include?(ck.to_s)
+        end
+      else
+        @config[k.to_sym] = v if @valid_config_keys.include? k.to_sym
+      end
     end
-
-    configure(config)
+    self.save_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')
+      raise "Can't find config directory. please init by command: 'atcoder_greedy config'.'"
     end
   end
 
   def self.config
     yml_path = get_config_path + '/settings.yml'
-    configure_with(yml_path)
-    @config
+    yml_file = YAML.load_file(yml_path)
+    if yml_file
+      @config = yml_file
+    else
+      File.open(yml_path, 'w') { |f| YAML.dump(@config, f) }
+    end
   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
+    if File.exists?(yml_path)
+      File.open(yml_path, 'w') { |f| YAML.dump(@config, f) }
+    else
+      raise "Can't find #{yml_path}. please set configure."
+    end
   end
 end

data/lib/atcoder_greedy/command.rb

@@ -4,6 +4,7 @@ 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'
 
 module AtcoderGreedy
   class Command < Thor

data/lib/atcoder_greedy/command/config.rb

@@ -12,7 +12,8 @@ module AtcoderGreedy
         puts "Your current language is [#{AtcoderGreedy.config[:language]}]."
       else
         Dir.mkdir(config_path)
-        File.new(config_path + '/settings.yml', 'w')
+        yml_path = AtcoderGreedy.get_config_path + '/settings.yml'
+        File.open(yml_path, 'w').close
       end
       puts "Choose default language from: #{languages}"
       print "Input languages: "
@@ -27,7 +28,6 @@ module AtcoderGreedy
         end
       end
 
-      AtcoderGreedy.save_config
       puts "Update Your default language to [#{AtcoderGreedy.config[:language]}]."
     end
   end

data/lib/atcoder_greedy/command/create.rb

@@ -4,10 +4,28 @@ require 'atcoder_greedy/lib/contest'
 
 module AtcoderGreedy
   class Command < Thor
-    desc 'create [CONTESTNAME]', 'create contest templates for [CONTESTNAME]'
+    desc 'create [CONTESTURL] [OPTION]', 'create contest templates for [CONTESTURL]'
+    option :no_templates, type: :boolean, default: false, aliases: "\--nt"
+    option :no_input, type: :boolean, default: false, aliases: "\--ni"
+    option :select_problem, aliases: '-p', default: nil, desc: 'create only select problem'
+    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'
 
-    def create(contest_name)
-      Contest.new(contest_name.downcase)
+    def create(contest_url)
+      user_options = {
+          without: {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[:problems] = options[:select_problem].split unless options[:select_problem].nil?
+
+      Contest.new(contest_url, user_options)
     end
   end
 end

data/lib/atcoder_greedy/command/template.rb

@@ -0,0 +1,26 @@
+require 'atcoder_greedy'
+require 'atcoder_greedy/command'
+require 'atcoder_greedy/lib/greedy_template'
+
+module AtcoderGreedy
+  class Command < Thor
+    desc 'template [OPTION]', 'set template'
+    option :add, aliases: '-a'
+    option :list, aliases: '-l'
+    option :set_default, aliases: '-s'
+    option :delete, aliases: '-d'
+    def template
+      temp = GreedyTemplate.new
+      if options[:add]
+        temp.add(options[:add])
+      elsif options[:list]
+        temp.list
+      elsif options[:set_default]
+        temp.set_default(options[:set_default])
+      elsif options[:delete]
+        temp.delete(options[:delete])
+      end
+    end
+  end
+end
+

data/lib/atcoder_greedy/lib/contest.rb

@@ -1,52 +1,66 @@
+require 'uri'
+require 'atcoder_greedy'
+require 'atcoder_greedy/lib/greedy_template'
+
 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 initialize(url, **options)
+    if options[:language] != ''
+      @language = options[:language]
+    else
+      @language = AtcoderGreedy.config[:language]
+    end
+    @url = url
+    set_contest_info(options[:problems])
+    set_directories(options[:directory])
+
+    create_inputs unless options[:without][:input]
+    create_templates(options[:template]) unless options[:without][:template]
 
-  def create_contest_url(contest_name)
-    'http://' + contest_name + '.contest.atcoder.jp'
+    puts 'Set up done. Go for it!'
   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)
+  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)
 
-    4.times do |i|
-      urls.push(name: "#{@problem_names[i]}", path: @base_url + "/tasks/#{contest_name}_#{task_num[i]}")
+    all_problems = nil
+    doc.xpath('//tbody').each do |tbody|
+      all_problems = tbody.xpath('.//a[@class="linkwrapper"]')
     end
-    urls
+
+    @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} "
+      end
+    end
+    puts 'Done!'
   end
 
-  def create_templates
-    @problem_urls.each_with_index do |url, pro_i|
-      problem_dir = "./#{@name}"
-      # urlからインプット、アウトプットパラメータをとってきてファイルにしまう
+  def create_inputs
+    print 'Create inputs ... '
+    @problems.each do |problem|
+      # take input and output params from url and save to file
       charset = nil
-      html = open(url[:path]) do |f|
+      html = open(@url + problem[: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')
+      in_file = File.new(@dir + "/input_#{problem[:name]}.txt", 'w')
 
       params = doc.xpath('//pre')
       params.shift
@@ -61,19 +75,53 @@ class Contest
       end
 
       in_file.close
+    end
+    puts 'Done!'
+  end
 
-      solve_file_content = @solve_template.clone
+  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
+        solve_template = open(File.dirname(__dir__) + '/templates' + "/#{@language}/solve.#{@language}", &:read)
+      end
+    else
+      # use option_template
+      template_path = GreedyTemplate.get_template_path(option_template)
+      if template_path.nil?
+        raise "ERROR: Template #{option_template} doesn't found"
+      else
+        solve_template = open(template_path, &:read)
+      end
+    end
+
+    @problems.each_with_index do |problem|
+      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_content.gsub!(/PROBLEM/, problem[:name])
+      solve_file = File.new(@dir + "/#{problem[:name]}.#{@language}", 'w')
       solve_file.print solve_file_content
       solve_file.close
     end
+    puts 'Done!'
   end
 
-  def create_directories
-    # コンテストディレクトリ作成
-    FileUtils.mkdir(@name)
+  def set_directories(directory)
+    print 'Set contest directory ... '
+    if directory == ''
+      FileUtils.mkdir(@name)
+      @dir = "./#{@name}"
+    else
+      if Dir.exists?(directory)
+        @dir = directory
+      else
+        raise "ERROR: Directory doesn't exists:#{@dir}"
+      end
+    end
+    puts 'Done!'
   end
-end
+end

data/lib/atcoder_greedy/lib/greedy_template.rb

@@ -0,0 +1,93 @@
+# require 'FileUtils'
+require 'atcoder_greedy'
+
+class GreedyTemplate
+  def initialize
+    @dir = AtcoderGreedy::get_config_path + '/templates'
+    Dir.mkdir(@dir) unless Dir.exists?(@dir)
+  end
+
+  def add(file_path)
+    # save template to language directory
+    file = File.open(file_path)
+    file_name = File.basename(file_path)
+    type_dir = @dir + '/' + File.extname(file_path).delete('.')
+    Dir.mkdir(type_dir) unless Dir.exists?(type_dir)
+    if File.exists?(type_dir + '/' + file_name)
+      print "Template [#{file_name}] is already exists. Do you update?[y/N]:"
+      s = $stdin.gets.chomp
+      if s == 'y' || s == 'yes'
+        FileUtils.cp(file, type_dir)
+        puts 'Template file is updated.'
+        puts "if you want to use this file as a default, please run 'atcoder_greedy template -s #{file_name}'"
+      end
+    else
+      FileUtils.cp(file, type_dir)
+      puts 'Template file is added.'
+      puts "if you want to use this file as a default, please run 'atcoder_greedy template -s #{file_name}'"
+    end
+  end
+
+  def list
+    puts "Show Template file lists. [d] is this language default. ---------------------"
+    Dir::glob(@dir + '/*').each do |l|
+      puts "#{File.basename(l)}:"
+      Dir::glob("#{l}/*").each do |f|
+        default = get_default(File.basename(l))
+        if default != nil && File.basename(f) == default
+          print '  [d] '
+        else
+          print '    - '
+        end
+        puts "#{File.basename(f)}"
+      end
+    end
+  end
+
+  def set_default(file_name)
+    type = File.extname(file_name).delete('.')
+    type_dir = @dir + '/' + type
+    file = type_dir + '/' + File.basename(file_name)
+    if File.exists?(file)
+      AtcoderGreedy.configure(default_template: {"#{type}": file})
+      puts 'Set new default template.'
+    else
+      puts "File [#{file_name}] doesn't exists. confirm input name."
+      self.list
+    end
+  end
+
+  def delete(file_name)
+    type = File.extname(file_name).delete('.')
+    type_dir = @dir + '/' + type
+    file = type_dir + '/' + File.basename(file_name)
+    if File.exists?(file)
+      print "Do you delete [#{file_name}]?[y/N]:"
+      s = $stdin.gets.chomp
+      if s == 'y' || s == 'yes'
+        if File.basename(file_name) == get_default(type)
+          AtcoderGreedy.configure(default_template: {"#{type}": ''})
+        end
+        FileUtils.remove_file(file)
+        puts 'Template file is deleted.'
+      end
+    else
+      puts "File [#{file_name}] doesn't exists. confirm input name."
+      self.list
+    end
+  end
+
+  def self.get_template_path(file_name)
+    type = File.extname(file_name).delete('.')
+    type_dir = AtcoderGreedy::get_config_path + '/templates' + '/' + type
+    file = type_dir + '/' + File.basename(file_name)
+    File.exists?(file) ? file : nil
+  end
+
+  private
+  def get_default(language)
+    unless AtcoderGreedy.config[:default_template][:"#{language}"].nil?
+      File.basename(AtcoderGreedy.config[:default_template][:"#{language}"])
+    end
+  end
+end

data/lib/atcoder_greedy/lib/test_case.rb

@@ -2,6 +2,7 @@ require 'diff/lcs'
 require 'tempfile'
 require 'benchmark'
 require 'atcoder_greedy/lib/languages'
+
 class TestCase
   def initialize(problem_name)
     language = File.extname(problem_name)

data/lib/atcoder_greedy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atcoder_greedy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - keigo-brook
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,8 +85,6 @@ email:
 - goog@brookbach.com
 executables:
 - atcoder_greedy
-- console
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -98,16 +96,18 @@ files:
 - README.md
 - Rakefile
 - atcoder_greedy.gemspec
-- bin/atcoder_greedy
 - bin/console
 - bin/setup
+- exe/atcoder_greedy
 - 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/template.rb
 - lib/atcoder_greedy/command/test.rb
 - lib/atcoder_greedy/lib/contest.rb
+- lib/atcoder_greedy/lib/greedy_template.rb
 - lib/atcoder_greedy/lib/languages.rb
 - lib/atcoder_greedy/lib/test_case.rb
 - lib/atcoder_greedy/settings.yml