git-contest 0.2.4 → 0.2.5

data/lib/git/contest/command_line/sub_commands/submit_command.rb

@@ -0,0 +1,220 @@
+#
+# git-contest-submit
+# https://github.com/sh19910711/git-contest
+#
+# Copyright (c) 2013-2014 Hiroyuki Sano <sh19910711 at gmail.com>
+# Licensed under the MIT-License.
+#
+
+module CommandLine
+
+  module SubCommands
+
+    class SubmitCommand < Command
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+
+        # load sites
+        $config = get_config() || {}
+        $sites  = {}
+        if $config.has_key? 'sites'
+          $sites = $config["sites"]
+        end
+
+        # load drivers
+        Contest::Driver::Utils.load_plugins
+
+        $drivers = {}
+        load_drivers
+      end
+
+      def define_options
+        opt_parser.on "-h", "--help", "help" do
+          usage
+          exit 0
+        end
+      end
+
+      def set_default_options
+      end
+
+      def run
+
+        # check options
+        sub_commands = $sites.keys
+
+        # detect site
+        unless has_next_token?
+          usage
+          exit 0
+        end
+
+        site = next_token.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(args)
+
+        $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
+              puts "@commit"
+              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()
+
+      end
+
+      private 
+
+      # 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
+
+    end # SubmitCommand
+
+  end # SubCommands
+
+end # CommandLine

data/lib/git/contest/common.rb

@@ -17,12 +17,12 @@ def init
 end
 
 def init_global
-  $git_contest_home   = File.expand_path(ENV['GIT_CONTEST_HOME'] || "~/.git-contest")
-  $git_contest_config = File.expand_path(ENV['GIT_CONTEST_CONFIG'] || "#{$git_contest_home}/config.yml")
-  if git_do_no_echo 'branch'
-    $MASTER = git_do 'config --get git.contest.branch.master'
-    $PREFIX = git_do 'config --get git.contest.branch.prefix'
-    $ORIGIN = git_do 'config --get git.contest.origin'
+  $git_contest_home   = File.expand_path(ENV['GIT_CONTEST_HOME'] || File.join("~", ".git-contest"))
+  $git_contest_config = File.expand_path(ENV['GIT_CONTEST_CONFIG'] || File.join($git_contest_home, "config.yml"))
+  if Git.do_no_echo 'branch'
+    $MASTER = Git.do 'config --get git.contest.branch.master'
+    $PREFIX = Git.do 'config --get git.contest.branch.prefix'
+    $ORIGIN = Git.do 'config --get git.contest.origin'
     if $ORIGIN == ''
       $ORIGIN = 'origin'
     end

data/lib/git/contest/git.rb

@@ -5,185 +5,189 @@
 # Licensed under the MIT-License.
 #
 
-def git_do(*args)
-  puts "git #{args.join(' ')}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
-  return `git #{args.join(' ')} 2>&1`.strip
-end
+module Git
 
-# use return value
-def git_do_no_echo(*args)
-  puts "git #{args.join(' ')}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
-  system "git #{args.join(' ')} >/dev/null 2>&1"
-end
+  def self.do(*args)
+    puts "git #{args.join(' ')}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
+    `git #{args.join(' ')} 2>&1`.strip
+  end
 
-#
-def git_contest_is_initialized
-  git_contest_has_master_configured &&
-    git_contest_has_prefix_configured &&
-    git_do('config --get git.contest.branch.master') != git_do('config --get git.contest.branch.develop')
-end
-
-def git_contest_has_master_configured
-  master = (git_do 'config --get git.contest.branch.master').strip
-  master != '' && git_local_branches().include?(master)
-end
-
-def git_contest_has_develop_configured
-  develop = (git_do 'config --get git.contest.branch.develop').strip
-  develop != '' && git_local_branches().include?(develop)
-end
-
-def git_contest_has_prefix_configured
-  git_do_no_echo 'config --get git.contest.branch.prefix'
-end
-
-def git_contest_resolve_nameprefix name, prefix
-  if git_local_branch_exists "#{prefix}/#{name}"
-    return name
-  end
-  branches = git_local_branches().select {|branch| branch.start_with? "#{prefix}/#{name}" }
-  if branches.size == 0
-    abort "No branch matches prefix '#{name}'"
-  else
-    if branches.size == 1
-      return branches[0][prefix.length..-1]
-    else
-      abort "Multiple branches match prefix '#{name}'"
-    end
+  # use return value
+  def self.do_no_echo(*args)
+    puts "git #{args.join(' ')}" if ENV['GIT_CONTEST_DEBUG'] == 'ON'
+    `git #{args.join(' ')} 2>&1`
+    $?.success?
   end
-end
 
-#
-def git_remote_branch_exists(branch_name)
-  git_remote_branches().include?(branch_name)
-end
-
-def git_local_branch_exists(branch_name)
-  git_local_branches().include?(branch_name)
-end
-
-def git_branch_exists(branch_name)
-  git_all_branches().include?(branch_name)
-end
-
-def git_remote_branches
-  cmd_ret = git_do 'branch -r --no-color'
-  cmd_ret.lines.map {|line|
-    line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
-  }
-end
-
-def git_local_branches
-  cmd_ret = git_do 'branch --no-color'
-  cmd_ret.lines.map {|line|
-    line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
-  }
-end
-
-def git_all_branches
-  cmd_ret1 = git_do 'branch --no-color'
-  cmd_ret2 = git_do 'branch -r --no-color'
-  lines = ( cmd_ret1 + cmd_ret2 ).lines
-  lines.map {|line|
-    line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
-  }
-end
-
-def git_current_branch
-  ret = git_do('branch --no-color').lines
-  ret = ret.grep /^\*/
-  ret[0].gsub(/^[* ] /, '').strip
-end
-
-def git_is_clean_working_tree
-  if ! git_do_no_echo 'diff --no-ext-diff --ignore-submodules --quiet --exit-code'
-    return 1
-  elsif ! git_do_no_echo 'diff-index --cached --quiet --ignore-submodules HEAD --'
-    return 2
-  else
-    return 0
-  end
-end
-
-def git_repo_is_headless
-  ! git_do_no_echo 'rev-parse --quiet --verify HEAD'
-end
+  #
+  def self.contest_is_initialized
+    Git.contest_has_master_configured &&
+      Git.contest_has_prefix_configured &&
+      Git.do('config --get git.contest.branch.master') != Git.do('config --get git.contest.branch.develop')
+  end
 
-#
-# 0: same
-# 1: first branch needs ff
-# 2: second branch needs ff
-# 3: branch needs merge
-# 4: there is no merge
-#
-def git_compare_branches first, second
-  commit1 = git_do "rev-parse \"#{first}\""
-  commit2 = git_do "rev-parse \"#{second}\""
-  if commit1 != commit2
-    if git_do_no_echo("merge-base \"#{commit1}\" \"#{commit2}\"") > 0
-      return 4
+  def self.contest_has_master_configured
+    master = (Git.do 'config --get git.contest.branch.master').strip
+    master != '' && Git.local_branches().include?(master)
+  end
+
+  def self.contest_has_develop_configured
+    develop = (Git.do 'config --get git.contest.branch.develop').strip
+    develop != '' && Git.local_branches().include?(develop)
+  end
+
+  def self.contest_has_prefix_configured
+    Git.do_no_echo 'config --get git.contest.branch.prefix'
+  end
+
+  def self.contest_resolve_nameprefix name, prefix
+    if Git.local_branch_exists "#{prefix}/#{name}"
+      return name
+    end
+    branches = Git.local_branches().select {|branch| branch.start_with? "#{prefix}/#{name}" }
+    if branches.size == 0
+      abort "No branch matches prefix '#{name}'"
     else
-      base = git_do "merge-base \"#{commit1}\" \"#{commit2}\""
-      if commit1 == base
-        return 1
-      elsif commit2 == base
-        return 2
+      if branches.size == 1
+        return branches[0][prefix.length..-1]
       else
-        return 3
+        abort "Multiple branches match prefix '#{name}'"
       end
     end
-  else
-    return 0
   end
-end
 
-def require_branch(branch)
-  if ! git_all_branches().include?(branch)
-    abort "Branch #{branch} does not exist."
+  #
+  def self.remote_branch_exists(branch_name)
+    Git.remote_branches().include?(branch_name)
+  end
+
+  def self.local_branch_exists(branch_name)
+    Git.local_branches().include?(branch_name)
   end
-end
 
-def require_branch_absent(branch)
-  if git_all_branches().include?(branch)
-    abort "Branch #{branch} already exists. Pick another name."
+  def self.branch_exists(branch_name)
+    Git.all_branches().include?(branch_name)
   end
-end
 
-def require_clean_working_tree
-  ret = git_is_clean_working_tree
-  if ret == 1
-    abort "fatal: Working tree contains unstaged changes. Aborting."
+  def self.remote_branches
+    cmd_ret = Git.do 'branch -r --no-color'
+    cmd_ret.lines.map {|line|
+      line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
+    }
   end
-  if ret == 2
-    abort "fatal: Index contains uncommited changes. Aborting."
+
+  def self.local_branches
+    cmd_ret = Git.do 'branch --no-color'
+    cmd_ret.lines.map {|line|
+      line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
+    }
   end
-end
 
-def require_local_branch branch
-  if ! git_local_branch_exists branch
-    abort "fatal: Local branch '#{branch}' does not exist and is required."
+  def self.all_branches
+    cmd_ret1 = Git.do 'branch --no-color'
+    cmd_ret2 = Git.do 'branch -r --no-color'
+    lines = ( cmd_ret1 + cmd_ret2 ).lines
+    lines.map {|line|
+      line.gsub(/^[*]?\s*/, '').gsub(/\s*$/, '').strip
+    }
   end
-end
 
-def require_remote_branch branch
-  if ! git_remote_branch_exists branch
-    abort "fatal: Remote branch '#{branch}' does not exist and is required."
+  def self.current_branch
+    ret = Git.do('branch --no-color').lines
+    ret = ret.grep /^\*/
+    ret[0].gsub(/^[* ] /, '').strip
   end
-end
 
-def require_branches_equal local, remote
-  require_local_branch local
-  require_remote_branch remote
-  ret = git_compare_branches local, remote
-  if ret > 0
-    puts "Branches '#{local}' and '#{remote}' have diverged."
-    if ret == 1
-      abort "And branch #{local} may be fast-forwarded."
-    elsif ret == 2
-      puts "And local branch #{local} is ahead of #{remote}"
+  def self.is_clean_working_tree
+    if ! Git.do_no_echo 'diff --no-ext-diff --ignore-submodules --quiet --exit-code'
+      return 1
+    elsif ! Git.do_no_echo 'diff-index --cached --quiet --ignore-submodules HEAD --'
+      return 2
     else
-      abort "Branches need merging first."
+      return 0
+    end
+  end
+
+  def self.repo_is_headless
+    ! Git.do_no_echo 'rev-parse --quiet --verify HEAD'
+  end
+
+  #
+  # 0: same
+  # 1: first branch needs ff
+  # 2: second branch needs ff
+  # 3: branch needs merge
+  # 4: there is no merge
+  #
+  def self.compare_branches first, second
+    commit1 = Git.do "rev-parse \"#{first}\""
+    commit2 = Git.do "rev-parse \"#{second}\""
+    if commit1 != commit2
+      if Git.do_no_echo("merge-base \"#{commit1}\" \"#{commit2}\"")
+        return 4
+      else
+        base = Git.do "merge-base \"#{commit1}\" \"#{commit2}\""
+        if commit1 == base
+          return 1
+        elsif commit2 == base
+          return 2
+        else
+          return 3
+        end
+      end
+    else
+      return 0
+    end
+  end
+
+  def self.require_branch(branch)
+    if ! Git.all_branches().include?(branch)
+      abort "Branch #{branch} does not exist."
+    end
+  end
+
+  def self.require_branch_absent(branch)
+    if Git.all_branches().include?(branch)
+      abort "Branch #{branch} already exists. Pick another name."
+    end
+  end
+
+  def self.require_clean_working_tree
+    ret = Git.is_clean_working_tree
+    if ret == 1
+      abort "fatal: Working tree contains unstaged changes. Aborting."
+    end
+    if ret == 2
+      abort "fatal: Index contains uncommited changes. Aborting."
+    end
+  end
+
+  def self.require_local_branch branch
+    if ! Git.local_branch_exists branch
+      abort "fatal: Local branch '#{branch}' does not exist and is required."
+    end
+  end
+
+  def self.require_remote_branch branch
+    if ! Git.remote_branch_exists branch
+      abort "fatal: Remote branch '#{branch}' does not exist and is required."
+    end
+  end
+
+  def self.require_branches_equal local, remote
+    Git.require_local_branch local
+    Git.require_remote_branch remote
+    ret = Git.compare_branches local, remote
+    if ret > 0
+      puts "Branches '#{local}' and '#{remote}' have diverged."
+      if ret == 1
+        abort "And branch #{local} may be fast-forwarded."
+      elsif ret == 2
+        puts "And local branch #{local} is ahead of #{remote}"
+      else
+        abort "Branches need merging first."
+      end
     end
   end
-end
 
+end # Git