git-contest 0.2.4 → 0.2.5

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

@@ -0,0 +1,161 @@
+#
+# git-contest-finish
+# 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 FinishCommand < Command
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+      end
+
+      def define_options
+        opt_parser.on "--[no-]edit", "Use default commit message." do |v|
+          options[:edit] = v
+        end
+
+        opt_parser.on "-k", "--keep", "Keep contest branch after merge." do
+          options[:keep] = true
+        end
+
+        opt_parser.on "--rebase", "Use rebase instead of merge." do
+          options[:rebase] = true
+        end
+
+        opt_parser.on "--force-delete", "Force delete contest branch after finish." do
+          options[:force_delete] = true
+        end
+
+        opt_parser.on "-s", "--squash", "Use squash during merge." do
+          options[:squash] = true
+        end
+
+        opt_parser.on "--fetch", "Fetch from origin before finish." do
+          options[:fetch]
+        end
+      end
+
+      def set_default_options
+        options[:edit] = true if options[:edit].nil?
+        options[:keep] = false if options[:keep].nil?
+        options[:rebase] = false if options[:rebase].nil?
+        options[:force_delete] = false if options[:force_delete].nil?
+        options[:squash] = false if options[:squash].nil?
+        options[:fetch] = false if options[:fetch].nil?
+      end
+
+      def run
+        expand_contest_branch
+        Git.require_branch $BRANCH
+
+        Git.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}")
+            Git.require_branches_equal $BRANCH, "#{$ORIGIN}/#{$BRANCH}"
+        end
+
+        if Git.remote_branches().include?("#{$ORIGIN}/#{$MASTER}")
+            Git.require_branches_equal $MASTER, "#{$ORIGIN}/#{$MASTER}"
+        end
+
+        merge_options = ""
+        if options[: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}"
+            unless options[: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
+      end
+
+      private
+
+      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
+        unless has_next_token?
+          use_current_branch
+        else
+          $NAME = next_token
+          $BRANCH = "#{$PREFIX}/#{$NAME}"
+            Git.require_branch $BRANCH
+        end
+      end
+
+      def helper_finish_cleanup
+        Git.require_branch $BRANCH
+        Git.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
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,79 @@
+#
+# git-contest-init
+# 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 InitCommand < Command
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+      end
+
+      def define_options
+        opt_parser.on "-d", "--defaults", "Use default branch naming conventions." do
+          options[:defaults] = true
+        end
+
+        opt_parser.on "-f", "--force", "force setting of git-contest branches, even if already configured." do
+          options[:force] = true
+        end
+      end
+
+      def set_default_options
+        options[:defaults]  = false if options[:defaults].nil?
+        options[:force]     = false if options[:defaults].nil?
+      end
+
+      def run
+        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 = terminal.ask('Master branch name: ') do |q|
+            q.default = 'master'
+          end
+        end
+
+        if options[:defaults]
+          prefix = 'contest'
+        else
+          prefix = terminal.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
+      end
+
+    end # InitCommand
+
+  end # SubCommands
+
+end  # CommandLine

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

@@ -0,0 +1,89 @@
+#
+# git-contest-list
+# https://github.com/sh19910711/git-contest
+#
+# Copyright (c) 2014 Hiroyuki Sano <sh19910711 at gmail.com>
+# Licensed under the MIT-License.
+#
+
+module CommandLine
+
+  module SubCommands
+
+    class ListCommand < Command
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+
+        Contest::Driver::Utils.load_plugins
+
+        $config = get_config() || {}
+        $sites  = {}
+        if $config.has_key? 'sites'
+          $sites = $config["sites"]
+        end
+      end
+
+      def define_options
+      end
+
+      def set_default_options
+      end
+
+      def run
+        sub_commands = %w(sites drivers)
+
+        type = next_token
+
+        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
+
+      end
+
+      private
+
+      #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
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,87 @@
+#
+# git-contest-rebase
+# 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 RebaseCommand < Command
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+      end
+
+      def define_options
+        opt_parser.on "-i", "--interactive", "Do an interactive rebase." do
+          options[:interactive] = true
+        end
+      end
+
+      def set_default_options
+        options[:interactive] = false if options[:interactive].nil?
+      end
+
+      def run
+        expand_nameprefix_arg_or_current
+
+        puts "Will try to rebase '#{$NAME}'..."
+
+        Git.require_clean_working_tree
+        Git.require_branch $BRANCH
+
+        Git.do "checkout -q \"#{$BRANCH}\""
+        rebase_options = ""
+        if options[:interactive]
+          rebase_options += " -i"
+        end
+
+        puts Git.do "rebase #{rebase_options} #{$MASTER}"
+
+      end
+
+      private
+
+      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 has_next_token?
+          expand_nameprefix_arg tokens.first, $PREFIX
+          Git.require_branch "#{$PREFIX}/#{$NAME}"
+        else
+          use_current_branch
+          end
+      end
+
+
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,77 @@
+#
+# git-contest-start
+# 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 StartCommand < Command 
+
+      def initialize(new_args, new_input_stream = STDIN)
+        super
+      end
+
+      def define_options
+        opt_parser.on "-f", "--fetch", "fetch from origin before performing operation." do
+          options[:fetch] = true
+        end
+      end
+
+      def set_default_options
+        options[:fetch] = false if options[:fetch].nil?
+      end
+
+      def run
+        p options
+
+        unless has_next_token?
+          puts "Missing argument <name>"
+          exit 1
+        end
+
+        base_branch_name = $MASTER
+        # specify based branch
+        if tokens.length == 2
+          base_branch_name = tokens[1]
+        end
+        contest_branch_name = "#{tokens[0]}"
+        contest_branch = "#{$PREFIX}/#{contest_branch_name}"
+          Git.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}"
+          Git.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 ""
+
+      end
+
+    end
+
+  end
+
+end