git-extras 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5ba92b639627411f03a70fb68d6224f2a3b1b78
+  data.tar.gz: 9a35848a79d382eb4b558561baadba3050731b02
+SHA512:
+  metadata.gz: ec9c52981ed131cb97169f2a807a32f3e4b7cd9e1397ed634102a86d3915057a03a85643219eb0a33edfe54f52234fc7befc585f9f43befe85a87686ed0cc65c
+  data.tar.gz: 74d2dda77f0a1e0b386c4f356e343cfb91f77ee234bce9fd67364e75a07bb54db11c3f2e681ce40ee1ac5316e54d507aaf376fa800b25083dc1dc3f40fe0aa69

data/.gitignore

@@ -0,0 +1 @@
+pkg/

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    git-extras (0.1.0)
+      faker
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    faker (1.6.6)
+      i18n (~> 0.5)
+    i18n (0.7.0)
+    rake (11.2.2)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  git-extras!
+  rake
+
+BUNDLED WITH
+   1.12.5

data/Rakefile

@@ -0,0 +1,5 @@
+require "bundler/gem_tasks"
+
+task default: [
+  :release,
+]

data/bin/git-bump

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+p ARGV
+# version=ARGV[1]
+bump    = "!f(){ git bump $(git ltag);};f"
+

data/bin/git-commitment

@@ -0,0 +1,295 @@
+#!/usr/bin/env ruby
+line = DATA.readlines.sample
+name = ['Nick', 'Andy', 'Steve', 'Sarah', 'Jason', 'Todd'].sample
+puts line.sub('{{Name}}', name).sub('{{UPPER}}', name.upcase)
+
+__END__
+{{UPPER}}, WE WENT OVER THIS. EXPANDTAB.
+{{UPPER}}, WE WENT OVER THIS. C++ IO SUCKS.
+This is the last time we let {{Name}} commit ascii porn in the comments.
+de-misunderestimating
+Some shit.
+add actual words
+I CAN HAZ COMMENTZ.
+giggle.
+Whatever.
+Finished fondling.
+FONDLED THE CODE
+this is how we generate our shit.
+unh
+It works!
+unionfind is no longer being molested.
+Well, it's doing something.
+I'M PUSHING.
+Whee.
+Whee, good night.
+It'd be nice if type errors caused the compiler to issue a type error
+Fucking templates.
+I hate this fucking language.
+marks
+that coulda been bad
+hoo boy
+It was the best of times, it was the worst of times
+Fucking egotistical bastard. adds expandtab to vimrc
+if you're not using et, fuck off
+WHO THE FUCK CAME UP WITH MAKE?
+This is a basic implementation that works.
+By works, I meant 'doesnt work'.  Works now..
+Last time I said it works? I was kidding.  Try this.
+Just stop reading these for a while, ok..
+Give me a break, it's 2am.  But it works now.
+Make that it works in 90% of the cases.  3:30.
+Ok, 5am, it works.  For real.
+FOR REAL.
+I don't know what these changes are supposed to accomplish but somebody told me to make them.
+I don't get paid enough for this shit.
+fix some fucking errors
+first blush
+So my boss wanted this button ...
+uhhhhhh
+forgot we're not using a smart language
+include shit
+To those I leave behind, good luck!
+things occurred
+i dunno, maybe this works
+8==========D
+No changes made
+whooooooooooooooooooooooooooo
+clarify further the brokenness of C++. why the fuck are we using C++?
+(\ /)\n(O.o)\n(> <) Bunny approves these changes.
+.
+Friday 5pm
+changes
+A fix I believe, not like I tested or anything
+Useful text
+pgsql is being a pain
+pgsql is more strict, increase the hackiness up to 11
+c&p fail
+syntax
+{{Name}} sucks
+{{UPPER}} SUCKS
+fix
+just shoot me
+arrrggghhhhh fixed!
+someone fails and it isn't me
+Gross hack because {{Name}} doesn't know how to code
+totally more readable
+better grepping
+fix
+fix bug, for realz
+fix /sigh
+Does this work
+MOAR BIFURCATION
+bifurcation
+REALLY FUCKING FIXED
+FIX
+better ignores
+More ignore
+more ignores
+more ignored words
+more fixes
+really ignore ignored worsd
+fixes
+/sigh
+fix
+fail
+pointless limitation
+eppic fail {{Name}}
+omg what have I done?
+added super-widget 2.0.
+tagging release w.t.f.
+I can't believe it took so long to fix this.
+I must have been drunk.
+This is why the cat shouldn't sit on my keyboard.
+This is why git rebase is a horrible horrible thing.
+ajax-loader hotness, oh yeah
+{{Name}} broke the regex, lame
+small is a real HTML tag, who knew.
+WTF is this.
+Do things better, faster, stronger
+Fixed a bug cause {{Name}} said to
+Use a real JS construct, WTF knows why this works in chromium.
+Added a banner to the default admin page. Please have mercy on me =(
+needs more cow bell
+Switched off unit test X because the build had to go out now and there was no time to fix it properly.
+Updated
+I must sleep... it's working... in just three hours...
+I was wrong...
+Completed with no bugs...
+Fixed a little bug...
+Fixed a bug in NoteLineCount... not seriously...
+woa!! this one was really HARD!
+Made it to compile...
+changed things...
+touched...
+i think i fixed a bug...
+perfect...
+Moved something to somewhere... goodnight...
+oops, forgot to add the file
+Corrected mistakes
+oops
+oops!
+put code that worked where the code that didn't used to be
+Nothing to see here, move along
+I am even stupider than I thought
+I don't know what the hell I was thinking.
+fixed errors in the previous commit
+Committed some changes
+Some bugs fixed
+Minor updates
+Added missing file in previous commit
+bug fix
+typo
+bara bra grejjor
+Continued development...
+Does anyone read this? I'll be at the coffee shop accross the street.
+That's just how I roll
+work in progress
+minor changes
+some brief changes
+assorted changes
+lots and lots of changes
+another big bag of changes
+lots of changes after a lot of time
+LOTS of changes. period
+{{Name}} made me do it
+Test commit. Please ignore
+I'm just a grunt. Don't blame me for this awful PoS.
+I did it for the lulz!
+I'll explain this when I'm sober .. or revert it
+Obligatory placeholder commit message
+A long time ago, in a galaxy far far away...
+Fixed the build.
+Fixing {{Name}}'s bug.
+Fixing {{Name}}'s bugs.
+various changes
+One more time, but with feeling.
+Handled a particular error.
+Fixed unnecessary bug.
+Removed code.
+Added translation.
+Updated build targets.
+Refactored configuration.
+Locating the required gigapixels to render...
+Spinning up the hamster...
+Shovelling coal into the server...
+Programming the flux capacitor
+The last time I tried this the monkey didn't survive. Let's hope it works better this time.
+I should have had a V8 this morning.
+640K ought to be enough for anybody
+pay no attention to the man behind the curtain
+a few bits tried to escape, but we caught them
+Who has two thumbs and remembers the rudiments of his linear algebra courses?  Apparently, this guy.
+workaround for ant being a pile of fail
+Don't push this commit
+rats
+squash me
+fixed mistaken bug
+Final commit, ready for tagging
+-m \'So I hear you like commits ...\'
+epic
+need another beer
+Well the book was obviously wrong.
+lolwhat?
+Another commit to keep my CAN streak going.
+I cannot believe that it took this long to write a test for this.
+TDD: 1, Me: 0
+Yep, {{Name}} was right on this one.
+Yes, I was being sarcastic.
+Apparently works-for-me is a crappy excuse.
+tl;dr
+I would rather be playing SC2.
+Crap. Tonight is raid night and I am already late.
+I know what I am doing. Trust me.
+You should have trusted me.
+Is there an award for this?
+Is there an achievement for this?
+I'm totally adding this to epic win. +300
+This really should not take 19 minutes to build.
+fixed the israeli-palestinian conflict
+SHIT ===> GOLD
+Committing in accordance with the prophecy.
+It compiles! Ship it!
+LOL!
+Reticulating splines...
+SEXY RUSSIAN CODES WAITING FOR YOU TO CALL
+s/import/include/
+extra debug for stuff module
+debug line test
+debugo
+remove debug<br/>all good
+debug suff
+more debug... who overwrote!
+FUCKING {{UPPER}}
+these confounded tests drive me nuts
+For great justice.
+QuickFix.
+oops - thought I got that one.
+removed echo and die statements, lolz.
+somebody keeps erasing my changes.
+doh.
+pam anderson is going to love me.
+added security.
+arrgghh... damn this thing for not working.
+jobs... steve jobs
+and a comma
+this is my quickfix branch and i will use to do my quickfixes
+Fix my stupidness
+and so the crazy refactoring process sees the sunlight after some months in the dark!
+gave up and used tables.
+[Insert your commit message here. Be sure to make it descriptive.]
+Removed test case since code didn't pass QA
+removed tests since i can't make them green
+stuff
+more stuff
+Become a programmer, they said. It'll be fun, they said.
+Same as last commit with changes
+foo
+just checking if git is working properly...
+fixed some minor stuff, might need some additional work.
+just trolling the repo
+All your codebase are belong to us.
+Somebody set up us the bomb.
+should work I guess...
+To be honest, I do not quite remember everything I changed here today. But it is all good, I tell ya.
+well crap.
+herpderp (redux)
+herpderp
+Derp
+derpherp
+Herping the derp
+sometimes you just herp the derp so hard it herpderps
+Derp. Fix missing constant post rename
+Herping the fucking derp right here and now.
+Derp, asset redirection in dev mode
+mergederp
+Derp search/replace fuckup
+Herpy dooves.
+Derpy hooves
+derp, helper method rename
+Herping the derp derp (silly scoping error)
+Herp derp I left the debug in there and forgot to reset errors.
+Reset error count between rows. herpderp
+hey, what's that over there?!
+hey, look over there!
+It worked for me...
+Does not work.
+Either Hot Shit or Total Bollocks
+Arrrrgggg
+Don’t mess with Voodoo
+I expected something different.
+Todo!!!
+This is supposed to crash
+No changes after this point.
+I know, I know, this is not how I’m supposed to do it, but I can't think of something better.
+Don’t even try to refactor it.
+(c) Microsoft 1988
+Please no changes this time.
+Why The Fuck?
+We should delete this crap before shipping.
+Shit code!
+ALL SORTS OF THINGS
+Herpderp, shoulda check if it does really compile.
+I CAN HAZ PYTHON, I CAN HAZ INDENTS
+{{Name}} rebase plx?
+Major fixup.

data/bin/git-faker

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require "faker"
+
+types = {
+  "hacker"  => "Faker::Hacker.say_something_smart",
+  "hipster" => "Faker::Hipster.sentences(1)[0]",
+  "book"    => "Faker::Book.title",
+  "doing"   => "Faker::Hacker.ingverb + '' '' + Faker::Hacker.adjective",
+  "biz"     => "Faker::Company.catch_phrase",
+  "buzz"    => "Faker::Company.buzzword",
+  "bs"      => "Faker::Company.bs",
+  "team"    => "Faker::Team.name",
+}
+
+puts eval(ARGV[1] ? types[ARGV[1]] : types[types.keys.sample]).capitalize

data/bin/git-names

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+## git-rank-contributors: a simple script to trace through the logs and
+## rank contributors by the total size of the diffs they're responsible for.
+## A change counts twice as much as a plain addition or deletion.
+##
+## Output may or may not be suitable for inclusion in a CREDITS file.
+## Probably not without some editing, because people often commit from more
+## than one address.
+##
+## git-rank-contributors Copyright 2008 William Morgan <wmorgan-git-wt-add@masanjin.net>. 
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You can find the GNU General Public License at:
+##   http://www.gnu.org/licenses/
+
+class String
+  def obfuscate; gsub(/@/, " at the ").gsub(/\.(\w+)(>|$)/, ' dot \1s\2') end
+  def htmlize; gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;") end
+end
+
+lines = {}
+verbose = ARGV.delete("-v")
+obfuscate = ARGV.delete("-o")
+htmlize = ARGV.delete("-h")
+
+author = nil
+state = :pre_author
+`git log -M -C -C -p --no-color`
+    .encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace)
+    .split("\n")
+    .each do |l|
+  case
+  when (state == :pre_author || state == :post_author) && l =~ /Author: (.*)$/
+    author = $1
+    state = :post_author
+    lines[author] ||= 0
+  when state == :post_author && l =~ /^\+\+\+/
+    state = :in_diff
+  when state == :in_diff && l =~ /^[\+\-]/
+    lines[author] += 1
+  when state == :in_diff && l =~ /^commit /
+    state = :pre_author
+  end
+end
+
+lines.sort_by { |a, c| -c }.each do |a, c|
+  a = a.obfuscate if obfuscate
+  a = a.htmlize if htmlize
+  if verbose
+    puts "#{a}: #{c} lines of diff"
+  else
+    puts a
+  end
+end

data/bin/git-release

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+release = "!f(){ git tag -a v$(git nn) -m \"$(git last)\" && git push origin master --tags;};f"

data/bin/git-tar

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+root="$(git rev-parse --show-toplevel)"
+file="$(dirname ${root})/$(basename $PWD).tar.gz"
+git archive --format=tar.gz -o ${file} HEAD
+echo "File ${file} created."

data/bin/git-user

@@ -0,0 +1,186 @@
+#!/usr/bin/env ruby
+require "thor"
+require "yaml"
+
+DIR = "#{ENV['HOME']}/.git-users"
+
+module Git
+  module Account
+    class CancelledException < Exception
+    end
+
+    class Cli < Thor
+
+      desc "ls", "List accounts"
+      def ls
+        getLs do |name|
+          puts name
+        end
+      end
+
+      desc "all", "Show all settings"
+      def all
+        rows =  []
+        rows << ["ACCOUNT", "KEY", "VALUE"]
+        Dir["#{DIR}/*.yaml"].each do |file|
+          first = false
+          name  = file.sub("#{DIR}/", "").sub(".yaml", "")
+          data  = YAML.load_file(file)
+          data.each do |k,v|
+            if first
+              name = ""
+            end
+
+            rows << [name, k, v]
+            first = true
+          end
+        end
+        table rows
+      end
+
+      desc "new", "Adds a a new account"
+      def new name = nil
+        print "Enter the new account name: "
+        account = $stdin.readline().chomp
+
+        print "Enter your name: "
+        name = $stdin.readline().chomp
+
+        print "Enter your email address: "
+        email = $stdin.readline().chomp
+
+        data = {}
+        data["user.name"] = name
+        data["user.email"] = email
+
+        puts
+        puts "Now you can set more key values."
+        begin
+          loop do
+            print "Enter a key (leave empty to skip): "
+            key = $stdin.readline().chomp
+            raise CancelledException if key.empty?
+
+            print "Enter the value for key \033[1m#{key}\033[0m: "
+            value = $stdin.readline().chomp
+            raise CancelledException if value.empty?
+
+            data[key] = value
+          end
+
+        rescue CancelledException
+          puts "Skipping"
+        end
+
+        file = "#{DIR}/#{account}.yaml"
+        File.write(file, data.to_yaml)
+        puts `cat #{file}`
+      end
+
+      desc "set NAME KEY VALUE", "Apply a user config"
+      def set name, key, value
+        file = "#{DIR}/#{name}.yaml"
+        data = YAML.load_file(file)
+        data[key] = value
+        File.write(file, data.to_yaml)
+      end
+
+      desc "rm NAME", "Removes a user account"
+      def rm name
+        file = "#{DIR}/#{name}.yaml"
+        system "rm #{file}"
+      end
+
+      desc "del NAME KEY", "Removes a user config"
+      def del name, key
+        file = "#{DIR}/#{name}.yaml"
+        data = YAML.load_file(file)
+        data.delete key
+        File.write(file, data.to_yaml)
+      end
+
+      desc "show", "Show current account configuration"
+      def show
+        rows =  []
+        rows << ["KEY", "VALUE"]
+        name  = file.sub("#{DIR}/", "").sub(".yaml", "")
+        data  = YAML.load_file(file)
+        data.each do |k,v|
+          rows << [k, v]
+        end
+        table rows
+      end
+
+      desc "use NAME", "Apply the account setting"
+      def use(name)
+        file = "#{DIR}/#{name}.yaml"
+        data  = YAML.load_file(file)
+        data.each do |k, v|
+          system "git config #{k} #{v}"
+          puts "#{k}: " + `git config #{k}`
+        end
+      end
+
+      desc "fix", "Fixes the author in the last commit"
+      def fix
+        user  = `git config user.name`.chomp
+        email = `git config user.email`.chomp
+        system "git commit --amend --author '#{user} <#{email}>'"
+      end
+
+      private
+      def getLs
+        Dir["#{DIR}/*.yaml"].each do |file|
+          name = file.sub("#{DIR}/", "").sub(".yaml", "")
+          yield name
+        end
+      end
+
+      def table data
+        widths = []
+        data.each do |line|
+          c = 0
+          line.each do |col|
+            str = col.to_s
+            len = str.length
+            widths[c] = len if widths[c].nil? || len > widths[c]
+            c += 1
+          end
+        end
+
+        format = widths.collect{|n| "%-#{n}s"}.join("  ").chomp + "\n"
+        data.each do |row|
+          printf format, *row
+        end
+      end
+
+      def getAll
+        rows =  []
+        rows << ["ACCOUNT", "KEY", "VALUE"]
+        Dir["#{DIR}/*.yaml"].each do |file|
+          first = false
+          name  = file.sub("#{DIR}/", "").sub(".yaml", "")
+          data  = YAML.load_file(file)
+          data.each do |k,v|
+            if first
+              name = ""
+            end
+
+            rows << [name, k, v]
+            first = true
+          end
+        end
+        table rows
+      end
+    end
+  end
+end
+
+
+begin
+  Git::Account::Cli.start ARGV
+
+rescue SystemExit, Interrupt
+  print "Bye"
+
+end

data/bin/git-wtf

@@ -0,0 +1,364 @@
+#!/usr/bin/env ruby
+
+HELP = <<EOS
+git-wtf displays the state of your repository in a readable, easy-to-scan
+format. It's useful for getting a summary of how a branch relates to a remote
+server, and for wrangling many topic branches.
+
+git-wtf can show you:
+- How a branch relates to the remote repo, if it's a tracking branch.
+- How a branch relates to integration branches, if it's a feature branch.
+- How a branch relates to the feature branches, if it's an integration
+  branch.
+
+git-wtf is best used before a git push, or between a git fetch and a git
+merge. Be sure to set color.ui to auto or yes for maximum viewing pleasure.
+EOS
+
+KEY = <<EOS
+KEY:
+() branch only exists locally
+{} branch only exists on a remote repo
+[] branch exists locally and remotely
+
+x merge occurs both locally and remotely
+~ merge occurs only locally
+  (space) branch isn't merged in
+
+(It's possible for merges to occur remotely and not locally, of course, but
+that's a less common case and git-wtf currently doesn't display anything
+special for it.)
+EOS
+
+USAGE = <<EOS
+Usage: git wtf [branch+] [options]
+
+If [branch] is not specified, git-wtf will use the current branch. The possible
+[options] are:
+
+  -l, --long          include author info and date for each commit
+  -a, --all           show all branches across all remote repos, not just
+                      those from origin
+  -A, --all-commits   show all commits, not just the first 5
+  -s, --short         don't show commits
+  -k, --key           show key
+  -r, --relations     show relation to features / integration branches
+      --dump-config   print out current configuration and exit
+
+git-wtf uses some heuristics to determine which branches are integration
+branches, and which are feature branches. (Specifically, it assumes the
+integration branches are named "master", "next" and "edge".) If it guesses
+incorrectly, you will have to create a .git-wtfrc file.
+
+To start building a configuration file, run "git-wtf --dump-config >
+.git-wtfrc" and edit it. The config file is a YAML file that specifies the
+integration branches, any branches to ignore, and the max number of commits to
+display when --all-commits isn't used.  git-wtf will look for a .git-wtfrc file
+starting in the current directory, and recursively up to the root.
+
+IMPORTANT NOTE: all local branches referenced in .git-wtfrc must be prefixed
+with heads/, e.g. "heads/master". Remote branches must be of the form
+remotes/<remote>/<branch>.
+EOS
+
+COPYRIGHT = <<EOS
+git-wtf Copyright 2008--2009 William Morgan <wmorgan at the masanjin dot nets>.
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You can find the GNU General Public License at: http://www.gnu.org/licenses/
+EOS
+
+require 'yaml'
+CONFIG_FN = ".git-wtfrc"
+
+class Numeric; def pluralize s; "#{to_s} #{s}" + (self != 1 ? "s" : "") end end
+
+if ARGV.delete("--help") || ARGV.delete("-h")
+  puts USAGE
+  exit
+end
+
+## poor man's trollop
+$long = ARGV.delete("--long") || ARGV.delete("-l")
+$short = ARGV.delete("--short") || ARGV.delete("-s")
+$all = ARGV.delete("--all") || ARGV.delete("-a")
+$all_commits = ARGV.delete("--all-commits") || ARGV.delete("-A")
+$dump_config = ARGV.delete("--dump-config")
+$key = ARGV.delete("--key") || ARGV.delete("-k")
+$show_relations = ARGV.delete("--relations") || ARGV.delete("-r")
+ARGV.each { |a| abort "Error: unknown argument #{a}." if a =~ /^--/ }
+
+## search up the path for a file
+def find_file fn
+  while true
+    return fn if File.exist? fn
+    fn2 = File.join("..", fn)
+    return nil if File.expand_path(fn2) == File.expand_path(fn)
+    fn = fn2
+  end
+end
+
+want_color = `git config color.wtf`
+want_color = `git config color.ui` if want_color.empty?
+$color = case want_color.chomp
+  when "true"; true
+  when "auto"; $stdout.tty?
+end
+
+def red s; $color ? "\033[31m#{s}\033[0m" : s end
+def green s; $color ? "\033[32m#{s}\033[0m" : s end
+def yellow s; $color ? "\033[33m#{s}\033[0m" : s end
+def cyan s; $color ? "\033[36m#{s}\033[0m" : s end
+def grey s; $color ? "\033[1;30m#{s}\033[0m" : s end
+def purple s; $color ? "\033[35m#{s}\033[0m" : s end
+
+## the set of commits in 'to' that aren't in 'from'.
+## if empty, 'to' has been merged into 'from'.
+def commits_between from, to
+  if $long
+    `git log --pretty=format:"- %s [#{yellow "%h"}] (#{purple "%ae"}; %ar)" #{from}..#{to}`
+  else
+    `git log --pretty=format:"- %s [#{yellow "%h"}]" #{from}..#{to}`
+  end.split(/[\r\n]+/)
+end
+
+def show_commits commits, prefix="    "
+  if commits.empty?
+    puts "#{prefix} none"
+  else
+    max = $all_commits ? commits.size : $config["max_commits"]
+    max -= 1 if max == commits.size - 1 # never show "and 1 more"
+    commits[0 ... max].each { |c| puts "#{prefix}#{c}" }
+    puts grey("#{prefix}... and #{commits.size - max} more (use -A to see all).") if commits.size > max
+  end
+end
+
+def ahead_behind_string ahead, behind
+  [ahead.empty? ? nil : "#{ahead.size.pluralize 'commit'} ahead",
+   behind.empty? ? nil : "#{behind.size.pluralize 'commit'} behind"].
+   compact.join("; ")
+end
+
+def widget merged_in, remote_only=false, local_only=false, local_only_merge=false
+  left, right = case
+    when remote_only; %w({ })
+    when local_only; %w{( )}
+    else %w([ ])
+  end
+  middle = case
+    when merged_in && local_only_merge; green("~")
+    when merged_in; green("x")
+    else " "
+  end
+  print left, middle, right
+end
+
+def show b
+  have_both = b[:local_branch] && b[:remote_branch]
+
+  pushc, pullc, oosync = if have_both
+    [x = commits_between(b[:remote_branch], b[:local_branch]),
+     y = commits_between(b[:local_branch], b[:remote_branch]),
+     !x.empty? && !y.empty?]
+  end
+
+  if b[:local_branch]
+    puts "Local branch: " + green(b[:local_branch].sub(/^heads\//, ""))
+
+    if have_both
+      if pushc.empty?
+        puts "#{widget true} in sync with remote"
+      else
+        action = oosync ? "push after rebase / merge" : "push"
+        puts "#{widget false} NOT in sync with remote (you should #{action})"
+        show_commits pushc unless $short
+      end
+    end
+  end
+
+  if b[:remote_branch]
+    puts "Remote branch: #{cyan b[:remote_branch]} (#{b[:remote_url]})"
+
+    if have_both
+      if pullc.empty?
+        puts "#{widget true} in sync with local"
+      else
+        action = pushc.empty? ? "merge" : "rebase / merge"
+        puts "#{widget false} NOT in sync with local (you should #{action})"
+        show_commits pullc unless $short
+      end
+    end
+  end
+
+  puts "\n#{red "WARNING"}: local and remote branches have diverged. A merge will occur unless you rebase." if oosync
+end
+
+def show_relations b, all_branches
+  ibs, fbs = all_branches.partition { |name, br| $config["integration-branches"].include?(br[:local_branch]) || $config["integration-branches"].include?(br[:remote_branch]) }
+  if $config["integration-branches"].include? b[:local_branch]
+    puts "\nFeature branches:" unless fbs.empty?
+    fbs.each do |name, br|
+      next if $config["ignore"].member?(br[:local_branch]) || $config["ignore"].member?(br[:remote_branch])
+      next if br[:ignore]
+      local_only = br[:remote_branch].nil?
+      remote_only = br[:local_branch].nil?
+      name = if local_only
+        purple br[:name]
+      elsif remote_only
+        cyan br[:name]
+      else
+        green br[:name]
+      end
+
+      ## for remote_only branches, we'll compute wrt the remote branch head. otherwise, we'll
+      ## use the local branch head.
+      head = remote_only ? br[:remote_branch] : br[:local_branch]
+
+      remote_ahead = b[:remote_branch] ? commits_between(b[:remote_branch], head) : []
+      local_ahead = b[:local_branch] ? commits_between(b[:local_branch], head) : []
+
+      if local_ahead.empty? && remote_ahead.empty?
+        puts "#{widget true, remote_only, local_only} #{name} #{local_only ? "(local-only) " : ""}is merged in"
+      elsif local_ahead.empty?
+        puts "#{widget true, remote_only, local_only, true} #{name} merged in (only locally)"
+      else
+        behind = commits_between head, (br[:local_branch] || br[:remote_branch])
+        ahead = remote_only ? remote_ahead : local_ahead
+        puts "#{widget false, remote_only, local_only} #{name} #{local_only ? "(local-only) " : ""}is NOT merged in (#{ahead_behind_string ahead, behind})"
+        show_commits ahead unless $short
+      end
+    end
+  else
+    puts "\nIntegration branches:" unless ibs.empty? # unlikely
+    ibs.sort_by { |v, br| v }.each do |v, br|
+      next if $config["ignore"].member?(br[:local_branch]) || $config["ignore"].member?(br[:remote_branch])
+      next if br[:ignore]
+      local_only = br[:remote_branch].nil?
+      remote_only = br[:local_branch].nil?
+      name = remote_only ? cyan(br[:name]) : green(br[:name])
+
+      ahead = commits_between v, (b[:local_branch] || b[:remote_branch])
+      if ahead.empty?
+        puts "#{widget true, local_only} merged into #{name}"
+      else
+        #behind = commits_between b[:local_branch], v
+        puts "#{widget false, local_only} NOT merged into #{name} (#{ahead.size.pluralize 'commit'} ahead)"
+        show_commits ahead unless $short
+      end
+    end
+  end
+end
+
+#### EXECUTION STARTS HERE ####
+
+## find config file and load it
+$config = { "integration-branches" => %w(heads/master heads/next heads/edge), "ignore" => [], "max_commits" => 5 }.merge begin
+  fn = find_file CONFIG_FN
+  if fn && (h = YAML::load_file(fn)) # yaml turns empty files into false
+    h["integration-branches"] ||= h["versions"] # support old nomenclature
+    h
+  else
+    {}
+  end
+end
+
+if $dump_config
+  puts $config.to_yaml
+  exit
+end
+
+## first, index registered remotes
+remotes = `git config --get-regexp ^remote\.\*\.url`.split(/[\r\n]+/).inject({}) do |hash, l|
+  l =~ /^remote\.(.+?)\.url (.+)$/ or next hash
+  hash[$1] ||= $2
+  hash
+end
+
+## next, index followed branches
+branches = `git config --get-regexp ^branch\.`.split(/[\r\n]+/).inject({}) do |hash, l|
+  case l
+  when /branch\.(.*?)\.remote (.+)/
+    name, remote = $1, $2
+
+    hash[name] ||= {}
+    hash[name].merge! :remote => remote, :remote_url => remotes[remote]
+  when /branch\.(.*?)\.merge ((refs\/)?heads\/)?(.+)/
+    name, remote_branch = $1, $4
+    hash[name] ||= {}
+    hash[name].merge! :remote_mergepoint => remote_branch
+  end
+  hash
+end
+
+## finally, index all branches
+remote_branches = {}
+`git show-ref`.split(/[\r\n]+/).each do |l|
+  sha1, ref = l.chomp.split " refs/"
+
+  if ref =~ /^heads\/(.+)$/ # local branch
+    name = $1
+    next if name == "HEAD"
+    branches[name] ||= {}
+    branches[name].merge! :name => name, :local_branch => ref
+  elsif ref =~ /^remotes\/(.+?)\/(.+)$/ # remote branch
+    remote, name = $1, $2
+    remote_branches["#{remote}/#{name}"] = true
+    next if name == "HEAD"
+    ignore = !($all || remote == "origin")
+
+    branch = name
+    if branches[name] && branches[name][:remote] == remote
+      # nothing
+    else
+      name = "#{remote}/#{branch}"
+    end
+
+    branches[name] ||= {}
+    branches[name].merge! :name => name, :remote => remote, :remote_branch => "#{remote}/#{branch}", :remote_url => remotes[remote], :ignore => ignore
+  end
+end
+
+## assemble remotes
+branches.each do |k, b|
+  next unless b[:remote] && b[:remote_mergepoint]
+  b[:remote_branch] = if b[:remote] == "."
+    b[:remote_mergepoint]
+  else
+    t = "#{b[:remote]}/#{b[:remote_mergepoint]}"
+    remote_branches[t] && t # only if it's still alive
+  end
+end
+
+show_dirty = ARGV.empty?
+targets = if ARGV.empty?
+  [`git symbolic-ref HEAD`.chomp.sub(/^refs\/heads\//, "")]
+else
+  ARGV.map { |x| x.sub(/^heads\//, "") }
+end.map { |t| branches[t] or abort "Error: can't find branch #{t.inspect}." }
+
+targets.each do |t|
+  show t
+  show_relations t, branches if $show_relations || t[:remote_branch].nil?
+end
+
+modified = show_dirty && `git ls-files -m` != ""
+uncommitted = show_dirty &&  `git diff-index --cached HEAD` != ""
+
+if $key
+  puts
+  puts KEY
+end
+
+puts if modified || uncommitted
+puts "#{red "NOTE"}: working directory contains modified files." if modified
+puts "#{red "NOTE"}: staging area contains staged but uncommitted files." if uncommitted
+
+# the end!

data/git_extras.gemspec

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
+require "date"
+require "git_extras"
+
+Gem::Specification.new do |spec|
+  spec.name          = "git-extras"
+  spec.version       = GitExtras::VERSION
+  spec.date          = (Date.today << 1).to_s
+  spec.summary       = "A bunch of git utility scripts"
+  spec.description   = "A bunch of git utility scripts."
+  spec.authors       = ["ptdorf"]
+  spec.email         = ["ptdorf@gmail.com"]
+  spec.homepage      = "https://github.com/ptdorf/git-extras"
+  spec.license       = "MIT"
+  spec.require_paths = ["lib"]
+
+  spec.files         = `git ls-files`.split $/
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename f }
+
+  spec.add_dependency "thor"
+  spec.add_dependency "faker"
+  spec.add_development_dependency "rake"
+end

data/lib/git_extras.rb

@@ -0,0 +1 @@
+require "git_extras/version"

data/lib/git_extras/version.rb

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

data/readme.md

@@ -0,0 +1,3 @@
+# git-extras
+
+A bunch of git utility scripts.

metadata

@@ -0,0 +1,110 @@
+--- !ruby/object:Gem::Specification
+name: git-extras
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- ptdorf
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2016-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A bunch of git utility scripts.
+email:
+- ptdorf@gmail.com
+executables:
+- git-bump
+- git-commitment
+- git-faker
+- git-names
+- git-release
+- git-tar
+- git-user
+- git-wtf
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
+- Rakefile
+- bin/git-bump
+- bin/git-commitment
+- bin/git-faker
+- bin/git-names
+- bin/git-release
+- bin/git-tar
+- bin/git-user
+- bin/git-wtf
+- git_extras.gemspec
+- lib/git_extras.rb
+- lib/git_extras/version.rb
+- readme.md
+homepage: https://github.com/ptdorf/git-extras
+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.6.6
+signing_key: 
+specification_version: 4
+summary: A bunch of git utility scripts
+test_files: []