git-process 0.9.1.pre3

data/.gitignore

@@ -0,0 +1,16 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+

data/Gemfile

@@ -0,0 +1,22 @@
+source "http://rubygems.org"
+
+# gem "git", "~> 1.2.5"
+# gem "rugged"  # "git" bindings for libgit2
+gem "launchy", "~> 2.1.0" # web browser interaction
+gem "octokit", "~> 1.4.0" # GitHub API
+gem "json", "~> 1.7.3"
+gem "highline", "~> 1.6.12" # user CLI interaction
+gem "termios", "~> 0.9.4"  # used by highline to make things a little nicer
+gem "system_timer", "~> 1.2.4" # Needed by faraday via octokit
+
+group :test do
+  gem "rspec", "~> 2.10.0", :group => :test
+  gem "rspec-mocks", "~> 2.10.0", :group => :test
+  gem "webmock", "~> 1.8.7", :group => :test # network mocking
+end
+
+group :development do
+  gem "rake", "~> 0.9.2"
+  gem "yard", "~> 0.8.2.1"
+  gem "redcarpet", "~> 2.1.1"
+end

data/Gemfile.lock

@@ -0,0 +1,56 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.8)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    faraday (0.8.1)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.8.7)
+      faraday (>= 0.7.4, < 0.9)
+    hashie (1.2.0)
+    highline (1.6.12)
+    json (1.7.3)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
+    octokit (1.4.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.8)
+      hashie (~> 1.2)
+      multi_json (~> 1.3)
+    rake (0.9.2)
+    redcarpet (2.1.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    system_timer (1.2.4)
+    termios (0.9.4)
+    webmock (1.8.7)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+    yard (0.8.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  highline (~> 1.6.12)
+  json (~> 1.7.3)
+  launchy (~> 2.1.0)
+  octokit (~> 1.4.0)
+  rake (~> 0.9.2)
+  redcarpet (~> 2.1.1)
+  rspec (~> 2.10.0)
+  rspec-mocks (~> 2.10.0)
+  system_timer (~> 1.2.4)
+  termios (~> 0.9.4)
+  webmock (~> 1.8.7)
+  yard (~> 0.8.2.1)

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Jim Moore
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,80 @@
+[![Build Status](https://secure.travis-ci.org/jdigger/git-process.png)](http://travis-ci.org/jdigger/git-process)
+
+# Purpose #
+
+This provides an easy way to work with a sane git workflow process.
+
+
+# Installation #
+
+    $ gem install git-process
+
+# Overview #
+
+* `git new-fb` - Create a new feature branch based on the integration branch.
+* `git sync` - Gets the latest changes that have happened on the integration branch, then pushes your changes to a "private" branch on the server.
+* `git pull-request` - Creates a Pull Request for the current branch.
+* `git to-master` - Rebase against the integration branch, then pushes to it.
+
+# Workflow #
+
+_The following assumes that the integration branch is "origin/master"._
+
+## Code Review Using Pull Requests ##
+
+1. When starting work on a new feature, use "`git new-fb feature-name`".
+    * This creates a new branch called "`feature-name`" based on "`origin/master`".
+2. After making some changes, if you want to pick up any changes other people have made, as well
+   as save your work on the server, do "`git synch`".
+    * That will merge in the changes that have occurred in "`origin/master`" and then push the
+      result to the "`feature_branch`" branch to the server.
+3. When you feel your work is ready for others to look at, do another "`git sync`" to post your
+   changes to the server, and then "`git pull-request`" to ask someone to review your changes.
+4. If you get the thumbs up from the code-review, use "`git to-master`".
+    * This will merge and push your changes into "`origin/master`"
+5. If you still need to make changes, do so and use "`git sync`" to keep your branch on the
+   server for that feature updated with your work until all issues have been resolved.
+
+## Working Alone or When Pairing ##
+
+1. When starting work on a new feature, use "`git new-fb feature-name`".
+    * This creates a new branch called "`feature-name`" based on "`origin/master`".
+2. After making some changes, if you want to pick up any changes other people have made, as well
+   as save your work on the server, do "`git synch`".
+    * That will merge in the changes that have occurred in "`origin/master`" and then push the
+      result to the "`feature_branch`" branch to the server.
+3. When you are ready to merge your work into the mainline, "`git to-master`".
+    * This will merge and push your changes into "`origin/master`"
+
+# Notes #
+
+* It's assumed that you **_never_** do any work directly on "master": everything is done on a
+  feature branch.  This is a much safer and more flexible practice, but may seem odd to
+  people used to old VCSs.
+    * After publishing changes to the main integration branch (i.e., "`git to-master`") the
+      old feature branch is removed as part of cleanup. Git is then "parked" on a "`_parking_`"
+      branch until a new feature branch is created. Work is not expected to be done on this
+      branch, but any that is done is brought over to a newly created feature branch (i.e.,
+      "`git new-fb`").
+* The first time you use a GitHub feature (e.g., "`git pull-request`"), this will ask for your
+  username and password. It does not store them, but instead uses them to get an OAuth2 token,
+  which is stored in "`git config gitProcess.github.authToken`".
+
+## Misc ##
+
+* http://git-scm.com/2010/03/08/rerere.html
+* http://git.kernel.org/?p=git/git.git;a=blob;f=contrib/rerere-train.sh;hb=HEAD
+* https://github.com/b4mboo/git-review
+
+
+# Contributing #
+
+## Coding Setup ##
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+The tests are written for RSpec 2.

data/Rakefile

@@ -0,0 +1,16 @@
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+end
+
+desc "Create docs"
+YARD::Rake::YardocTask.new

data/bin/git-new-fb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+
+require 'logger'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')
+require 'git-new-fb-options'
+require 'git-process'
+
+options = Git::Process::NewFeatureBranchOptions.new(File.basename(__FILE__), ARGV)
+
+gp = Git::Process.new('.', nil, :log_level => options.log_level)
+
+begin
+  gp.new_feature_branch(options.branch_name)
+rescue Git::Process::GitProcessError => exp
+  puts exp.message
+  exit(-1)
+end

data/bin/git-pull-request

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+
+require 'logger'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')
+require 'git-pull-request-options'
+require 'git-process'
+
+options = Git::Process::PullRequestOptions.new(File.basename(__FILE__), ARGV)
+
+gp = Git::Process.new('.', nil, :log_level => options.log_level)
+
+begin
+  gp.create(nil, nil, nil, options.title, options.description, :user => options.user, :password => options.password)
+rescue Git::Process::GitProcessError => exp
+  puts exp.message
+  exit(-1)
+end

data/bin/git-sync

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+
+require 'logger'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')
+require 'git-sync-options'
+require 'git-process'
+
+options = Git::Process::SyncOptions.new(File.basename(__FILE__), ARGV)
+
+gp = Git::Process.new('.', nil, :log_level => options.log_level)
+
+begin
+  gp.sync_with_server(options.rebase, options.force)
+rescue Git::Process::GitProcessError => exp
+  puts exp.message
+  exit(-1)
+end

data/bin/git-to-master

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+
+require 'logger'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')
+require 'git-to-master-options'
+require 'git-process'
+
+options = Git::Process::ToMasterOptions.new(File.basename(__FILE__), ARGV)
+
+gp = Git::Process.new('.', nil, :log_level => options.log_level)
+
+begin
+  gp.rebase_to_master
+rescue Git::Process::GitProcessError => exp
+  puts exp.message
+  exit(-1)
+end

data/git-process.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/git-process/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Jim Moore"]
+  gem.email         = ["moore.jim@gmail.com"]
+  gem.description   = %q{A set of scripts to make working with git easier and more consistent}
+  gem.summary       = %q{A set of scripts for a good git process}
+  gem.homepage      = "http://jdigger.github.com/git-process/"
+
+  gem.add_development_dependency "rspec"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "git-process"
+  gem.require_paths = ["lib"]
+  gem.version       = Git::Process::Version::STRING
+  gem.platform      = Gem::Platform::RUBY
+  gem.required_ruby_version = '>= 1.8.7'
+end

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

@@ -0,0 +1,46 @@
+require 'git-lib'
+require 'git-process-error'
+require 'shellwords'
+
+module Git
+
+  #
+  # Assumes that there are two attributes defined: error_message, lib
+  #
+  module AbstractErrorBuilder
+
+    def commands
+      @commands ||= build_commands
+    end
+
+
+    def build_message
+      msg = human_message
+
+      msg << append_commands
+    end
+
+
+    def append_commands
+      commands.empty? ? '' : "\n\nCommands:\n\n  #{commands.join("\n  ")}"
+    end
+
+
+    def human_message
+      ''
+    end
+
+
+    def build_commands
+      []
+    end
+
+
+    def shell_escaped_files(files)
+      shell_escaped_files = files.map{|f| f.shellescape}
+      shell_escaped_files.join(' ')
+    end
+
+  end
+
+end

data/lib/git-process/git-abstract-merge-error-builder.rb

@@ -0,0 +1,115 @@
+require 'git-lib'
+require 'abstract-error-builder'
+require 'git-process-error'
+require 'shellwords'
+
+module Git
+
+  #
+  # Assumes that there are three attributes defined: error_message, lib, continue_command
+  #
+  module AbstractMergeErrorBuilder
+    include AbstractErrorBuilder
+
+    def resolved_files
+      @resolved_files ||= find_resolved_files
+    end
+
+
+    def unresolved_files
+      @unresolved_files ||= (unmerged - resolved_files)
+    end
+
+
+    def find_resolved_files
+      resolved_files = []
+
+      unmerged.each do |file|
+        resolved_file = (/Resolved '#{file}' using previous resolution./m =~ error_message)
+        resolved_files << file if resolved_file
+      end
+
+      resolved_files.sort
+    end
+
+
+    def human_message
+      msg = 'There was a problem merging.'
+
+      resolved_files.each do |file|
+        if modified.include? file
+          msg << "\n'#{file}' was modified in both branches, and 'rerere' automatically resolved it."
+        end
+      end
+
+      unless lib.rerere_enabled?
+        msg << "\n\nConsider turning on 'rerere'.\nSee http://git-scm.com/2010/03/08/rerere.html for more information."
+      end
+
+      unresolved_files.each do |file|
+        if modified.include? file
+          msg << "\n'#{file}' was modified in both branches."
+        end
+      end
+
+      msg
+    end
+
+
+    def build_commands
+      commands = []
+
+      commands << 'git config --global rerere.enabled true' unless lib.rerere_enabled?
+
+      resolved_files.each do |file|
+        commands << "# Verify that 'rerere' did the right thing for '#{file}'."
+      end
+
+      unless resolved_files.empty? or lib.rerere_autoupdate?
+        escaped_files = shell_escaped_files(resolved_files)
+        commands << "git add #{escaped_files}"
+      end
+
+      unless unresolved_files.empty?
+        mergeable = unresolved_files & modified
+        commands << "git mergetool #{shell_escaped_files(mergeable)}" unless mergeable.empty?
+        mergeable.each do |f|
+          commands << "# Verify '#{f}' merged correctly."
+        end
+        (unresolved_files & added).each do |f|
+          commands << "# '#{f}' was added in both branches; Fix the conflict."
+        end
+        commands << "git add #{shell_escaped_files(unresolved_files)}"
+      end
+
+      commands << continue_command if continue_command
+
+      commands
+    end
+
+
+    attr_writer :unmerged, :added, :deleted, :modified
+
+
+    def unmerged
+      @unmerged ||= lib.status.unmerged
+    end
+
+
+    def added
+      @added ||= lib.status.added
+    end
+
+
+    def deleted
+      @deleted ||= lib.status.deleted
+    end
+
+
+    def modified
+      @modified ||= lib.status.modified
+    end
+
+  end
+
+end

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

@@ -0,0 +1,86 @@
+module Git
+
+  class GitBranch
+    include Comparable
+
+    attr_reader :name
+
+    def initialize(name, current, lib)
+      if (/^remotes\// =~ name)
+        @name = name[8..-1]
+        @remote = true
+      else
+        @name = name
+        @remote = false
+      end
+      @current = current
+      @lib = lib
+    end
+
+
+    def current?
+      @current
+    end
+
+
+    def remote?
+      @remote
+    end
+
+
+    def local?
+      !@remote
+    end
+
+
+    def to_s
+      name
+    end
+
+
+    def logger
+      @lib.logger
+    end
+
+
+    def sha
+      @sha ||= @lib.sha(name)
+    end
+
+
+    def <=>(other)
+      self.name <=> other.name
+    end
+
+
+    def is_ahead_of(base_branch_name)
+      @lib.rev_list(base_branch_name, @name, :oneline => true, :num_revs => 1) != ''
+    end
+
+
+    def delete(force = false)
+      if local?
+        @lib.branch(@name, :force => force, :delete => true)
+      else
+        @lib.push(Process.server_name, nil, nil, :delete => @name)
+      end
+    end
+
+
+    def rename(new_name)
+      @lib.branch(@name, :rename => new_name)
+    end
+
+
+    def contains_all_of(branch_name)
+      @lib.rev_list(@name, branch_name, :oneline => true, :num_revs => 1) == ''
+    end
+
+
+    def checkout_to_new(new_branch, opts = {})
+      @lib.checkout(new_branch, :new_branch => @name, :no_track => opts[:no_track])
+    end
+
+  end
+
+end

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

@@ -0,0 +1,53 @@
+require 'git-branch'
+
+module Git
+
+  class GitBranches
+    include Enumerable
+
+    def initialize(lib)
+      branch_lines = lib.branch(nil, :all => true, :no_color => true).split("\n")
+      @items = SortedSet.new
+      branch_lines.each do |bl|
+        @items << GitBranch.new(bl[2..-1], bl[0..0] == '*', lib)
+      end
+    end
+
+
+    def <<(item)
+      @items << item
+    end
+
+
+    def each(&block)
+      @items.each {|b| block.call(b)}
+    end
+
+
+    def names
+      @items.map {|b| b.name}
+    end
+
+
+    def current
+      @items.find {|b| b.current? }
+    end
+
+
+    def parking
+      @items.find {|b| b.name == '_parking_' }
+    end
+
+
+    def include?(branch_name)
+      @items.find {|b| b.name == branch_name} != nil
+    end
+
+
+    def [](branch_name)
+      @items.find {|b| b.name == branch_name}
+    end
+
+  end
+
+end