git-contest 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmRhNmY5NTUwYzdlZDUzNGU3NzNhOWIzYjYwYWMzNjcxN2Y3MWY0NQ==
+    OGQzNWFlY2NkYTVhZjgzZTEwN2VjMWFjY2RiNjNkMTMyOGU5YWMzMQ==
   data.tar.gz: !binary |-
-    MDg1N2I0N2QzMDIxNTcyNGQyZWRhNGMyZjU5ZGU4OGM3M2U2MDgwNg==
+    NTZlM2EyYjMyYmVlODYzMjc2OTczNTFiOTYzODBhMzQyMjhiNTA0Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZWEzNzAwM2NkMjUzMTJkYzY4NDc0ZTM2MzQ5MGIyOTQ5OWEyZmNkOTRjMTVk
-    NDUyOWMzMTE5ZmQ2ZWJmZmJjYmZkOTcyOGM1ZDY4ODBmNmMxZmJiYzMyOWNi
-    NjY0ZmMzZGJkZDEzZWRiMDg3OTM3YWM4NGI1ZDIxYzdiNjNmYjc=
+    NGQwYjQyNzEzYjQxNTgwYzlhZjllMjBhMWY4ZTc2MTA0NjkxODIxOTE3NzVk
+    MjZlOTZkOWNjZDZhZTBlNGQwMTk4ZmQyNGNhMTAwMmRmMzg5YmEwNmYyZGI0
+    YWY1NDU2Nzg4YzBlNjcyMjc2ODI0MzIzYjhlMzBjYjMzZGQ1YWI=
   data.tar.gz: !binary |-
-    ODc1MGY0NzVlYjQyY2Q2OTk0MzA0NWQ3MTZkNjY0NmM5YzRiOWQxNDc4NzQ0
-    NzAwMDQ0NmRkYTI5OTRkYWYyMzQ5NzBjODI0ODdjNDE1NWRkMDg2ZGM1NTNh
-    YWMzZWJlMmVhZmVhM2U1NWFlOTcwZWQwZmRlZTgyNzRlM2Y4ODQ=
+    YTM3YzFhNjdkMzE3N2MxZTQyMGFhZGQ3MDNhZTdiNTUwMWIwOGRmZmU4ZjBm
+    ZGRmOTM0NTE5ZmIyYTRlNTk1YTcxNTM5YWFiZDAxNWU0N2ZjNDU5MjE2YTk3
+    MDkxZTEzNjFhYzlmODc2NTU3YWE4NThhYzAyZTNhZDQ3YjRmMzM=

data/bin/git-contest

@@ -20,13 +20,15 @@ def usage
   puts "  %-12s Start a new feature branch." % ["start"]
   puts "  %-12s Finish a feature branch." % ["finish"]
   puts "  %-12s Submit a solution." % ["submit"]
+  puts "  %-12s Show information (sites, drivers)." % ["list"]
+  puts "  %-12s Get/Set a config value." % ["config"]
   puts ""
   puts "Try 'git contest <subcommand> help' for details."
 end
 
 init
 
-sub_commands = %w(init start finish submit rebase)
+sub_commands = %w(init start finish submit rebase list config)
 global_opts = Trollop::options do
   version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
   stop_on sub_commands
@@ -34,7 +36,7 @@ end
 
 cmd = ARGV.shift
 case cmd
-when "init", "start", "finish", "submit", "rebase"
+when "init", "start", "finish", "submit", "rebase", "list", "config"
   load File.expand_path("../git-contest-#{cmd}", __FILE__)
 else
   usage

data/bin/git-contest-config

@@ -0,0 +1,254 @@
+#!/usr/bin/env ruby
+
+#
+# git-contest-config
+# https://github.com/sh19910711/git-contest
+#
+# Copyright (c) 2014 Hiroyuki Sano <sh19910711 at gmail.com>
+# Licensed under the MIT-License.
+#
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'git/contest/common'
+require 'trollop'
+require 'highline/import'
+require 'active_support/core_ext/hash'
+
+
+# Show Banner
+def usage
+  puts get_banner
+  return 0
+end
+
+def show_get_usage
+  res = ""
+  res += "usage: git contest config get [key]\n"
+  res += "\n"
+  res += "Example Usage:\n"
+  res += "  $ git contest config get key1\n"
+  res += "  $ git contest config get namespace1.key1\n"
+  res += "  $ git contest config get sites.some_judge.user\n"
+  res += " \n"
+  puts res
+end
+
+def show_set_usage
+  res = ""
+  res += "usage: git contest config set [key] <value>\n"
+  res += "\n"
+  res += "Example Usage:\n"
+  res += "  $ git contest config set key1 value1\n"
+  res += "    -> key1 = value1\n"
+  res += "  $ git contest config set key1\n"
+  res += "    -> set value from command-line\n"
+  res += "  $ git contest config set namespace1.key1 value1\n"
+  res += "  $ git contest config set sites.some_judge.user username\n"
+  res += " \n"
+  puts res
+end
+
+def show_site_usage
+  res = ""
+  res += "usage: git contest config site <type>\n"
+  res += "\n"
+  res += "Available types are:\n"
+  res += "  %-8s: add site\n" % "add"
+  res += " \n"
+  puts res
+end
+
+def show_site_add_usage
+  res = ""
+  res += "usage: git contest config site add <site-name>\n"
+  res += "\n"
+  res += "Example Usage:\n"
+  res += "  $ git contest config site add site1\n"
+  res += "  -> input information\n"
+  res += " \n"
+  puts res
+end
+
+def show_site_rm_usage
+  res = ""
+  res += "usage: git contest config site rm <site-name>\n"
+  res += "\n"
+  res += "Example Usage:\n"
+  res += "  $ git contest config site rm site1\n"
+  res += " \n"
+  puts res
+end
+
+# Get Banner Text
+def get_banner
+  res = ""
+  res += "usage: git contest config [type]\n"
+  res += "\n"
+  res += "Available types are:\n"
+  res += "  %-8s: set value\n" % "set"
+  res += "  %-8s: get value\n" % "get"
+  res += "  %-8s: set site info\n" % "site"
+  res += " \n"
+  return res
+end
+
+init
+
+sub_commands = %w(sites)
+$options = Trollop::options do
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
+  banner get_banner
+  stop_on sub_commands
+end
+
+type = ARGV.shift.to_s.strip
+
+case type
+
+when "site"
+  if ARGV.length >= 1
+    type = ARGV.shift.to_s.strip
+    case type
+    when "add"
+      # git-contest-config site add
+      if ARGV.length == 1
+        puts "# input site config (password will be hidden)"
+
+        # read info
+        site_name = ARGV.shift.to_s.strip
+        config = get_config
+
+        # init config
+        config["sites"][site_name] = {}
+
+        # input site info
+        # TODO: to check not found
+        config["sites"][site_name]["driver"] = ask("%10s > " % "driver").to_s
+        # TODO: to depend on above driver
+        config["sites"][site_name]["user"] = ask("%10s > " % "user id").to_s
+        config["sites"][site_name]["password"] = ask("%10s > " % "password") do |q|
+          q.echo = false
+        end.to_s
+
+        # set config
+        File.open($GIT_CONTEST_CONFIG, 'w') {|f| f.write config.to_yaml }
+        
+        puts ""
+        puts "updated successfully!!"
+        puts ""
+      else
+        show_site_add_usage
+      end
+
+    when "rm"
+      # git-contest-config site rm
+      if ARGV.length == 1
+        # TODO: to check not found
+        site_name = ARGV.shift.to_s.strip
+
+        puts "Are you sure you want to remove `#{site_name}`?"
+        this_is_yes = ask("when you remove the site, type `yes` > ").to_s
+
+        if this_is_yes == "yes"
+          # update config
+          config = get_config
+          config["sites"].delete site_name
+          # save config
+          File.open($GIT_CONTEST_CONFIG, 'w') {|f| f.write config.to_yaml }
+          puts ""
+          puts "updated successfully!!"
+          puts ""
+        else
+          puts ""
+          puts "operation cancelled"
+          puts ""
+        end
+      else
+        show_site_rm_usage
+      end
+
+    else
+      show_site_usage
+    end
+  else
+    show_site_usage
+  end
+
+when "get"
+  if ARGV.length == 1
+    # read key
+    config = get_config
+    cur = config
+    keys = ARGV.shift.to_s.strip.split('.')
+    while ! keys.empty?
+      key = keys.shift
+      if cur.has_key? key
+        cur = cur[key]
+      else
+        abort "ERROR: Not Found"
+      end
+    end
+    # output
+    if cur.is_a? Hash
+      puts "keys = #{cur.keys.join(', ')}"
+    else
+      puts cur
+    end
+  else
+    show_get_usage
+  end
+
+when "set"
+  if ARGV.length == 1
+    # read values
+    keys = ARGV.shift.to_s.strip.split('.')
+    puts "input value"
+    value = gets.strip
+
+    # update yaml value
+    config = get_config
+    new_config = {}
+    cur = new_config
+    while ! keys.empty?
+      key = keys.shift
+      if keys.empty?
+        cur[key] = value
+      else
+        cur[key] = {}
+        cur = cur[key]
+      end
+    end
+    config.deep_merge! new_config
+
+    # save file
+    File.open($GIT_CONTEST_CONFIG, 'w') {|f| f.write config.to_yaml }
+  elsif ARGV.length == 2
+    # read values from command args
+    keys = ARGV.shift.to_s.strip.split('.')
+    value = ARGV.shift.to_s.strip
+
+    # update yaml value
+    config = get_config
+    new_config = {}
+    cur = new_config
+    while ! keys.empty?
+      key = keys.shift
+      if keys.empty?
+        cur[key] = value
+      else
+        cur[key] = {}
+        cur = cur[key]
+      end
+    end
+    config.deep_merge! new_config
+
+    # save file
+    File.open($GIT_CONTEST_CONFIG, 'w') {|f| f.write config.to_yaml }
+  else
+    show_set_usage
+  end
+
+else
+  usage
+end
+

data/bin/git-contest-list

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+#
+# git-contest-list
+# https://github.com/sh19910711/git-contest
+#
+# Copyright (c) 2014 Hiroyuki Sano <sh19910711 at gmail.com>
+# Licensed under the MIT-License.
+#
+
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'git/contest/common'
+require 'trollop'
+
+# Show Banner
+def usage
+  puts get_banner
+  return 0
+end
+
+# Get Banner Text
+def get_banner
+  res = ""
+  res += "usage: git contest list <type>\n"
+  res += "\n"
+  res += "Available types are:\n"
+  res += "  %-8s: show sites\n" % "sites"
+  res += "  %-8s: show drivers\n" % "drivers"
+  res += " \n"
+  return res
+end
+
+init
+Contest::Driver::Utils.load_plugins
+
+$config = get_config() || {}
+$sites  = {}
+if $config.has_key? 'sites'
+  $sites = $config["sites"]
+end
+
+sub_commands = %w(sites drivers)
+$options = Trollop::options do
+  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
+  banner get_banner
+  stop_on sub_commands
+end
+
+type = ARGV.shift.to_s.strip
+
+case type
+when "drivers"
+  # show all drivers
+  puts "#"
+  puts "# Available Drivers"
+  puts "#"
+  puts ""
+  drivers = Contest::Driver::Utils.get_all_drivers
+  drivers.each {|driver_info|
+    puts "  #{driver_info[:class_name]}"
+    puts "    #{driver_info[:site_info][:desc]}"
+    puts ""
+  }
+when "sites"
+  # show all sites
+  $sites.keys.each do |site_name|
+    puts "# #{site_name}"
+    keys = ["driver", "user"]
+    keys.each {|key| puts "    %-8s: %s" % [ key, $sites[site_name][key] ] }
+    puts " \n"
+  end
+else
+  usage
+end
+

data/bin/git-contest-submit

@@ -12,16 +12,6 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'git/contest/common'
 require 'trollop'
 
-#
-# Load Plugins
-#
-def load_plugins
-  # load drivers
-  Dir.glob("#{$GIT_CONTEST_HOME}/plugins/**") do |path|
-    require path if /\/driver_.*\.rb$/.match path
-  end
-end
-
 #
 # Load Drivers
 #
@@ -31,7 +21,7 @@ def load_drivers
     class_name = driver_name.clone
     class_name.gsub!(/^[a-z]/) {|c| c.upcase }
     class_name.gsub!(/(_)([a-z])/) {|c, b| $2.upcase }
-    $drivers[driver_name] = Contest::Driver.const_get "#{class_name}"
+    $drivers[driver_name] = Contest::Driver.const_get "#{class_name}Driver"
   end
 end
 
@@ -75,7 +65,7 @@ if $config.has_key? 'sites'
   $sites = $config["sites"]
 end
 
-load_plugins
+Contest::Driver::Utils.load_plugins
 
 $drivers = {}
 load_drivers
@@ -192,6 +182,7 @@ driver.on(
 
 # global config
 $config["submit_rules"] ||= {}
+$config["file"] ||= {}
 
 # set config
 driver.config = $sites[site]

data/git-contest.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri"
   spec.add_dependency "trollop"
   spec.add_dependency "highline"
+  spec.add_dependency "active_support"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/contest/driver.rb

@@ -6,13 +6,13 @@
 #
 
 # http://judge.u-aizu.ac.jp/onlinejudge/
-require 'contest/driver/aizu_online_judge'
+require 'contest/driver/aizu_online_judge_driver'
 
 # http://codeforces.com/
-require 'contest/driver/codeforces'
+require 'contest/driver/codeforces_driver'
 
 # http://uva.onlinejudge.org/
-require 'contest/driver/uva_online_judge'
+require 'contest/driver/uva_online_judge_driver'
 
 # https://open.kattis.com/
-require 'contest/driver/kattis'
+require 'contest/driver/kattis_driver'

data/lib/contest/driver/{aizu_online_judge.rb → aizu_online_judge_driver.rb}

@@ -10,7 +10,7 @@ require 'rexml/document'
 
 module Contest
   module Driver
-    class AizuOnlineJudge < DriverBase
+    class AizuOnlineJudgeDriver < DriverBase
       def initialize_ext
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'

data/lib/contest/driver/base.rb

@@ -22,6 +22,7 @@ module Contest
         @options ||= {}
         # site config
         @config ||= {}
+        @config["file"] ||= {}
         @config["submit_rules"] ||= {}
         # call DriverEvent#initialize
         super
@@ -123,7 +124,11 @@ module Contest
         @options[:source] = Utils.resolve_path(
           @options[:source] || @config["submit_rules"]["source"] || DEFAULT_SOURCE_PATH
         )
-        @options[:language] ||= Utils.resolve_language(@options[:source])
+        if Utils.check_file_map(@options[:source], @config["file"]["ext"])
+          @options[:language] ||= Utils.resolve_file_map(@options[:source], @config["file"]["ext"])
+        else
+          @options[:language] ||= Utils.resolve_language(@options[:source])
+        end
         @options[:language] = resolve_language Utils.normalize_language(@options[:language])
 
         submit_ext()

data/lib/contest/driver/{codeforces.rb → codeforces_driver.rb}

@@ -9,7 +9,7 @@ require 'contest/driver/common'
 
 module Contest
   module Driver
-    class Codeforces < DriverBase
+    class CodeforcesDriver < DriverBase
       def initialize_ext
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'

data/lib/contest/driver/common.rb

@@ -13,6 +13,33 @@ require 'contest/driver/base'
 module Contest
   module Driver
     module Utils
+      # find all driver
+      def self.get_all_drivers
+        return [] unless defined? Contest::Driver
+        Contest::Driver.constants.select {|class_name|
+          /.*Driver$/ =~ class_name.to_s
+        }.map {|driver_class_name|
+          driver = Contest::Driver.const_get(driver_class_name).new
+          {
+            :class_name => driver_class_name,
+            :site_info => {
+              :name => driver.get_site_name(),
+              :desc => driver.get_desc(),
+            },
+          }
+        }
+      end
+
+      #
+      # Load Plugins
+      #
+      def self.load_plugins
+        # load drivers
+        Dir.glob("#{$GIT_CONTEST_HOME}/plugins/**") do |path|
+          require path if /\/.*_driver\.rb$/.match path
+        end
+      end
+
       def self.resolve_wild_card path
         `ls #{path} | cat | head -n 1`.strip
       end
@@ -41,6 +68,24 @@ module Contest
         end
       end
 
+      def self.get_file_ext filename
+        File.extname(filename)[1..-1]
+      end
+
+      def self.check_file_map label, ext_map
+        if ext_map.is_a? Hash
+          ext = get_file_ext(label)
+          ext_map.has_key?(ext)
+        else
+          false
+        end
+      end
+
+      def self.resolve_file_map label, ext_map
+        ext = get_file_ext(label)
+        ext_map[ext]
+      end
+
       def self.normalize_language label
         case label
         when "c", "C"

data/lib/contest/driver/{kattis.rb → kattis_driver.rb}

@@ -18,7 +18,7 @@ require 'contest/driver/common'
 
 module Contest
   module Driver
-    class Kattis < DriverBase
+    class KattisDriver < DriverBase
       def initialize_ext
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'

data/lib/contest/driver/{uva_online_judge.rb → uva_online_judge_driver.rb}

@@ -9,7 +9,7 @@ require 'contest/driver/common'
 
 module Contest
   module Driver
-    class UvaOnlineJudge < DriverBase
+    class UvaOnlineJudgeDriver < DriverBase
       def initialize_ext
         @client = Mechanize.new {|agent|
           agent.user_agent_alias = 'Windows IE 7'

data/lib/git/contest/version.rb

@@ -7,6 +7,6 @@
 
 module Git
   module Contest
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/spec/bin/t012_git_contest_list_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe "T012: git-contest-list" do
+  before do
+    ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/config.yml"
+    ENV['GIT_CONTEST_HOME'] = @temp_dir
+  end
+
+  context "git-contest-list sites" do
+    before do
+      # create config
+      File.open "#{@temp_dir}/config.yml", 'w' do |file|
+        file.write <<EOF
+sites:
+  test_site1:
+    driver: test_driver1
+    user: test_user1
+    password: test_password1
+  test_site2:
+    driver: test_driver2
+    user: test_user2
+    password: test_password2
+  test_site3:
+    driver: test_driver3
+    user: test_user3
+    password: test_password3
+EOF
+      end
+    end
+
+    it "should include site name" do
+      ret = bin_exec "list sites"
+      (1..3).each {|x| expect(ret).to include "test_site#{x}" }
+    end
+
+    it "should include user name" do
+      ret = bin_exec "list sites"
+      (1..3).each {|x| expect(ret).to include "test_user#{x}" }
+    end
+
+    it "should include driver name" do
+      ret = bin_exec "list sites"
+      (1..3).each {|x| expect(ret).to include "test_driver#{x}" }
+    end
+
+    it "should NOT include password" do
+      ret = bin_exec "list sites"
+      (1..3).each {|x| expect(ret).not_to include "test_password#{x}" }
+    end
+  end
+
+  context "git-contest-list drivers" do
+    before do
+      # prepare drivers
+      FileUtils.mkdir "#{@temp_dir}/plugins"
+      File.open "#{@temp_dir}/plugins/test01_driver.rb", "w" do |f|
+        f.write <<EOF
+module Contest
+  module Driver
+    class Test01Driver < DriverBase
+      def get_site_name
+        "test01_site_name"
+      end
+      def get_desc
+        "test01_desc"
+      end
+    end
+  end
+end
+EOF
+      end
+      File.open "#{@temp_dir}/plugins/test02_driver.rb", "w" do |f|
+        f.write <<EOF
+module Contest
+  module Driver
+    class Test02Driver < DriverBase
+      def get_site_name
+        "test02_site_name"
+      end
+      def get_desc
+        "test02_desc"
+      end
+    end
+  end
+end
+EOF
+      end
+    end
+
+    it "contains plugins" do
+      ret = bin_exec "list drivers"
+      expect(ret).to include "Test01Driver"
+      expect(ret).to include "test01_desc"
+      expect(ret).to include "Test02Driver"
+      expect(ret).to include "test02_desc"
+    end
+  end
+
+end

data/spec/bin/t013_git_contest_config_spec.rb

@@ -0,0 +1,149 @@
+require 'spec_helper'
+require 'yaml'
+
+describe "T013: git-contest-config" do
+  before do
+    ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/config.yml"
+  end
+
+  context "git contest config set" do
+    before(:each) do
+      # create config file
+      File.open "#{@temp_dir}/config.yml", 'w' do |file|
+        file.write <<EOF
+key1: value1
+sites:
+  test_site1:
+    driver: test_driver1
+    user: test_user1
+    password: test_password1
+EOF
+      end
+    end
+
+    it "git contest config set key value" do
+      bin_exec "config set key1 value2"
+      ret2 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret2["key1"]).to eq "value2"
+    end
+
+    it "git contest config set key (input from pipe)" do
+      bin_exec "config set key1", "value2"
+      ret2 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret2["key1"]).to eq "value2"
+    end
+
+    it "git contest config set sites.test_site1.driver test_driver2" do
+      bin_exec "config set sites.test_site1.driver test_driver2"
+      ret1 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret1["sites"]["test_site1"]["driver"]).to eq "test_driver2"
+    end
+  end
+
+  context "git contest config get" do
+    before(:each) do
+      # create config file
+      File.open "#{@temp_dir}/config.yml", 'w' do |file|
+        file.write <<EOF
+key1: value1
+sites:
+  test_site1:
+    driver: test_driver1
+    user: test_user1
+    password: test_password1
+EOF
+      end
+    end
+
+    it "git contest config get key1" do
+      ret = bin_exec "config get key1"
+      expect(ret.strip).to eq "value1"
+    end
+
+    it "git contest config get sites.test_site1.user" do
+      ret = bin_exec "config get sites.test_site1.user"
+      expect(ret.strip).to eq "test_user1"
+    end
+
+    it "return keys" do
+      ret = bin_exec "config get sites.test_site1"
+      expect(ret).to include "driver"
+      expect(ret).to include "user"
+      expect(ret).to include "password"
+      expect(ret).not_to include "test_driver1"
+      expect(ret).not_to include "test_user1"
+      expect(ret).not_to include "test_password1"
+    end
+
+    it "raise error: not found" do
+      ret = bin_exec("config get foo.bar")
+      expect(ret).to include "ERROR"
+    end
+  end
+
+  context "git contest config site add" do
+    before(:each) do
+      # create config
+      File.open "#{@temp_dir}/config.yml", "w" do |file|
+        file.write <<EOF
+sites:
+  test_site1:
+    driver: test_driver1
+    user: test_user1
+    password: test_password1
+EOF
+      end
+    end
+
+    it "add site" do
+      bin_exec "config site add test_site2", "test_driver2\ntest_user2\ntest_password2"
+      ret1 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret1["sites"]["test_site1"]["driver"]).to eq "test_driver1"
+      expect(ret1["sites"]["test_site1"]["user"]).to eq "test_user1"
+      expect(ret1["sites"]["test_site1"]["password"]).to eq "test_password1"
+      expect(ret1["sites"]["test_site2"]["driver"]).to eq "test_driver2"
+      expect(ret1["sites"]["test_site2"]["user"]).to eq "test_user2"
+      expect(ret1["sites"]["test_site2"]["password"]).to eq "test_password2"
+    end
+  end
+
+  context "git contest config site rm" do
+    before(:each) do
+      # create config
+      File.open "#{@temp_dir}/config.yml", "w" do |file|
+        file.write <<EOF
+sites:
+  test_site1:
+    driver: test_driver1
+    user: test_user1
+    password: test_password1
+  test_site2:
+    driver: test_driver2
+    user: test_user2
+    password: test_password2
+EOF
+      end
+    end
+
+    it "remove site: input yes" do
+      bin_exec "config site rm test_site1", "yes"
+      ret1 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret1["sites"]["test_site1"]).to be_nil
+      expect(ret1["sites"]["test_site2"]["driver"]).to eq "test_driver2"
+      expect(ret1["sites"]["test_site2"]["user"]).to eq "test_user2"
+      expect(ret1["sites"]["test_site2"]["password"]).to eq "test_password2"
+    end
+
+    it "remove site: input no" do
+      bin_exec "config site rm test_site1", "no"
+      ret1 = YAML.load_file "#{@temp_dir}/config.yml"
+      expect(ret1["sites"]["test_site1"]["driver"]).to eq "test_driver1"
+      expect(ret1["sites"]["test_site1"]["user"]).to eq "test_user1"
+      expect(ret1["sites"]["test_site1"]["password"]).to eq "test_password1"
+      expect(ret1["sites"]["test_site2"]["driver"]).to eq "test_driver2"
+      expect(ret1["sites"]["test_site2"]["user"]).to eq "test_user2"
+      expect(ret1["sites"]["test_site2"]["password"]).to eq "test_password2"
+    end
+  end
+
+end

data/spec/lib/contest/driver/t001_aizu_online_judge_spec.rb

@@ -1,11 +1,9 @@
 require 'spec_helper'
 
-require 'contest/driver/aizu_online_judge'
-
 describe "T001: AizuOnlineJudge Driver" do 
   before do
     # setup driver
-    @driver = Contest::Driver::AizuOnlineJudge.new
+    @driver = Contest::Driver::AizuOnlineJudgeDriver.new
     @driver.stub(:sleep).and_return(0)
     ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t001/config.yml')
     init

data/spec/lib/contest/driver/t002_codeforces_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
-require 'contest/driver/codeforces'
-
 describe "T002: Codeforces Driver" do
   before(:each) do
-    @driver = Contest::Driver::Codeforces.new
+    @driver = Contest::Driver::CodeforcesDriver.new
     @driver.stub(:sleep).and_return(0)
   end
 

data/spec/lib/contest/driver/t003_uva_online_judge_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
-require 'contest/driver/codeforces'
-
 describe "T003: UvaOnlineJudge Driver" do
   before(:each) do
-    @driver = Contest::Driver::UvaOnlineJudge.new
+    @driver = Contest::Driver::UvaOnlineJudgeDriver.new
     @driver.stub(:sleep).and_return(0)
   end
 

data/spec/lib/contest/driver/t010_kattis_spec.rb

@@ -1,9 +1,8 @@
 require "spec_helper"
-require "contest/driver/kattis"
 
 describe "T010: Kattis Driver" do 
   before do
-    @driver = Contest::Driver::Kattis.new
+    @driver = Contest::Driver::KattisDriver.new
     @driver.stub(:sleep).and_return(0)
   end
 

data/spec/lib/contest/driver/t011_utils_spec.rb

@@ -0,0 +1,96 @@
+require "spec_helper"
+require "contest/driver/common"
+
+describe "T011: Common" do
+  before do
+    ENV['GIT_CONTEST_HOME'] = @temp_dir
+    init
+  end
+
+  context "A001: Utils" do
+    context "check_file_map" do
+      it "test.cpp -> cpp11: normal" do
+        ret = Contest::Driver::Utils.check_file_map "test.cpp", {
+          "cpp" => "cpp11"
+        }
+        expect(ret).to eq true
+      end
+      it "test.cpp -> cpp11: no map" do
+        ret = Contest::Driver::Utils.check_file_map "test.cpp", {
+        }
+        expect(ret).to eq false
+      end
+      it "test.cpp -> cpp11: map is nil" do
+        ret = Contest::Driver::Utils.check_file_map "test.cpp", nil
+        expect(ret).to eq false
+      end
+      it "test.cpp: no map" do
+        ret = Contest::Driver::Utils.check_file_map "test.cpp", {
+          "py" => "python2"
+        }
+        expect(ret).to eq false
+      end
+      it "test.py: python2" do
+        ret = Contest::Driver::Utils.check_file_map "test.py", {
+          "py" => "python2"
+        }
+        expect(ret).to eq true
+      end
+    end
+
+    context "resolve_file_map" do
+      it "cpp -> cpp11" do
+        ret = Contest::Driver::Utils.resolve_file_map "test.cpp", {
+          "cpp" => "cpp11"
+        }
+        expect(ret).to eq "cpp11"
+      end
+    end
+
+    context "get_all_drivers" do
+      before(:each) do
+        FileUtils.mkdir "#{@temp_dir}/plugins"
+        File.open "#{@temp_dir}/plugins/test01_driver.rb", "w" do |f|
+          f.write <<EOF
+module Contest
+  module Driver
+    class Test01Driver < DriverBase
+      def get_site_name
+        "test01_site_name"
+      end
+      def get_desc
+        "test01_desc"
+      end
+    end
+  end
+end
+EOF
+        end
+        File.open "#{@temp_dir}/plugins/test02_driver.rb", "w" do |f|
+          f.write <<EOF
+module Contest
+  module Driver
+    class Test02Driver < DriverBase
+      def get_site_name
+        "test02_site_name"
+      end
+      def get_desc
+        "test02_desc"
+      end
+    end
+  end
+end
+EOF
+        end
+      end
+
+      it "contains plugins" do
+        Contest::Driver::Utils.load_plugins
+        ret1 = Contest::Driver::Utils.get_all_drivers.map {|driver| driver[:class_name] }
+        expect(ret1).to include :Test01Driver
+        expect(ret1).to include :Test02Driver
+      end
+    end
+  end
+end
+

data/spec/mock/default_config/plugins/{driver_dummy.rb → dummy_driver.rb}

@@ -3,7 +3,7 @@ require 'rexml/document'
 
 module Contest
   module Driver
-    class Dummy < DriverBase
+    class DummyDriver < DriverBase
       def get_opts_ext
         define_options do
           opt(

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'webmock'
+
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'git/contest/common'
+require 'contest/driver'
 
 module SpecHelpers
   def read_file path
@@ -31,9 +33,11 @@ module SpecHelpers
     ENV['GIT_CONTEST_DEBUG'] = 'ON'
   end
 
-  def bin_exec(args)
+  def bin_exec(args, input=nil)
     puts "Commmand: #{bin_path('git-contest')} #{args}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
-    ret = `#{bin_path('git-contest')} #{args} 2>&1`
+    pipe_cmd = ""
+    pipe_cmd = "printf \" #{input}\" | " unless input.nil?
+    ret = `#{pipe_cmd}#{bin_path('git-contest')} #{args} 2>&1`
     ret
   end
 

data/spec/t006_config_spec.rb

@@ -203,5 +203,67 @@ EOF
       end
     end
   end
+
+  context "A002: file" do
+    context "B001: ext" do
+      before do
+        File.open "test1.dummy", "w" do |f|
+          f.write "wa-code"
+        end
+        File.open "test2.cpp", "w" do |f|
+          f.write "wa-code"
+        end
+      end
+
+      it "dummy -> c++11" do
+        set_git_contest_config <<EOF
+file:
+  ext:
+    dummy: c++11
+sites:
+  test_dummy:
+    driver: dummy
+    user: dummy
+    password: dummy
+EOF
+        
+        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test1.dummy"
+        expect(ret1).not_to include "unknown language"
+      end
+
+      it "cpp -> dummy" do
+        set_git_contest_config <<EOF
+file:
+  ext:
+    cpp: dummy
+sites:
+  test_dummy:
+    driver: dummy
+    user: dummy
+    password: dummy
+EOF
+        
+        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test2.cpp"
+        expect(ret1).to include "unknown language"
+      end
+
+      it "cpp -> cpp11" do
+        set_git_contest_config <<EOF
+file:
+  ext:
+    cpp: dummy
+sites:
+  test_dummy:
+    driver: dummy
+    user: dummy
+    password: dummy
+EOF
+        
+        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test2.cpp"
+        expect(ret1).to include "unknown language"
+      end
+    end
+  end
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-contest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroyuki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -141,8 +155,10 @@ email:
 - sh19910711@gmail.com
 executables:
 - git-contest
+- git-contest-config
 - git-contest-finish
 - git-contest-init
+- git-contest-list
 - git-contest-rebase
 - git-contest-start
 - git-contest-submit
@@ -157,20 +173,22 @@ files:
 - README.md
 - Rakefile
 - bin/git-contest
+- bin/git-contest-config
 - bin/git-contest-finish
 - bin/git-contest-init
+- bin/git-contest-list
 - bin/git-contest-rebase
 - bin/git-contest-start
 - bin/git-contest-submit
 - git-contest.gemspec
 - lib/contest/driver.rb
-- lib/contest/driver/aizu_online_judge.rb
+- lib/contest/driver/aizu_online_judge_driver.rb
 - lib/contest/driver/base.rb
-- lib/contest/driver/codeforces.rb
+- lib/contest/driver/codeforces_driver.rb
 - lib/contest/driver/common.rb
 - lib/contest/driver/driver_event.rb
-- lib/contest/driver/kattis.rb
-- lib/contest/driver/uva_online_judge.rb
+- lib/contest/driver/kattis_driver.rb
+- lib/contest/driver/uva_online_judge_driver.rb
 - lib/git/contest.rb
 - lib/git/contest/common.rb
 - lib/git/contest/git.rb
@@ -181,12 +199,15 @@ files:
 - spec/bin/t007_git_contest_start_spec.rb
 - spec/bin/t008_git_contest_finish_spec.rb
 - spec/bin/t009_git_contest_init_spec.rb
+- spec/bin/t012_git_contest_list_spec.rb
+- spec/bin/t013_git_contest_config_spec.rb
 - spec/lib/contest/driver/t001_aizu_online_judge_spec.rb
 - spec/lib/contest/driver/t002_codeforces_spec.rb
 - spec/lib/contest/driver/t003_uva_online_judge_spec.rb
 - spec/lib/contest/driver/t010_kattis_spec.rb
+- spec/lib/contest/driver/t011_utils_spec.rb
 - spec/mock/default_config/config.yml
-- spec/mock/default_config/plugins/driver_dummy.rb
+- spec/mock/default_config/plugins/dummy_driver.rb
 - spec/mock/t001/002.status_log.xml
 - spec/mock/t001/config.yml
 - spec/mock/t001/description.html
@@ -243,12 +264,15 @@ test_files:
 - spec/bin/t007_git_contest_start_spec.rb
 - spec/bin/t008_git_contest_finish_spec.rb
 - spec/bin/t009_git_contest_init_spec.rb
+- spec/bin/t012_git_contest_list_spec.rb
+- spec/bin/t013_git_contest_config_spec.rb
 - spec/lib/contest/driver/t001_aizu_online_judge_spec.rb
 - spec/lib/contest/driver/t002_codeforces_spec.rb
 - spec/lib/contest/driver/t003_uva_online_judge_spec.rb
 - spec/lib/contest/driver/t010_kattis_spec.rb
+- spec/lib/contest/driver/t011_utils_spec.rb
 - spec/mock/default_config/config.yml
-- spec/mock/default_config/plugins/driver_dummy.rb
+- spec/mock/default_config/plugins/dummy_driver.rb
 - spec/mock/t001/002.status_log.xml
 - spec/mock/t001/config.yml
 - spec/mock/t001/description.html