git-contest 0.2.4 → 0.2.5

data/bin/git-contest-init

@@ -8,70 +8,9 @@
 # Licensed under the MIT-License.
 #
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'git/contest/common'
-require 'trollop'
-require 'highline/import'
+require_relative "../lib/git/contest/command_line"
 
-init
-
-sub_commands = %w()
-options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  opt(
-    :defaults,
-    "Use default branch naming conventions.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  opt(
-    :force,
-    "force setting of git-contest branches, even if already configured.",
-    :short => :f,
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  stop_on sub_commands
-end
-
-if git_contest_is_initialized && ! options[:force]
-  puts "Already initialized for git-contest."
-  puts "To force reinitialization, use: git contest init -f"
-  exit 0
-end
-
-# run commands
-if ! git_do_no_echo 'rev-parse --git-dir'
-  git_do 'init'
-end
-
-# init main
-if git_contest_has_master_configured
-  master_branch = git_do 'config --get git.contest.branch.master'
-elsif options[:defaults]
-  master_branch = 'master'
-else
-  master_branch = ask('Master branch name: ') do |q|
-    q.default = 'master'
-  end
-end
-
-if options[:defaults]
-  prefix = 'contest'
-else
-  prefix = ask('Prefix of contest branch name:  ') do |q|
-    q.default = 'contest'
-  end
-end
-
-if git_repo_is_headless
-  git_do 'symbolic-ref', 'HEAD', "\"refs/heads/#{master_branch}\""
-  git_do 'commit --allow-empty --quiet -m "Initial commit"'
-end
-
-# save config
-git_do 'config', 'git.contest.branch.master', master_branch
-git_do 'config', 'git.contest.branch.prefix', prefix
+cli = CommandLine::SubCommands::InitCommand.new(ARGV)
+cli.init
+cli.run
 

data/bin/git-contest-list

@@ -8,68 +8,8 @@
 # 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
+require_relative "../lib/git/contest/command_line"
 
+cli = CommandLine::SubCommands::ListCommand.new(ARGV)
+cli.init
+cli.run

data/bin/git-contest-rebase

@@ -8,69 +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_nameprefix_arg name, prefix
-  expanded_name = git_contest_resolve_nameprefix name, prefix
-  exitcode = $?.to_i
-  if $? == 0
-    $NAME = expanded_name
-    $BRANCH = "#{$PREFIX}/#{$NAME}"
-  else
-    return 1
-  end
-end
-
-def expand_nameprefix_arg_or_current
-  if ARGV.length > 0
-    expand_nameprefix_arg ARGV[0], $PREFIX
-    require_branch "#{$PREFIX}/#{$NAME}"
-  else
-    use_current_branch
-  end
-end
-
-init
-
-sub_commands = %w()
-$options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  opt(
-    :interactive,
-    "Do an interactive rebase.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  stop_on sub_commands
-end
-
-expand_nameprefix_arg_or_current
-
-puts "Will try to rebase '#{$NAME}'..."
-
-require_clean_working_tree
-require_branch $BRANCH
-
-git_do "checkout -q \"#{$BRANCH}\""
-rebase_options = ""
-if $options[:interactive]
-  rebase_options += " -i"
-end
-
-puts git_do "rebase #{rebase_options} #{$MASTER}"
+cli = CommandLine::SubCommands::RebaseCommand.new(ARGV)
+cli.init
+cli.run
 

data/bin/git-contest-start

@@ -8,61 +8,8 @@
 # Licensed under the MIT-License.
 #
 
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'git/contest/common'
-require 'trollop'
-
-init
-
-sub_commands = %w()
-options = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  opt(
-    :fetch,
-    "fetch from origin before performing operation.",
-    :type => :flag,
-    :default => false,
-    :required => false,
-  )
-  stop_on sub_commands
-end
-
-if ARGV.length == 0
-  puts "Missing argument <name>"
-  exit 1
-end
-
-base_branch_name = $MASTER
-# specify based branch
-if ARGV.length == 2
-  base_branch_name = ARGV[1]
-end
-contest_branch_name = "#{ARGV[0]}"
-contest_branch = "#{$PREFIX}/#{contest_branch_name}"
-require_branch_absent contest_branch
-
-# fetch origin/master
-if options[:fetch]
-  git_do "fetch -q \"#{$ORIGIN}\""
-end
-
-# require equal
-if git_branch_exists "#{$ORIGIN}/#{$MASTER}"
-  require_branches_equal "#{$MASTER}", "#{$ORIGIN}/#{$MASTER}"
-end
-
-# create branch
-if ! git_do "checkout -b \"#{contest_branch}\" \"#{base_branch_name}\""
-  abort "Could not create contest branch #{contest_branch}"
-end
-
-puts ""
-puts "Summary of actions:"
-puts "- A new branch \"#{contest_branch}\" was created, based on \"#{base_branch_name}\""
-puts "- You are now on branch \"#{contest_branch}\""
-puts ""
-puts "Now, start committing on your contest. When done, use:"
-puts ""
-puts "    git contest finish #{contest_branch_name}"
-puts ""
+require_relative "../lib/git/contest/command_line"
 
+cli = CommandLine::SubCommands::StartCommand.new(ARGV)
+cli.init
+cli.run

data/bin/git-contest-submit

@@ -8,188 +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"
 
-#
-# Load Drivers
-#
-def load_drivers
-  driver_names = $sites.keys().map {|key| $sites[key]["driver"] }
-  driver_names.uniq.each do |driver_name|
-    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}Driver"
-  end
-end
-
-#
-# Command Utils
-#
-def usage
-  puts get_banner
-  return 0
-end
-
-def get_banner
-  res = ""
-  res += "usage: git contest submit <site>\n"
-  res += "\n"
-  res += "Available sites are:\n"
-  $sites.keys().each do |site|
-    if $drivers.has_key? $sites[site]["driver"]
-      driver = $drivers[$sites[site]["driver"]].new
-      res += "  %-12s\t#{driver.get_desc}\n" % [site]
-    else
-      # TODO: driver not found
-    end
-  end
-  res += "\n"
-  res += "Try 'git contest submit <site> --help' for details.\n"
-  return res
-end
-
-def get_git_add_target rule
-  str = rule
-  str = str.gsub('${source}', $submit_info[:source])
-  str
-end
-
-init
-
-$config = get_config() || {}
-$sites  = {}
-if $config.has_key? 'sites'
-  $sites = $config["sites"]
-end
-
-Contest::Driver::Utils.load_plugins
-
-$drivers = {}
-load_drivers
-
-# check options
-sub_commands = $sites.keys
-global_opts = Trollop::options do
-  version "git-contest #{Git::Contest::VERSION} (c) 2013-2014 Hiroyuki Sano"
-  banner get_banner
-  stop_on sub_commands
-end
-
-# detect site
-site = ARGV.shift.to_s.strip
-
-unless $sites.has_key?(site)
-  if site != ""
-    puts "site not found"
-  else
-    usage
-  end
-  exit 0
-end
-
-# detect driver
-driver_name = $sites[site]["driver"]
-
-unless $drivers.has_key?(driver_name)
-  puts "driver not found"
-  exit
-end
-
-#
-# Submit Start
-#
-driver = $drivers[driver_name].new
-
-$submit_info = {}
-
-# set events
-driver.on(
-  'start',
-  Proc.new do
-    puts "@start: submit"
-  end
-)
-
-driver.on(
-  'before_login',
-  Proc.new do
-    puts "@submit: logging in..."
-  end
-)
-
-driver.on(
-  'after_login',
-  Proc.new do
-    puts "@submit: login ok"
-  end
-)
-
-driver.on(
-  'before_submit',
-  Proc.new do |submit_info|
-    $submit_info = submit_info
-    puts "@submit: doing..."
-  end
-)
-
-driver.on(
-  'after_submit',
-  Proc.new do
-    puts "@submit: done"
-  end
-)
-
-driver.on(
-  'before_wait',
-  Proc.new do
-    print "@result: waiting..."
-  end
-)
-
-driver.on(
-  'retry',
-  Proc.new do
-    print "."
-  end
-)
-
-driver.on(
-  'after_wait',
-  Proc.new do |submission_info|
-    puts ""
-    next unless submission_info.is_a?(Hash)
-    puts ""
-    puts "@result: Submission Result"
-    puts "  %s: %s" % ["submission id", "#{submission_info[:submission_id]}"]
-    puts "  %s: %s" % ["status", "#{submission_info[:status]}"]
-    puts ""
-    if git_contest_is_initialized
-      git_do "add #{get_git_add_target($config["submit_rules"]["add"] || ".")}"
-      git_do "commit --allow-empty -m '#{submission_info[:result]}'"
-    end
-  end
-)
-
-driver.on(
-  'finish',
-  Proc.new do
-    puts "@finish"
-  end
-)
-
-# global config
-$config["submit_rules"] ||= {}
-$config["file"] ||= {}
-
-# set config
-driver.config = $sites[site]
-driver.config.merge! $config
-
-# parse driver options
-driver.options = driver.get_opts()
-
-result = driver.submit()
+cli = CommandLine::SubCommands::SubmitCommand.new ARGV
+cli.init
+cli.run