git-contest 0.2.4 → 0.2.5

data/spec/{lib/contest/driver → contest_driver}/t001_aizu_online_judge_spec.rb

@@ -4,7 +4,7 @@ describe "T001: AizuOnlineJudge Driver" do
   before do
     # setup driver
     @driver = Contest::Driver::AizuOnlineJudgeDriver.new
-    @driver.stub(:sleep).and_return(0)
+    allow(@driver).to receive(:sleep).and_return(0)
     ENV['GIT_CONTEST_CONFIG'] = get_path('/mock/t001/config.yml')
     init
 

data/spec/{lib/contest/driver → contest_driver}/t002_codeforces_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "T002: Codeforces Driver" do
   before(:each) do
     @driver = Contest::Driver::CodeforcesDriver.new
-    @driver.stub(:sleep).and_return(0)
+    allow(@driver).to receive(:sleep).and_return(0)
   end
 
   context "A001: #get_status_wait" do

data/spec/{lib/contest/driver → contest_driver}/t003_uva_online_judge_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "T003: UvaOnlineJudge Driver" do
   before(:each) do
     @driver = Contest::Driver::UvaOnlineJudgeDriver.new
-    @driver.stub(:sleep).and_return(0)
+    allow(@driver).to receive(:sleep).and_return(0)
   end
 
   context "A001: #get_submission_id" do

data/spec/{lib/contest/driver → contest_driver}/t010_kattis_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "T010: Kattis Driver" do
   before do
     @driver = Contest::Driver::KattisDriver.new
-    @driver.stub(:sleep).and_return(0)
+    allow(@driver).to receive(:sleep).and_return(0)
   end
 
   context "A001: #get_submission_id" do

data/spec/spec_helper.rb

@@ -1,6 +1,14 @@
+require "bundler/setup"
+
+if ENV['TRAVIS'] === "true"
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
 require 'webmock'
 
 $:.unshift File.expand_path('../../lib', __FILE__)
+require "git/contest/command_line"
 require 'git/contest/common'
 require 'contest/driver'
 
@@ -10,7 +18,7 @@ module SpecHelpers
   end
 
   def get_path path
-    File.expand_path(File.dirname(__FILE__) + path)
+    File.expand_path(File.join File.dirname(__FILE__), path)
   end
 
   def bin_path path
@@ -33,14 +41,6 @@ module SpecHelpers
     ENV['GIT_CONTEST_DEBUG'] = 'ON'
   end
 
-  def bin_exec(args, input=nil)
-    puts "Commmand: #{bin_path('git-contest')} #{args}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
-    pipe_cmd = ""
-    pipe_cmd = "printf \" #{input}\" | " unless input.nil?
-    ret = `#{pipe_cmd}#{bin_path('git-contest')} #{args} 2>&1`
-    ret
-  end
-
   def set_git_contest_config(body)
     ENV['GIT_CONTEST_CONFIG'] = "#{@temp_dir}/home/config.yml"
     File.open ENV['GIT_CONTEST_CONFIG'], "w" do |file|
@@ -52,12 +52,18 @@ end
 RSpec.configure do |config|
   config.include SpecHelpers
   config.before :each do
-    WebMock.disable_net_connect!
-    @temp_dir = `mktemp -d /tmp/XXXXXXXXXXXXX`.strip
-    Dir.chdir "#{@temp_dir}"
+    WebMock.disable_net_connect!(:allow => "codeclimate.com")
+    @temp_dir = Dir.mktmpdir
+    Dir.chdir @temp_dir
     Dir.mkdir "home"
     init_env
   end
+  config.before :suite do
+    $saved_pwd = FileUtils.pwd
+  end
+  config.after :suite do
+    FileUtils.cd $saved_pwd
+  end
   config.order = 'random'
 end
 

data/spec/t006_config_spec.rb

@@ -1,13 +1,22 @@
 require "spec_helper"
 
 describe "T006: Config Test" do 
+
+  def call_main(args)
+    cli = CommandLine::MainCommand.new(args)
+    cli.init
+    cli
+  end
+
   context "A001: submit_rules" do
+
     context "B001: commit_message" do
+
       before do
         File.open "main.d", "w" do |file|
           file.write "ac-code"
         end
-        bin_exec "init --defaults"
+        expect { call_main(["init", "--defaults"]).run }.to output(/.*/).to_stdout
       end
 
       it "001: ${site} ${problem-id}: ${status}" do
@@ -20,8 +29,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "log --oneline"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Dummy 100A: Accepted'
       end
 
@@ -35,8 +44,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "log --oneline"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Dummy-100A-Accepted'
       end
 
@@ -50,8 +59,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "log --oneline"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Accepted-Dummy'
       end
 
@@ -68,7 +77,7 @@ EOF
         File.open "tle.go", "w" do |file|
           file.write "tle-code"
         end
-        bin_exec "init --defaults"
+        expect { call_main(["init", "--defaults"]).run }.to output(/.*/).to_stdout
       end
 
       it "001: ac.*" do
@@ -81,12 +90,12 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
 
-        ret1 = git_do "log --oneline"
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Dummy 100A: Accepted'
 
-        ret_ls1 = git_do "ls-files"
+        ret_ls1 = Git.do "ls-files"
         expect(ret_ls1).to include 'ac.cpp'
       end
 
@@ -100,12 +109,12 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
 
-        ret1 = git_do "log --oneline"
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Dummy 100A: Wrong Answer'
 
-        ret_ls1 = git_do "ls-files"
+        ret_ls1 = Git.do "ls-files"
         expect(ret_ls1).to include 'wa.d'
       end
 
@@ -119,11 +128,11 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "log --oneline"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "log --oneline"
         expect(ret1).to include 'Dummy 100A: Time Limit Exceeded'
 
-        ret_ls1 = git_do "ls-files"
+        ret_ls1 = Git.do "ls-files"
         expect(ret_ls1).to include 'tle.go'
       end
     end
@@ -142,7 +151,7 @@ EOF
         File.open "input2.txt", "w" do |file|
           file.write "test2"
         end
-        bin_exec "init --defaults"
+        expect { call_main(["init", "--defaults"]).run }.to output(/.*/).to_stdout
       end
 
       it "001: test*.cpp input1.txt" do
@@ -156,8 +165,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "ls-files"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "ls-files"
         expect(ret1).to include "test1.cpp"
         expect(ret1).to include "input1.txt"
         expect(ret1).not_to include "test2.c"
@@ -175,8 +184,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "ls-files"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "ls-files"
         expect(ret1).not_to include "test1.cpp"
         expect(ret1).not_to include "input1.txt"
         expect(ret1).to include "test2.c"
@@ -194,8 +203,8 @@ sites:
     user:     dummy
     password: dummy
 EOF
-        bin_exec "submit test_dummy -c 100 -p A"
-        ret1 = git_do "ls-files"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A"]).run }.to output(/.*/).to_stdout
+        ret1 = Git.do "ls-files"
         expect(ret1).to include "test1.cpp"
         expect(ret1).to include "input1.txt"
         expect(ret1).to include "test2.c"
@@ -227,8 +236,7 @@ sites:
     password: dummy
 EOF
         
-        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test1.dummy"
-        expect(ret1).not_to include "unknown language"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A", "-s", "test1.dummy"]).run }.to_not output(/unknown language/).to_stdout
       end
 
       it "cpp -> dummy" do
@@ -243,15 +251,14 @@ sites:
     password: dummy
 EOF
         
-        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test2.cpp"
-        expect(ret1).to include "unknown language"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A", "-s", "test2.cpp"]).run }.to output(/unknown language/).to_stderr.and raise_error SystemExit
       end
 
       it "cpp -> cpp11" do
         set_git_contest_config <<EOF
 file:
   ext:
-    cpp: dummy
+    cpp: cpp11
 sites:
   test_dummy:
     driver: dummy
@@ -259,8 +266,7 @@ sites:
     password: dummy
 EOF
         
-        ret1 = bin_exec "submit test_dummy -c 100 -p A -s test2.cpp"
-        expect(ret1).to include "unknown language"
+        expect { call_main(["submit", "test_dummy", "-c", "100", "-p", "A", "-s", "test2.cpp"]).run }.to output(/unknown language/).to_stderr.and raise_error SystemExit
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-contest
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Hiroyuki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -84,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Git Extension for online judges (Codeforces, etc...)
 email:
 - sh19910711@gmail.com
@@ -172,6 +186,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/git-contest
 - bin/git-contest-config
 - bin/git-contest-finish
@@ -190,22 +205,33 @@ files:
 - lib/contest/driver/kattis_driver.rb
 - lib/contest/driver/uva_online_judge_driver.rb
 - lib/git/contest.rb
+- lib/git/contest/command_line.rb
+- lib/git/contest/command_line/command.rb
+- lib/git/contest/command_line/main_command.rb
+- lib/git/contest/command_line/sub_commands.rb
+- lib/git/contest/command_line/sub_commands/config_command.rb
+- lib/git/contest/command_line/sub_commands/finish_command.rb
+- lib/git/contest/command_line/sub_commands/init_command.rb
+- lib/git/contest/command_line/sub_commands/list_command.rb
+- lib/git/contest/command_line/sub_commands/rebase_command.rb
+- lib/git/contest/command_line/sub_commands/start_command.rb
+- lib/git/contest/command_line/sub_commands/submit_command.rb
 - lib/git/contest/common.rb
 - lib/git/contest/git.rb
 - lib/git/contest/test.rb
 - lib/git/contest/version.rb
-- spec/bin/t004_git_contest_submit_spec.rb
-- spec/bin/t005_git_contest_branching_spec.rb
-- 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/command/t004_git_contest_submit_spec.rb
+- spec/command/t005_git_contest_branching_spec.rb
+- spec/command/t007_git_contest_start_spec.rb
+- spec/command/t008_git_contest_finish_spec.rb
+- spec/command/t009_git_contest_init_spec.rb
+- spec/command/t012_git_contest_list_spec.rb
+- spec/command/t013_git_contest_config_spec.rb
+- spec/contest_driver/t001_aizu_online_judge_spec.rb
+- spec/contest_driver/t002_codeforces_spec.rb
+- spec/contest_driver/t003_uva_online_judge_spec.rb
+- spec/contest_driver/t010_kattis_spec.rb
+- spec/contest_driver/t011_utils_spec.rb
 - spec/mock/default_config/config.yml
 - spec/mock/default_config/plugins/dummy_driver.rb
 - spec/mock/t001/002.status_log.xml
@@ -233,7 +259,6 @@ files:
 - spec/mock/t010/user_submission_222222.html
 - spec/mock/t010/user_submissions.html
 - spec/spec_helper.rb
-- spec/spec_list.txt
 - spec/t006_config_spec.rb
 homepage: https://github.com/sh19910711/git-contest
 licenses:
@@ -255,23 +280,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The Git Extension for online judges (Codeforces, etc...)
 test_files:
-- spec/bin/t004_git_contest_submit_spec.rb
-- spec/bin/t005_git_contest_branching_spec.rb
-- 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/command/t004_git_contest_submit_spec.rb
+- spec/command/t005_git_contest_branching_spec.rb
+- spec/command/t007_git_contest_start_spec.rb
+- spec/command/t008_git_contest_finish_spec.rb
+- spec/command/t009_git_contest_init_spec.rb
+- spec/command/t012_git_contest_list_spec.rb
+- spec/command/t013_git_contest_config_spec.rb
+- spec/contest_driver/t001_aizu_online_judge_spec.rb
+- spec/contest_driver/t002_codeforces_spec.rb
+- spec/contest_driver/t003_uva_online_judge_spec.rb
+- spec/contest_driver/t010_kattis_spec.rb
+- spec/contest_driver/t011_utils_spec.rb
 - spec/mock/default_config/config.yml
 - spec/mock/default_config/plugins/dummy_driver.rb
 - spec/mock/t001/002.status_log.xml
@@ -299,5 +324,4 @@ test_files:
 - spec/mock/t010/user_submission_222222.html
 - spec/mock/t010/user_submissions.html
 - spec/spec_helper.rb
-- spec/spec_list.txt
 - spec/t006_config_spec.rb