git-up 0.0.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Aanand Prasad
+
+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,9 @@
+git-up
+======
+
+So `git pull` merges by default, when it [should really rebase](http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html). You can [ask it to rebase instead](http://d.strelau.net/post/47338904/git-pull-rebase-by-default), but it still won't touch anything other than the currently checked-out branch. If you're tracking a bunch of remote branches, you'll get non-fast-forward complaints next time you push.
+
+Solve it once and for all:
+
+![gem install git-up](http://dl.dropbox.com/u/166030/nonsense/git-up.png)
+

data/Rakefile

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "git-up"
+    gem.summary = %Q{git command to fetch and rebase all branches}
+    gem.email = "aanand.prasad@gmail.com"
+    gem.homepage = "http://github.com/aanand/git-up"
+    gem.authors = ["Aanand Prasad"]
+    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+
+    gem.add_dependency "colored"
+    gem.add_dependency "grit"
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "git-up #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.0

data/bin/git-up

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'git-up'
+
+GitUp.new(ARGV).run
+

data/git-up.gemspec

@@ -0,0 +1,62 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{git-up}
+  s.version = "0.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Aanand Prasad"]
+  s.date = %q{2009-12-22}
+  s.default_executable = %q{git-up}
+  s.email = %q{aanand.prasad@gmail.com}
+  s.executables = ["git-up"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "bin/git-up",
+     "git-up.gemspec",
+     "lib/git-up.rb",
+     "test/helper.rb",
+     "test/test_git-up.rb"
+  ]
+  s.homepage = %q{http://github.com/aanand/git-up}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{git command to fetch and rebase all branches}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_git-up.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<colored>, [">= 0"])
+      s.add_runtime_dependency(%q<grit>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<colored>, [">= 0"])
+      s.add_dependency(%q<grit>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<colored>, [">= 0"])
+    s.add_dependency(%q<grit>, [">= 0"])
+  end
+end
+

data/lib/git-up.rb

@@ -0,0 +1,132 @@
+require 'colored'
+require 'grit'
+
+class GitUp
+  def initialize(args)
+    @repo   = Grit::Repo.new(args.first || File.expand_path("."))
+    @head   = @repo.head
+  end
+
+  def run
+    @repo.git.fetch
+
+    with_stash do
+      returning_to_current_branch do
+        @repo.branches.each do |branch|
+          next unless remote = remote_for_branch(branch)
+
+          print branch.name.ljust(20)
+
+          if remote.commit.sha == branch.commit.sha
+            puts "up to date".green
+            next
+          end
+
+          base = merge_base(branch.name, remote.name)
+
+          if base == remote.commit.sha
+            puts "ahead of upstream".green
+            next
+          end
+
+          if base == branch.commit.sha
+            puts "fast-forwarding...".yellow
+          else
+            puts "rebasing...".yellow
+          end
+
+          checkout(branch.name)
+          rebase(remote)
+        end
+      end
+    end
+  rescue GitError => e
+    puts e.message.red
+    puts "Here's what Git said:".red
+    puts e.output
+  end
+
+  def remote_for_branch(branch)
+    if remote_name = @repo.config["branch.#{branch.name}.remote"]
+      @repo.remotes.find { |r| r.name == "#{remote_name}/#{branch.name}" }
+    else
+      nil
+    end
+  end
+
+  def with_stash
+    stashed = false
+
+    status = @repo.status
+    change_count = status.added.length + status.changed.length + status.deleted.length
+
+    if change_count > 0
+      puts "stashing #{change_count} changes".magenta
+      @repo.git.stash
+      stashed = true
+    end
+
+    yield
+
+    if stashed
+      puts "unstashing".magenta
+      @repo.git.stash({}, "apply")
+    end
+  end
+
+  def returning_to_current_branch
+    unless @repo.head.respond_to?(:name)
+      puts "You're not currently on a branch. I'm exiting in case you're in the middle of something.".red
+      return
+    end
+
+    branch_name = @repo.head.name
+
+    yield
+
+    unless on_branch?(branch_name)
+      puts "returning to #{branch_name}".magenta
+      checkout(branch_name)
+    end
+  end
+
+  def checkout(branch_name)
+    output = @repo.git.checkout({}, branch_name)
+
+    unless on_branch?(branch_name)
+      raise GitError.new("Failed to checkout #{branch_name}", output)
+    end
+  end
+
+  def rebase(target_branch)
+    current_branch = @repo.head
+
+    output, err = @repo.git.sh("#{Grit::Git.git_binary} rebase #{target_branch.name}")
+
+    unless on_branch?(current_branch.name) and is_fast_forward?(current_branch, target_branch)
+      raise GitError.new("Failed to rebase #{current_branch.name} onto #{target_branch.name}", output+err)
+    end
+  end
+
+  def is_fast_forward?(a, b)
+    merge_base(a.name, b.name) == b.commit.sha
+  end
+
+  def merge_base(a, b)
+    @repo.git.send("merge-base", {}, a, b).strip
+  end
+
+  def on_branch?(branch_name=nil)
+    @repo.head.respond_to?(:name) and @repo.head.name == branch_name
+  end
+
+  class GitError < StandardError
+    attr_reader :output
+
+    def initialize(message, output)
+      super(message)
+      @output = output
+    end
+  end
+end
+

data/test/helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'git-up'
+
+class Test::Unit::TestCase
+end

data/test/test_git-up.rb

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestGitUp < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -0,0 +1,96 @@
+--- !ruby/object:Gem::Specification 
+name: git-up
+version: !ruby/object:Gem::Version 
+  version: 0.0.0
+platform: ruby
+authors: 
+- Aanand Prasad
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-12-22 00:00:00 -05:00
+default_executable: git-up
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: colored
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: grit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: 
+email: aanand.prasad@gmail.com
+executables: 
+- git-up
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.md
+files: 
+- .document
+- .gitignore
+- LICENSE
+- README.md
+- Rakefile
+- VERSION
+- bin/git-up
+- git-up.gemspec
+- lib/git-up.rb
+- test/helper.rb
+- test/test_git-up.rb
+has_rdoc: true
+homepage: http://github.com/aanand/git-up
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: git command to fetch and rebase all branches
+test_files: 
+- test/helper.rb
+- test/test_git-up.rb