git-utils 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2faeb0fba87e36f531addf4afed6971f1edf3aca
+  data.tar.gz: c74f6c8870f6f05b34976ebf29ce7803afebf1f4
+SHA512:
+  metadata.gz: 2bb21163ca18e41b1695b00da352c8d259cd1f3b0e2db93feed285021ef44607c2b63f25063643cd601708356dbd140f651a92cbe9c4ad26da807c6acfe2541b
+  data.tar.gz: c0efe25871d671007427bf3cb2d28427f16a03d59b7086d768b046b2d513e1f7b0358a7be08d9847f8135b2927bcf22872f48f4a7597088701260e615fd18cb9

data/.gitignore

@@ -0,0 +1,21 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.rvmrc
+.DS_Store
+.api_token
+.project_id

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-gemset

@@ -0,0 +1 @@
+pivotal-github

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+ruby '2.0.0'
+
+gem 'rspec', '~> 2.13.0'
+
+gemspec

data/LICENSE.txt

@@ -0,0 +1,23 @@
+Copyright (c) 2013 Michael Hartl
+Copyright (c) 2013 Aleksandar Simic
+
+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,85 @@
+# Git utilities
+
+This repo contains some Git utility scripts. The highlights are `git open`, `git pull-request`, `git push-branch`, and `git undo`, which you'll never understand how you did without.
+
+The commands are especially useful when combined with [`pivotal-github`](https://github.com/mhartl/git-utils) gem (which, despite its name, also works with Bitbucket).
+
+The `git-utils` used to be pure Bash scripts, but they are now available as a Ruby gem, both because Ruby is more powerful than bash and because now `git-utils` can be included more easily as a dependency for the [`pivotal-github`](https://github.com/mhartl/pivotal-github/) gem. As a result, installation is easy if you have RubyGems installed:
+
+    gem install git-utils
+
+## Commands
+
+* `git amend`: alias for `git commit --amend`
+* `git anal` (use with caution): makes a commit with the message "Make anal changes"
+* `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `staging`, and `development`)
+* `git merge-branch [branch]`: merges current branch into given branch (defaults to `master`)
+* `git open`: opens the remote page for the repo (OS X only)
+* `git polish`: makes a commit with the message "Polish"
+* `git pull-request`: opens the remote page for issuing a new a pull request (OS X only)
+* `git push-branch`: pushes the current branch up to origin
+* `git delete-remote-branch <branch>`: deletes the remote branch if it is safe to do so
+* `git switch <pattern>`: switches to the first branch matching the given pattern
+* `git sync`: syncs the local master with remote
+* `git undo`: undoes the last commit
+
+## Aliases
+
+Here are some suggested aliases:
+
+    git config --global alias.mb merge-branch
+    git config --global alias.pr pull-request
+    git config --global alias.pb push-branch
+
+## Further details
+
+Some of these commands deserve further explanation.
+
+### git merge-branch
+
+`git merge-branch [target]` merges the current branch into the target branch (defaults to `master`). On a branch called `add-markdown-support`, `git merge-branch` is equivalent to the following:
+
+    $ git checkout master
+    $ git merge --no-ff --log add-markdown-support
+
+Note that this effectively changes the default merge behavior from fast-forward to no-fast-forward, which makes it possible to use `git log` to see which of the commit objects together have implemented a feature on a particular branch. As noted in [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/),
+
+> The `--no-ff` flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature… Yes, it will create a few more (empty) commit objects, but the gain is much bigger than that cost.
+
+In addition, the `--log` option puts the commit messages from the individual commits in the merge message, which is especially useful for viewing the full diff represented by the commit.
+
+These options can be overriden (and thus restored to their defaults) by passing the options `-ff` or `--no-log`. `git merge-branch` accepts any options valid for `git merge`.
+
+### git push-branch
+
+`git push-branch` creates a remote branch at `origin` with the name of the current branch:
+
+    $ git branch-push
+    * [new branch]      add-markdown-support -> add-markdown-support
+
+`git push-branch` accepts any options valid for `git push`.
+
+
+### git sync
+
+`git sync` syncs the local `master` with the remote `master`. On a branch called `add-markdown-support`, `git sync` is equivalent to the following:
+
+    $ git checkout master
+    $ git pull
+    $ git checkout add-markdown-support
+
+The purpose of `git sync` is to prepare the current branch for rebasing against `master`:
+
+    $ git sync
+    $ git rebase master
+
+(This is essentially equivalent to
+
+    $ git fetch
+    $ git rebase origin/master
+
+but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
+
+## Installation
+
+    gem install git-utils

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/git-amend

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Opens the last commit message for editing.
+system 'git commit --amend'

data/bin/git-anal

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Makes anal changes.
+system 'git commit -am "Make anal changes"'

data/bin/git-cleanup

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+# Deletes (almost) every branch already merged into current branch.
+# Exceptions are `master`, `staging`, and `development`, and the current
+# branch, which are preserved.
+preserved = "(master|staging|development)"
+cmd  = %(git branch --merged | grep -v "\*" | egrep -v "#{preserved}" | )
+cmd += 'xargs -n 1 git branch -d'
+system cmd

data/bin/git-delete-remote-branch

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/delete_remote_branch'
+
+# Deletes the remote branch on origin if it is safe to do so.
+exit Command.run!(DeleteRemoteBranch, ARGV.dup)

data/bin/git-merge-branch

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/merge_branch'
+
+# Merges the current branch into the given branch (defaults to master).
+# E.g., 'git merge-branch foobar' merges the current branch into foobar.
+# 'git merge-branch', merges the current branch into master.
+# git merge-branch uses the --no-ff --log options to ensure that the
+# merge creates a new commit object and that the individual commits appear
+# in the log file.
+exit Command.run!(MergeBranch, ARGV.dup)

data/bin/git-open

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/open'
+
+# Opens the remote page for the repo (OS X only).
+exit Command.run!(Open, ARGV.dup)

data/bin/git-polish

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Makes a commit with the message 'Polish'
+system 'git commit -am "Polish"'

data/bin/git-pull-request

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/pull_request'
+
+# Opens the remote page for issuing a new pull request.
+exit Command.run!(PullRequest, ARGV.dup)

data/bin/git-push-branch

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/push_branch'
+
+# Pushes the current branch to origin.
+exit Command.run!(PushBranch, ARGV.dup)
+

data/bin/git-switch

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/switch'
+
+# Switches to the first branch matching the given pattern.
+# E.g., 'git switch foobar' switches to 'the-foobar-branch'.
+exit Command.run!(Switch, ARGV.dup)

data/bin/git-sync

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/sync'
+
+# Syncs the local master branch with remote.
+exit Command.run!(Sync, ARGV.dup)

data/bin/git-undo

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Undoes the last commit and places the changes back in the staging area.
+system 'git reset --soft HEAD^''

data/git-utils.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git-utils/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "git-utils"
+  gem.version       = Git::Utils::VERSION
+  gem.authors       = ["Michael Hartl"]
+  gem.email         = ["michael@michaelhartl.com"]
+  gem.description   = %q{Add some Git utilities}
+  gem.summary       = %q{See the README for full documentation}
+  gem.homepage      = "https://github.com/mhartl/git-utils"
+  gem.license       = "MIT"
+
+  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.require_paths = ["lib"]
+end

data/lib/git-utils.rb

@@ -0,0 +1,10 @@
+require "git-utils/version"
+require "git-utils/options"
+require "git-utils/command"
+require "git-utils/merge_branch"
+require "git-utils/open"
+require "git-utils/delete_remote_branch"
+require "git-utils/push_branch"
+require "git-utils/switch"
+require "git-utils/sync"
+require "git-utils/pull_request"

data/lib/git-utils/command.rb

@@ -0,0 +1,100 @@
+require 'optparse'
+require 'ostruct'
+require 'git-utils/options'
+
+class Command
+  attr_accessor :args, :cmd, :options, :known_options, :unknown_options
+
+  def initialize(args = [])
+    self.args = args
+    self.options = OpenStruct.new
+    parse
+  end
+
+  def parse
+    self.known_options   = Options::known_options(parser, args)
+    self.unknown_options = Options::unknown_options(parser, args)
+    parser.parse!(known_options)
+  end
+
+  def parser
+    OptionParser.new
+  end
+
+  # Returns the current Git branch.
+  def current_branch
+    @current_branch ||= `git rev-parse --abbrev-ref HEAD`.strip
+  end
+
+  # Returns the URL for the remote origin.
+  def origin_url
+    @origin_url ||= `git config --get remote.origin.url`.strip
+  end
+
+
+
+  # Returns the name of the repository service.
+  # It's currently GitHub, Bitbucket, or Stash.
+  # We return blank for an unknown service; the command will still
+  # often work in that case.
+  def service
+    if origin_url =~ /github/i
+      'github'
+    elsif origin_url =~ /bitbucket/i
+      'bitbucket'
+    elsif origin_url =~ /stash/i
+      'stash'
+    else
+      ''
+    end
+  end
+
+  # Returns the protocol of the origin URL (defaults to ssh).
+  def protocol
+    if origin_url =~ /https?:\/\//
+      'http'
+    else
+      'ssh'
+    end
+  end
+
+  # Runs a command.
+  # If the argument array contains '--debug', returns the command that would
+  # have been run.
+  def self.run!(command_class, args)
+    debug = args.delete('--debug')
+    command = command_class.new(args)
+    if debug
+      puts command.cmd
+      return 1
+    else
+      command.run!
+      return 0
+    end
+  end
+
+  def run!
+    system cmd
+  end
+
+  private
+
+    # Returns an argument string based on given arguments.
+    # The main trick is to add in quotes for option
+    # arguments when necessary.
+    # For example, ['-a', '-m', 'foo bar'] becomes
+    # '-a -m "foo bar"'
+    def argument_string(args)
+      args.inject([]) do |opts, opt|
+        opts << (opt =~ /^-/ ? opt : opt.inspect)
+      end.join(' ')
+    end
+
+    def finish?
+      options.finish
+    end
+
+    def deliver?
+      options.deliver
+    end
+end

data/lib/git-utils/delete_remote_branch.rb

@@ -0,0 +1,41 @@
+require 'git-utils/command'
+
+class DeleteRemoteBranch < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git delete-remote-branch <branch>"
+      opts.on("-o", "--override", "override unsafe delete") do |opt|
+        self.options.override = opt
+      end
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  def delete_safely?
+    command = "git log ..origin/#{target_branch} 2> /dev/null"
+    system(command) && !`#{command}`.strip.empty?
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    if delete_safely? || options.override
+      c = ["git push origin :#{target_branch}"]
+      c << argument_string(unknown_options) unless unknown_options.empty?
+      c.join("\n")
+    else
+      $stderr.puts "Target branch contains unmerged commits."
+      $stderr.puts "Please cherry-pick the commits or merge the branch again."
+      $stderr.puts "Use -o or --override to override."
+    end
+  end
+
+  private
+
+    # Returns the name of the branch to be deleted.
+    def target_branch
+      self.known_options.first
+    end
+end

data/lib/git-utils/merge_branch.rb

@@ -0,0 +1,35 @@
+require 'git-utils/command'
+
+class MergeBranch < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git merge-branch [branch] [options]"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns a command appropriate for executing at the command line
+  # For example:
+  #   git checkout master
+  #   git merge --no-ff --log <branch>
+  def cmd
+    lines = ["git checkout #{target_branch}"]
+    c = ["git merge --no-ff --log"]
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c << current_branch
+    lines << c.join(' ')
+    lines.join("\n")
+  end
+
+  private
+
+    # Returns the name of the branch to be merged into.
+    # If there is anything left in the known options after parsing,
+    # that's the merge branch. Otherwise, it's master.
+    def target_branch
+      self.known_options.first || 'master'
+    end
+end

data/lib/git-utils/open.rb

@@ -0,0 +1,40 @@
+require 'git-utils/command'
+
+class Open < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git open"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns the URL for the repository page.
+  def page_url
+    if service == 'stash' && protocol == 'ssh'
+      pattern = /(.*)@([^:]*):?([^\/]*)\/([^\/]*)\/(.*)\.git/
+      replacement = 'https://\2/projects/\4/repos/\5/browse?at=' +
+                    current_branch
+    elsif service == 'stash' && protocol == 'http'
+      pattern = /(.*)@([^:\/]*)(:?[^\/]*)\/(.*)scm\/([^\/]*)\/(.*)\.git/
+      replacement = 'https://\2\3/\4projects/\5/repos/\6/browse?at=' +
+                    current_branch
+    elsif protocol == 'ssh'
+      pattern = /(.*)@(.*):(.*)\.git/
+      replacement = 'https://\2/\3/'
+    elsif protocol == 'http'
+      pattern = /https?\:\/\/(([^@]*)@)?(.*)\.git/
+      replacement = 'https://\3/'
+    end
+    origin_url.sub(pattern, replacement)
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    c = ["open #{page_url}"]
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c.join("\n")
+  end
+end

data/lib/git-utils/options.rb

@@ -0,0 +1,39 @@
+require 'optparse'
+
+module Options
+
+  # Returns a list of options unknown to a particular options parser
+  # For example, if '-a' is a known option but '-b' and '-c' are not,
+  # unknown_options(parser, ['-a', '-b', '-c']) returns ['-b', '-c'].
+  # It also preserves arguments, so 
+  # unknown_options(parser, ['-a', '-b', '-c', 'foo bar']) returns 
+  # ['-b', '-c', 'foo bar'].
+  def self.unknown_options(parser, args)
+    unknown = []                                     
+    recursive_parse = Proc.new do |arg_list|                   
+      begin
+        # Hack to handle an unknown '-ff' argument
+        # The issue here is that OptParse interprets '-ff' as a '-f' option
+        # applied twice. This is sort-of a feature, as it allows, e.g., '-am'
+        # to set both the '-a' and '-m' options, but it interacts badly
+        # with '-ff' (as used by 'git merge') when '-f' is one of the options.
+        unknown << arg_list.delete('-ff') if arg_list.include?('-ff')
+        parser.parse!(arg_list)
+      rescue OptionParser::InvalidOption => e
+        unknown.concat(e.args)
+        while !arg_list.empty? && arg_list.first[0] != "-"
+          unknown << arg_list.shift
+        end
+        recursive_parse.call(arg_list)
+      end
+    end
+    recursive_parse.call(args.dup)
+    unknown
+  end
+
+  # Returns a list of options with unknown options removed
+  def self.known_options(parser, args)
+    unknown = unknown_options(parser, args)
+    args.reject { |arg| unknown.include?(arg) }
+  end
+end

data/lib/git-utils/pull_request.rb

@@ -0,0 +1,46 @@
+require 'git-utils/command'
+
+class PullRequest < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git pull-request"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns the URL for a new pull request.
+  def new_pr_url
+    if service == 'stash' && protocol == 'ssh'
+      pattern = /(.*)@([^:]*):?([^\/]*)\/([^\/]*)\/(.*)\.git/
+      replacement = 'https://\2/projects/\4/repos/\5/pull-requests?create&sourceBranch=' +
+                    current_branch
+    elsif service == 'stash' && protocol == 'http'
+      pattern = /(.*)@([^:\/]*)(:?[^\/]*)\/(.*)scm\/([^\/]*)\/(.*)\.git/
+      replacement = 'https://\2\3/\4projects/\5/repos/\6/pull-requests?create&sourceBranch=' +
+                    current_branch
+    elsif service == 'github' && protocol == 'ssh'
+      pattern = /(.*)@(.*):(.*)\.git/
+      replacement = 'https://\2/\3/pull/new/' + current_branch
+    elsif service == 'github' && protocol == 'http'
+      pattern = /https?\:\/\/(([^@]*)@)?(.*)\.git/
+      replacement = 'https://\3/pull/new/' + current_branch
+    elsif service == 'bitbucket' && protocol == 'ssh'
+      pattern = /(.*)@(.*):(.*)\.git/
+      replacement = 'https://\2/\3/pull-request/new/'
+    elsif service == 'bitbucket' && protocol == 'http'
+      pattern = /https?\:\/\/(([^@]*)@)?(.*)\.git/
+      replacement = 'https://\3/pull-request/new/'
+    end
+    origin_url.sub(pattern, replacement)
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    c = ["open #{new_pr_url}"]
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c.join("\n")
+  end
+end

data/lib/git-utils/push_branch.rb

@@ -0,0 +1,20 @@
+require 'git-utils/command'
+
+class PushBranch < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git push-branch"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    c = ["git push origin #{current_branch}"]
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c.join("\n")
+  end
+end

data/lib/git-utils/switch.rb

@@ -0,0 +1,33 @@
+require 'git-utils/command'
+
+class Switch < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git switch <pattern>"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns the branch to switch to.
+  def other_branch
+    @other_branch ||= `git branch | grep #{pattern}`.strip
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    c = ["git checkout #{other_branch}"]
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c.join("\n")
+  end
+
+  private
+
+    # Returns the pattern of the branch to switch to.
+    def pattern
+      self.known_options.first
+    end
+
+end

data/lib/git-utils/sync.rb

@@ -0,0 +1,22 @@
+require 'git-utils/command'
+
+class Sync < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git sync"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns a command appropriate for executing at the command line
+  def cmd
+    c = ["git checkout master"]
+    c << "git pull"
+    c << "git checkout #{current_branch}"
+    c << argument_string(unknown_options) unless unknown_options.empty?
+    c.join("\n")
+  end
+end

data/lib/git-utils/version.rb

@@ -0,0 +1,5 @@
+module Git
+  module Utils
+    VERSION = "0.1.0"
+  end
+end

data/spec/commands/command_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Command do
+  let(:command) { Command.new }
+  subject { command }
+
+  it { should respond_to(:cmd) }
+  it { should respond_to(:args) }
+  it { should respond_to(:options) }
+  it { should respond_to(:parse) }
+end

data/spec/commands/delete_remote_branch_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe DeleteRemoteBranch do
+
+  let(:command) { DeleteRemoteBranch.new(['remote_branch']) }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+    command.stub(:delete_safely?).and_return(true)
+  end
+  subject { command }
+
+  its(:cmd) { should match /git push origin :remote_branch/ }
+
+  describe "command-line command" do
+    subject { `bin/git-delete-remote-branch foobar -o --debug` }
+    it { should match /git push origin/ }
+  end
+end

data/spec/commands/merge_branch_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe MergeBranch do
+
+  let(:command) { MergeBranch.new }
+  before { command.stub(:current_branch).and_return('tau-manifesto') }
+  subject { command }
+
+  its(:cmd) { should match /git merge/ }
+
+  shared_examples "merge-branch with known options" do
+    subject { command }
+    it "should not raise an error" do
+      expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
+    end
+  end
+
+  describe "with no options" do
+    its(:cmd) { should match /git checkout master/ }
+  end
+
+  describe "with a custom development branch" do
+    let(:command) { MergeBranch.new(['development']) }
+    its(:cmd) { should match /git checkout development/ }
+  end
+
+  describe "with some unknown options" do
+    let(:command) { MergeBranch.new(['dev', '-o', '-a', '-z', '--foo']) }
+    it_should_behave_like "merge-branch with known options"
+    its(:cmd) { should match /-a -z --foo/ }
+  end
+
+  describe "command-line command" do
+    subject { `bin/git-merge-branch --debug development` }
+    it { should match /git checkout development/ }
+    it { should match /git merge --no-ff --log/ }
+  end
+end

data/spec/commands/open_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Open do
+
+  let(:command) { Open.new }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+  end
+  subject { command }
+
+  its(:cmd) { should match /open #{command.page_url}/ }
+
+  it "should have the right page URLs" do
+    urls = %w[
+https://mwatson@bitbucket.org/atlassian/amps.git https://bitbucket.org/atlassian/amps
+git@bitbucket.org:atlassian/amps.git https://bitbucket.org/atlassian/amps
+git@github.com:mhartl/git-utils.git https://github.com/mhartl/git-utils
+https://github.com/mhartl/git-utils.git https://github.com/mhartl/git-utils
+ssh://git@stash.atlassian.com:7999/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+https://mwatson@stash.atlassian.com:7990/scm/stash/stash.git https://stash.atlassian.com:7990/projects/stash/repos/stash/browse?at=test-br
+ssh://git@stash.atlassian.com/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+https://mwatson@stash.atlassian.com/scm/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+https://mwatson@stash.atlassian.com/stash/scm/stash/stash.git https://stash.atlassian.com/stash/projects/stash/repos/stash/browse?at=test-br
+https://mwatson@stash.atlassian.com:7990/stash/scm/stash/stash.git https://stash.atlassian.com:7990/stash/projects/stash/repos/stash/browse?at=test-br
+https://example.com/repos/foobar.git https://example.com/repos/foobar
+    ]
+    urls.each_slice(2) do |origin_url, page_url|
+      command.stub(:origin_url).and_return(origin_url)
+      expect(command.page_url).to include page_url
+    end
+  end
+
+  describe "command-line command" do
+    subject { `bin/git-open --debug` }
+    it { should match /open/ }
+  end
+end

data/spec/commands/pull_request_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe PullRequest do
+
+  let(:command) { PullRequest.new }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+  end
+  subject { command }
+
+  its(:cmd) { should match /open #{command.new_pr_url}/ }
+
+  it "should have the right pull request URLs" do
+    urls = %w[
+https://mwatson@bitbucket.org/atlassian/amps.git https://bitbucket.org/atlassian/amps/pull-request/new
+git@bitbucket.org:atlassian/amps.git https://bitbucket.org/atlassian/amps/pull-request/new
+git@github.com:mhartl/git-utils.git https://github.com/mhartl/git-utils/pull/new/test-br
+https://github.com/mhartl/git-utils.git https://github.com/mhartl/git-utils/pull/new/test-br
+ssh://git@stash.atlassian.com:7999/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+https://mwatson@stash.atlassian.com:7990/scm/stash/stash.git https://stash.atlassian.com:7990/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+ssh://git@stash.atlassian.com/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+https://mwatson@stash.atlassian.com/scm/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+https://mwatson@stash.atlassian.com/stash/scm/stash/stash.git https://stash.atlassian.com/stash/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+https://mwatson@stash.atlassian.com:7990/stash/scm/stash/stash.git https://stash.atlassian.com:7990/stash/projects/stash/repos/stash/pull-requests?create&sourceBranch=test-br
+    ]
+
+    urls.each_slice(2) do |origin_url, new_pr_url|
+      command.stub(:origin_url).and_return(origin_url)
+      expect(command.new_pr_url).to include new_pr_url
+    end
+  end
+
+
+  describe "command-line command" do
+    subject { `bin/git-pull-request --debug` }
+    it { should match /open/ }
+  end
+end

data/spec/commands/push_branch_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe PushBranch do
+
+  let(:command) { PushBranch.new(['remote_branch']) }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+  end
+  subject { command }
+
+  its(:cmd) { should match /git push origin #{command.current_branch}/ }
+
+  describe "command-line command" do
+    subject { `bin/git-push-branch --debug` }
+    it { should match /git push origin/ }
+  end
+end

data/spec/commands/switch_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Switch do
+
+  let(:command) { Switch.new(['other-branch']) }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+    command.stub(:other_branch).and_return('other-branch')
+  end
+  subject { command }
+
+  its(:cmd) { should match /git checkout #{command.other_branch}/ }
+
+  describe "command-line command" do
+    subject { `bin/git-push-branch --debug` }
+    it { should match /git push origin/ }
+  end
+end

data/spec/commands/sync_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Sync do
+
+  let(:command) { Sync.new }
+  before do
+    command.stub(:current_branch).and_return('test-br')
+  end
+  subject { command }
+
+  its(:cmd) { should match /git checkout master/ }
+  its(:cmd) { should match /git pull/ }
+  its(:cmd) { should match /git checkout #{command.current_branch}/ }
+
+  describe "command-line command" do
+    subject { `bin/git-sync --debug` }
+    it { should match /git checkout master/ }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'git-utils'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Disallow the old-style 'object.should' syntax.
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

data/test-open-pr.sh

@@ -0,0 +1,71 @@
+#!/usr/bin/env ruby
+
+git init test-repo >/dev/null
+cd test-repo
+git checkout -b test-br 2>/dev/null
+touch foo
+git add foo
+git commit -m "foo" >/dev/null
+cat > open <<EOF
+#!/usr/bin/env ruby
+
+echo \$*
+EOF
+chmod +x open
+cat > git-push-branch <<EOF
+#!/usr/bin/env ruby
+EOF
+chmod +x git-push-branch
+export PATH=`pwd`:$PATH
+git remote add origin foo
+
+test_open () {
+  REMOTE=$1
+  EXPECTED=$2
+  git remote set-url origin $REMOTE
+  RESULT=`../git-open`
+  if [ "$RESULT" = "$EXPECTED" ]
+  then
+    echo "passed: open $REMOTE"
+  else
+    echo "FAILED: open: Expected $EXPECTED (for origin $REMOTE) but got $RESULT"
+  fi
+}
+
+test_open https://mwatson@bitbucket.org/atlassian/amps.git https://bitbucket.org/atlassian/amps
+test_open git@bitbucket.org:atlassian/amps.git https://bitbucket.org/atlassian/amps
+test_open git@github.com:mhartl/git-utils.git https://github.com/mhartl/git-utils
+test_open https://github.com/mhartl/git-utils.git https://github.com/mhartl/git-utils
+test_open ssh://git@stash.atlassian.com:7999/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+test_open https://mwatson@stash.atlassian.com:7990/scm/stash/stash.git https://stash.atlassian.com:7990/projects/stash/repos/stash/browse?at=test-br
+test_open ssh://git@stash.atlassian.com/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+test_open https://mwatson@stash.atlassian.com/scm/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/browse?at=test-br
+test_open https://mwatson@stash.atlassian.com/stash/scm/stash/stash.git https://stash.atlassian.com/stash/projects/stash/repos/stash/browse?at=test-br
+test_open https://mwatson@stash.atlassian.com:7990/stash/scm/stash/stash.git https://stash.atlassian.com:7990/stash/projects/stash/repos/stash/browse?at=test-br
+
+test_pr () {
+  REMOTE=$1
+  EXPECTED=$2
+  git remote set-url origin $REMOTE
+  RESULT=`../git-pull-request`
+  if [ "$RESULT" = "$EXPECTED" ]
+  then
+    echo "passed: pull-request $REMOTE"
+  else
+    echo "FAILED: pull-request: Expected $EXPECTED (for origin $REMOTE) but got $RESULT"
+  fi
+}
+
+test_pr https://mwatson@bitbucket.org/atlassian/amps.git https://bitbucket.org/atlassian/amps/pull-request/new
+test_pr git@bitbucket.org:atlassian/amps.git https://bitbucket.org/atlassian/amps/pull-request/new
+test_pr git@github.com:mhartl/git-utils.git https://github.com/mhartl/git-utils/pull/new/test-br
+test_pr https://github.com/mhartl/git-utils.git https://github.com/mhartl/git-utils/pull/new/test-br
+test_pr ssh://git@stash.atlassian.com:7999/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+test_pr https://mwatson@stash.atlassian.com:7990/scm/stash/stash.git https://stash.atlassian.com:7990/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+test_pr ssh://git@stash.atlassian.com/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+test_pr https://mwatson@stash.atlassian.com/scm/stash/stash.git https://stash.atlassian.com/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+test_pr https://mwatson@stash.atlassian.com/stash/scm/stash/stash.git https://stash.atlassian.com/stash/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+test_pr https://mwatson@stash.atlassian.com:7990/stash/scm/stash/stash.git https://stash.atlassian.com:7990/stash/projects/stash/repos/stash/pull-requests?create\&sourceBranch=test-br
+
+cd ..
+rm -rf test-repo

metadata

@@ -0,0 +1,114 @@
+--- !ruby/object:Gem::Specification
+name: git-utils
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Michael Hartl
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-06-19 00:00:00.000000000 Z
+dependencies: []
+description: Add some Git utilities
+email:
+- michael@michaelhartl.com
+executables:
+- git-amend
+- git-anal
+- git-cleanup
+- git-delete-remote-branch
+- git-merge-branch
+- git-open
+- git-polish
+- git-pull-request
+- git-push-branch
+- git-switch
+- git-sync
+- git-undo
+extensions: []
+extra_rdoc_files: []
+files:
+- .DS_Store
+- .gitignore
+- .project_id
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-amend
+- bin/git-anal
+- bin/git-cleanup
+- bin/git-delete-remote-branch
+- bin/git-merge-branch
+- bin/git-open
+- bin/git-polish
+- bin/git-pull-request
+- bin/git-push-branch
+- bin/git-switch
+- bin/git-sync
+- bin/git-undo
+- git-utils.gemspec
+- lib/git-utils.rb
+- lib/git-utils/command.rb
+- lib/git-utils/delete_remote_branch.rb
+- lib/git-utils/merge_branch.rb
+- lib/git-utils/open.rb
+- lib/git-utils/options.rb
+- lib/git-utils/pull_request.rb
+- lib/git-utils/push_branch.rb
+- lib/git-utils/switch.rb
+- lib/git-utils/sync.rb
+- lib/git-utils/version.rb
+- spec/.DS_Store
+- spec/commands/.DS_Store
+- spec/commands/command_spec.rb
+- spec/commands/delete_remote_branch_spec.rb
+- spec/commands/merge_branch_spec.rb
+- spec/commands/open_spec.rb
+- spec/commands/pull_request_spec.rb
+- spec/commands/push_branch_spec.rb
+- spec/commands/switch_spec.rb
+- spec/commands/sync_spec.rb
+- spec/spec_helper.rb
+- test-open-pr.sh
+homepage: https://github.com/mhartl/git-utils
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
+summary: See the README for full documentation
+test_files:
+- spec/.DS_Store
+- spec/commands/.DS_Store
+- spec/commands/command_spec.rb
+- spec/commands/delete_remote_branch_spec.rb
+- spec/commands/merge_branch_spec.rb
+- spec/commands/open_spec.rb
+- spec/commands/pull_request_spec.rb
+- spec/commands/push_branch_spec.rb
+- spec/commands/switch_spec.rb
+- spec/commands/sync_spec.rb
+- spec/spec_helper.rb