git-contest 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjcwYjUzOGYzYzkwYWEzYjRlMzlkYTk3YTQ0ZTA5OTEzNzBjMDljOQ==
+    ODQ5ZTNkNDU1NGQ2ZDRjMzNmZGFiMDA4MGRjZWZhOTAyOWMxY2IzNA==
   data.tar.gz: !binary |-
-    YmNlNzBkZDBjNWUzZTgyMzMzMDI0ZGVkZDM1MjhjNTE5MGVjYmZlZg==
+    N2IxY2NlNTE3YzM4ZTZkODczNGVkY2ZkMjgzZmZlN2Q4ZjQ3N2EyZg==
 SHA512:
   metadata.gz: !binary |-
-    NDgyZDYxODAyZWVjMDdjZTY0OTJiODQxMDlhZWRhYjRiZDgyMGRjMTE5N2I3
-    ZDA2ZGZlZTU1N2JiNTg0ZTQ3OTk0NzhlYmQ0YWFhNzQxYjI4MWY1MGNmODBh
-    OGZhYmNkNGUwZGNjNTg1Nzc4YjJkZTY4ZTI0ZDU2ZDgwZGY3ZmU=
+    OTc0NzdjODQ1Y2YxZWE4MDQ4OGUxOWZlNzU1NDVhYTE4OTAwNTU4MzlmMThl
+    NDY5Nzg2MDIzY2M0OWIxNTA4MTE0YTZhNTVjZWQwMDE3NmE5NDQzNDU0MjVj
+    YTU3YmY3NGQxNzE2ZGI1ZWRmZjRlMGE1MTU4YjhjYzM4MDNmNWU=
   data.tar.gz: !binary |-
-    NzQ3MDMxOTc2NGQ2MGRkMjNkM2ViMGMwYWYzZTZkYTczYmIzYjc2Mjc2Nzk3
-    ZmEyNjg4ZjlmNGE4YWYyYjhmYmU1NmQ3N2Q3MDcwMjJiNWIzMWM4YTcxYmY0
-    YThlODI3M2I5NTYxZDNiODE5OGQxZDE2M2Y2MjFiM2Q3MDFkYTU=
+    YmViMThlMmExYmI5ZTY1Zjc3MGI0ZDJiNTQ4ZTMyNDdkYzY2NWY5Nzc3Njcy
+    M2ViODNjMWMzNTkzNzQwY2RjZWIyYmQwYmZjNTJkNzUzNDNiN2IxNTI4Zjk2
+    YTkzNWNhZmY1ZGJiOGM5M2I0NzE5NDRhNGM0YjMzOWI4NzJhZDk=

data/.travis.yml

@@ -1,27 +1,45 @@
 language: ruby
 
 rvm:
+  - "2.2"
   - "2.1"
   - "2.0"
   - "1.9"
 
+sudo: false
+
 before_install:
   - git config --global user.email "dummy@localhost"
   - git config --global user.name "This Is Dummyyy"
 
 install:
-  - export NOKOGIRI_USE_SYSTEM_LIBRARIES="YES"
-  - travis_retry bundle install --jobs=3
+  - bundle config build.nokogiri --use-system-libraries
+  - travis_retry bundle install --jobs 4 --path vendor/bundle
   - bundle exec rake install
 
 script:
   - bundle exec rake spec
 
+cache:
+  directories:
+    - vendor/bundle
+
 deploy:
   provider: rubygems
   api_key:
     master:
-      secure: "LjL6NrPR/KdkSKgUgixtsWiPH7LZrgZrMG9d66G0CY1HLDUXOY17W7HyAP0PYFVLVrJDM7CRx66PSuadYtyuIY1s0iM5hpEA81MlenxZQoApGcbJb2Zd647SPNk4NM+mZCRt9xJyRqrvHHg1d5+4pQVSHl/lGvuQRGXrYXocGLg="
+      secure: LjL6NrPR/KdkSKgUgixtsWiPH7LZrgZrMG9d66G0CY1HLDUXOY17W7HyAP0PYFVLVrJDM7CRx66PSuadYtyuIY1s0iM5hpEA81MlenxZQoApGcbJb2Zd647SPNk4NM+mZCRt9xJyRqrvHHg1d5+4pQVSHl/lGvuQRGXrYXocGLg=
   gem:
     master: git-contest
 
+notifications:
+  slack:
+    secure: I9NClP5cpphb55oc1n7rNEUyxDIKbVBl2F2BrHOsnvWgAYKtNv//rEtkenwouEfXLeKc8UrmM4WhM6JbT04QbHnsxZzMpUJp4du/r/8SoTWpBRN/TKYKsbUCMWp0PHYN5G/cgVrnRm1zbSaxjliMgUhNiZDBPUP9bEA5XvuAVNY=
+
+  webhooks:
+    urls:
+      # gitter
+      secure: "HR3uIFiN/vzmXFnUJLa2ie7dQcaZw4zOXqULyQqHewGSU/nrwHNCchWSWFJJOLlRtqcxWnOrDm4V9eTXgCqLLpCn10xrAqHRfZ8ZusO+2dc3RyCz6yc+ftwil9NK3RkZ7/J/T0ox1ElE6ARzqMtVQ9nJp309Xsh0zCLjDN7LBB8="
+    on_success: always # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: true # default: false

data/README.md

@@ -3,6 +3,9 @@
 
 [![Gem Version](https://badge.fury.io/rb/git-contest.png)](http://badge.fury.io/rb/git-contest)
 [![Build Status](https://travis-ci.org/sh19910711/git-contest.png?branch=develop)](https://travis-ci.org/sh19910711/git-contest)
+[![Code Climate](https://codeclimate.com/github/sh19910711/git-contest/badges/gpa.svg)](https://codeclimate.com/github/sh19910711/git-contest)
+[![Test Coverage](https://codeclimate.com/github/sh19910711/git-contest/badges/coverage.svg)](https://codeclimate.com/github/sh19910711/git-contest)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/sh19910711/git-contest?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Currently support the following online judges:
 
@@ -199,6 +202,8 @@ to be written here.
     * Added Kattis Driver
 * [Wei Jianwen](https://github.com/weijianwen)
     * Fixed gem dependency
+* [takuti](https://github.com/takuti)
+    * Fixed for python support in AOJ Driver
 
 ## License Information
 **git-contest** is licensed under the MIT-License, see details followings:

data/Rakefile

@@ -2,3 +2,11 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
+
+RSpec::Core::RakeTask.new(:spec_current) do |t|
+  t.rspec_opts = [
+    "--format documentation",
+    "--color",
+    "--tag current",
+  ]
+end

data/appveyor.yml

@@ -0,0 +1,21 @@
+version: "{build}"
+
+environment:
+  matrix:
+    - ruby_version: "21"
+    - ruby_version: "200"
+    - ruby_version: "193"
+
+cache:
+  - vendor/bundle
+
+install:
+  - cmd: git config --global user.email "dummy@localhost"
+  - cmd: git config --global user.name "This Is Dummyyy"
+  - cmd: bundle install --path vendor/bundle
+
+test_script:
+  - cmd: bundle exec rake spec
+
+build: "off"
+

data/bin/git-contest

@@ -8,38 +8,9 @@
 # Licensed under the MIT-License.
 #
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'git/contest/common'
-require 'trollop'
-
-def usage
-  puts "usage: git contest <subcommand>"
-  puts ""
-  puts "Available subcommands are:"
-  puts "  %-12s Initialize a new git repo." % ["init"]
-  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 list config)
-global_opts = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  stop_on sub_commands
-end
-
-cmd = ARGV.shift
-case cmd
-when "init", "start", "finish", "submit", "rebase", "list", "config"
-  load File.expand_path("../git-contest-#{cmd}", __FILE__)
-else
-  usage
-end
+require_relative "../lib/git/contest/command_line"
 
+cli = CommandLine::MainCommand.new(ARGV)
+cli.init
+cli.run
 

data/bin/git-contest-config

@@ -8,247 +8,10 @@
 # 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'
+require_relative "../lib/git/contest/command_line"
 
+cli = CommandLine::SubCommands::ConfigCommand.new ARGV
+cli.init
+cli.run
 
-# 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-finish

@@ -8,156 +8,9 @@
 # Licensed under the MIT-License.
 #
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'git/contest/common'
-require 'trollop'
+require_relative "../lib/git/contest/command_line"
 
-def use_current_branch
-  current_branch = git_current_branch
-  if current_branch.start_with? $PREFIX
-    $BRANCH = current_branch.strip
-    $NAME = $BRANCH[$PREFIX.length+1..-1]
-  else
-    puts "The current HEAD is no feature branch."
-    puts "Please spefcify a <name> argument."
-    abort ''
-  end
-end
-
-def expand_contest_branch
-  if ARGV.length == 0
-    use_current_branch
-  else
-    $NAME = ARGV[0]
-    $BRANCH = "#{$PREFIX}/#{$NAME}"
-    require_branch $BRANCH
-  end
-end
-
-def helper_finish_cleanup
-  require_branch $BRANCH
-  require_clean_working_tree
-
-  if $options[:fetch]
-    git_do "push \"#{$ORIGIN}\" \":refs/heads/#{$BRANCH}\""
-  end
-
-  if ! $options[:keep]
-    if $options[:force_delete]
-      git_do "branch -D #{$BRANCH}"
-    else
-      git_do "branch -d #{$BRANCH}"
-    end
-  end
-
-  puts ""
-  puts "Summary of actions:"
-  puts "- The contest branch \"#{$BRANCH}\" was merged into \"#{$MASTER}\""
-  puts "- Contest branch \"#{$BRANCH}\" has been removed"
-  puts "- You are now on branch \"#{$MASTER}\""
-  puts ""
-end
-
-init
-
-sub_commands = %w()
-$options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  opt(
-    :no_edit,
-    "Use default commit message.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :keep,
-    "Keep contest branch after merge.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :rebase,
-    "Use rebase instead of merge.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :force_delete,
-    "Force delete contest branch after finish.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :squash,
-    "Use squash during merge.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :fetch,
-    "Fetch from origin before finish.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  stop_on sub_commands
-end
-
-expand_contest_branch()
-require_branch $BRANCH
-
-require_clean_working_tree
-
-if git_remote_branches().include?("#{$ORIGIN}/#{$BRANCH}")
-  if $options[:fetch]
-    git_do "fetch -q \"#{$ORIGIN}\" \"#{$BRANCH}\""
-    git_do "fetch -q \"#{$ORIGIN}\" \"#{$MASTER}\""
-  end
-end
-
-if git_remote_branches().include?("#{$ORIGIN}/#{$BRANCH}")
-  require_branches_equal $BRANCH, "#{$ORIGIN}/#{$BRANCH}"
-end
-
-if git_remote_branches().include?("#{$ORIGIN}/#{$MASTER}")
-  require_branches_equal $MASTER, "#{$ORIGIN}/#{$MASTER}"
-end
-
-merge_options = ""
-if $options[:no_edit]
-  merge_options += " --no-edit"
-end
-
-if $options[:rebase]
-  ret = git_do "contest rebase \"#{$NAME}\" \"#{$MASTER}\""
-  exitcode = $?.to_i
-  if ! $?
-    puts "Finish was aborted due to conflicts during rebase."
-    exit 1
-  end
-end
-
-git_do "checkout #{$MASTER}"
-if git_do("rev-list -n2 \"#{$MASTER}..#{$BRANCH}\"").lines.to_a.length == 1
-  git_do "merge --ff \"#{$BRANCH}\" #{merge_options}"
-else
-  if $options[:squash]
-    git_do "merge --squash \"#{$BRANCH}\" #{merge_options}"
-    if $options[:no_edit]
-      git_do "commit -m 'Squashed commit'"
-    else
-      git_do "commit"
-    end
-    git_do "merge \"#{$BRANCH}\" #{merge_options}"
-  else
-    git_do "merge --no-ff \"#{$BRANCH}\" #{merge_options}"
-  end
-end
-
-helper_finish_cleanup
+cli = CommandLine::SubCommands::FinishCommand.new(ARGV)
+cli.init
+cli.run