git-process 0.9.1.pre3 → 0.9.2

data/lib/git-process/git-new-fb-options.rb

@@ -1,34 +0,0 @@
-require 'git-process-options'
-
-module Git
-
-  class Process
-
-    class NewFeatureBranchOptions
-      include GitProcessOptions
-
-      attr_reader :branch_name
-
-      def initialize(filename, argv)
-        @filename = filename
-        argv << "-h" if argv.empty?
-        parse(filename, argv)
-      end
-
-
-      def extend_opts(opts)
-        opts.banner = "Usage: #{@filename} [ options ] branch_name"
-      end
-
-
-      def extend_args(argv)
-        raise OptionParser::ParseError.new("Must have exactly one branch name.") if argv.length != 1
-
-        @branch_name = argv.pop
-      end
-
-    end
-
-  end
-
-end

data/lib/git-process/git-process-error.rb

@@ -1,10 +0,0 @@
-module Git
-
-  class Process
-
-    class GitProcessError < RuntimeError
-    end
-
-  end
-
-end

data/lib/git-process/git-process-options.rb

@@ -1,82 +0,0 @@
-require 'optparse'
-
-module Git
-
-  class Process
-
-    module GitProcessOptions
-
-      attr_reader :quiet, :verbose
-
-
-      def quiet
-        @quiet
-      end
-
-
-      def verbose
-        @verbose
-      end
-
-
-      def log_level
-        if quiet
-          Logger::ERROR
-        elsif verbose
-          Logger::DEBUG
-        else
-          Logger::INFO
-        end
-      end
-
-
-      def parse(filename, argv)
-        OptionParser.new do |opts|
-          opts.banner = "Usage: #{filename} [ options ]"
-
-          opts.on("-q", "--quiet", "Quiet") do
-            @quiet = true
-          end
-
-          opts.on("-v", "--verbose", "Verbose") do
-            @verbose = true
-            @quiet = false
-          end
-
-          opts.on("-h", "--help", "Show this message") do
-            puts opts
-            exit(-1)
-          end
-
-          extend_opts(opts)
-
-          begin
-            begin
-              opts.parse!(argv)
-
-              extend_args(argv)
-            rescue OptionParser::ParseError => e
-              raise "#{e.message}\n#{opts}"
-            end
-          rescue RuntimeError => e
-            STDERR.puts e.message
-            exit(-1)
-          end
-        end
-      end
-
-
-      def extend_opts(opts)
-        # extension point - does nothing by default
-      end
-
-
-      def extend_args(argv)
-        # extension point - does nothing by default
-      end
-
-    end
-
-  end
-
-end

data/lib/git-process/git-process.rb

@@ -1,194 +0,0 @@
-require 'git-lib'
-require 'uncommitted-changes-error'
-require 'git-rebase-error'
-require 'git-merge-error'
-require 'parked-changes-error'
-require 'pull-request'
-require 'shellwords'
-require 'highline/import'
-
-
-module Git
-
-  class Process
-    attr_reader :lib
-
-    @@server_name = 'origin'
-    @@master_branch = 'master'
-
-    def initialize(dir = nil, gitlib = nil, options = {})
-      @lib = gitlib || Git::GitLib.new(dir, options)
-    end
-
-
-    def Process.remote_master_branch
-      "#{@@server_name}/#{@@master_branch}"
-    end
-
-
-    def Process.server_name
-      @@server_name
-    end
-
-
-    def Process.master_branch
-      @@master_branch
-    end
-
-
-    def rebase_to_master
-      raise UncommittedChangesError.new unless lib.status.clean?
-      raise ParkedChangesError.new(lib) if is_parked?
-
-      if lib.has_a_remote?
-        lib.fetch
-        rebase(Process::remote_master_branch)
-        lib.push(Process::server_name, lib.branches.current, Process::master_branch)
-        remove_feature_branch
-      else
-        rebase("master")
-      end
-    end
-
-
-    def sync_with_server(rebase, force)
-      raise UncommittedChangesError.new unless lib.status.clean?
-      raise ParkedChangesError.new(lib) if is_parked?
-
-      current_branch = lib.branches.current
-      remote_branch = "#{Process::server_name}/#{current_branch}"
-
-      lib.fetch
-
-      if rebase
-        rebase(Process::remote_master_branch)
-      else
-        merge(Process::remote_master_branch)
-      end
-
-      old_sha = lib.command('rev-parse', remote_branch) rescue ''
-
-      unless current_branch == Process::master_branch
-        lib.fetch
-        new_sha = lib.command('rev-parse', remote_branch) rescue ''
-        unless old_sha == new_sha
-          logger.warn("'#{current_branch}' changed on '#{Process::server_name}'"+
-                      " [#{old_sha[0..5]}->#{new_sha[0..5]}]; trying sync again.")
-          sync_with_server(rebase, force)
-        end
-        lib.push(Process::server_name, current_branch, current_branch, :force => rebase || force)
-      else
-        logger.warn("Not pushing to the server because the current branch is the master branch.")
-      end
-    end
-
-
-    def new_feature_branch(branch_name)
-      branches = lib.branches
-      on_parking = (branches.parking == branches.current)
-
-      if on_parking
-        new_branch = lib.checkout(branch_name, :new_branch => '_parking_')
-        branches.parking.delete
-        new_branch
-      else
-        lib.checkout(branch_name, :new_branch => 'origin/master')
-      end
-    end
-
-
-    def bad_parking_branch_msg
-      hl = HighLine.new
-      hl.color("\n***********************************************************************************************\n\n"+
-               "There is an old '_parking_' branch with unacounted changes in it.\n"+
-               "It has been renamed to '_parking_OLD_'.\n"+
-               "Please rename the branch to what the changes are about (`git branch -m _parking_OLD_ my_fb_name`),\n"+
-               " or remove it altogher (`git branch -D _parking_OLD_`).\n\n"+
-               "***********************************************************************************************\n", :red, :bold)
-    end
-
-
-    def remove_feature_branch
-      branches = lib.branches
-
-      remote_master = branches[Process::remote_master_branch]
-      current_branch = branches.current
-
-      unless remote_master.contains_all_of(current_branch.name)
-        raise GitProcessError.new("Branch '#{current_branch.name}' has not been merged into '#{Process::remote_master_branch}'")
-      end
-
-      parking_branch = branches['_parking_']
-      if parking_branch
-        if (parking_branch.is_ahead_of(remote_master.name) and
-            !current_branch.contains_all_of(parking_branch.name))
-
-          parking_branch.rename('_parking_OLD_')
-
-          logger.warn {bad_parking_branch_msg}
-        else
-          parking_branch.delete
-        end
-      end
-      remote_master.checkout_to_new('_parking_', :no_track => true)
-
-      current_branch.delete(true)
-      if branches["#{Process.server_name}/#{current_branch.name}"]
-        lib.push(Process.server_name, nil, nil, :delete => current_branch.name)
-      end
-    end
-
-
-    def is_parked?
-      branches = lib.branches
-      branches.parking == branches.current
-    end
-
-
-    def rebase(base)
-      begin
-        lib.rebase(base)
-      rescue Git::GitExecuteError => rebase_error
-        raise RebaseError.new(rebase_error.message, lib)
-      end
-    end
-
-
-    def merge(base)
-      begin
-        lib.merge(base)
-      rescue Git::GitExecuteError => merge_error
-        raise MergeError.new(merge_error.message, lib)
-      end
-    end
-
-
-    def pull_request(repo_name, base, head, title, body, opts = {})
-      repo_name ||= lib.repo_name
-      base ||= @@master_branch
-      head ||= lib.branches.current
-      title ||= ask_for_pull_title
-      body ||= ask_for_pull_body
-      GitHub::PullRequest.new(lib, repo_name, opts).pull_request(base, head, title, body)
-    end
-
-
-    def ask_for_pull_title
-      ask("What <%= color('title', [:bold]) %> do you want to give the pull request? ") do |q|
-        q.validate = /^\w+.*/
-      end
-    end
-
-
-    def ask_for_pull_body
-      ask("What <%= color('description', [:bold]) %> do you want to give the pull request? ")
-    end
-
-
-    def logger
-      @lib.logger
-    end
-
-  end
-
-end

data/lib/git-process/git-pull-request-options.rb

@@ -1,42 +0,0 @@
-require 'git-process-options'
-
-module Git
-
-  class Process
-
-    class PullRequestOptions
-      include GitProcessOptions
-
-      attr_reader :user, :password, :description, :title, :filename
-
-      def initialize(filename, argv)
-        @filename = filename
-        parse(filename, argv)
-      end
-
-      def extend_opts(opts)
-        opts.banner = "Usage: #{filename} [ options ] [pull_request_title]"
-
-        opts.on("-u", "--user name", String, "GitHub account username") do |user|
-          @user = user
-        end
-
-        opts.on("-p", "--password pw", String, "GitHub account password") do |password|
-          @password = password
-        end
-
-        opts.on(nil, "--desc description", String, "Description of the changes.") do |desc|
-          @description = desc
-        end
-      end
-
-
-      def extend_args(argv)
-        @title = argv.pop unless argv.empty?
-      end
-
-    end
-
-  end
-
-end

data/lib/git-process/git-rebase-error.rb

@@ -1,31 +0,0 @@
-require 'git-process-error'
-require 'git-abstract-merge-error-builder'
-
-module Git
-
-  class Process
-
-    class RebaseError < GitProcessError
-      include Git::AbstractMergeErrorBuilder
-
-      attr_reader :error_message, :lib
-
-      def initialize(rebase_error_message, lib)
-        @lib = lib
-        @error_message = rebase_error_message
-
-        msg = build_message
-
-        super(msg)
-      end
-
-
-      def continue_command
-        'git rebase --continue'
-      end
-
-    end
-
-  end
-
-end

data/lib/git-process/git-sync-options.rb

@@ -1,34 +0,0 @@
-require 'optparse'
-require 'git-process-options'
-
-module Git
-
-  class Process
-
-    class SyncOptions
-      include GitProcessOptions
-
-      attr_reader :rebase, :force
-
-
-      def initialize(filename, argv)
-        @rebase = false
-        @force = false
-        parse(filename, argv)
-      end
-
-
-      def extend_opts(opts)
-        opts.on("-r", "--rebase", "Rebase instead of merge") do |v|
-          @rebase = true
-        end
-
-        opts.on("-f", "--force", "Force the push") do |v|
-          @force = true
-        end
-      end
-    end
-
-  end
-
-end

data/lib/git-process/git-to-master-options.rb

@@ -1,18 +0,0 @@
-require 'optparse'
-require 'git-process-options'
-
-module Git
-
-  class Process
-
-    class ToMasterOptions
-      include GitProcessOptions
-
-      def initialize(filename, argv)
-        parse(filename, argv)
-      end
-    end
-
-  end
-
-end

data/lib/git-process/parked-changes-error.rb

@@ -1,32 +0,0 @@
-require 'git-process-error'
-
-module Git
-
-  class Process
-
-    class ParkedChangesError < GitProcessError
-      include Git::AbstractErrorBuilder
-
-      attr_reader :error_message, :lib
-
-      def initialize(lib)
-        @lib = lib
-        msg = build_message
-        super(msg)
-      end
-
-
-      def human_message
-        "You made your changes on the the '_parking_' branch instead of a feature branch.\n"+"Please rename the branch to be a feature branch."
-      end
-
-
-      def build_commands
-        ['git branch -m _parking_ my_feature_branch']
-      end
-
-    end
-
-  end
-
-end

data/lib/git-process/pull-request.rb

@@ -1,38 +0,0 @@
-require 'github-service'
-require 'octokit'
-
-
-module GitHub
-
-  class PullRequest
-    include GitHubService
-
-    attr_reader :lib, :repo
-
-    def initialize(lib, repo, opts = {})
-      @lib = lib
-      @repo = repo
-      @user = opts[:user]
-      @password = opts[:password]
-    end
-
-
-    def pull_requests
-      @pull_requests ||= client.pull_requests(repo)
-    end
-
-
-    def create(base, head, title, body)
-      logger.info { "Creating a pull request asking for '#{head}' to be merged into '#{base}' on #{repo}." }
-      begin
-        client.create_pull_request(repo, base, head, title, body)
-      rescue Octokit::UnprocessableEntity => exp
-        pull = pull_requests.find {|p| p[:head][:ref] == head and p[:base][:ref] == base}
-        logger.warn { "Pull request already exists. See #{pull[:html_url]}" }
-        pull
-      end
-    end
-
-  end
-
-end

data/lib/git-process/uncommitted-changes-error.rb

@@ -1,15 +0,0 @@
-require 'git-process-error'
-
-module Git
-
-  class Process
-
-    class UncommittedChangesError < GitProcessError
-      def initialize()
-        super("There are uncommitted changes.\nPlease either commit your changes, or use 'git stash' to set them aside.")
-      end
-    end
-
-  end
-
-end