git-up-decklin 0.5.1.1

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,30 @@
+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)
+
+although
+--------
+
+`git-up` might mess up your branches, or set your chest hair on fire, or be racist to your cat, I don't know. It works for me.
+
+configuration
+-------------
+
+`git-up` can check your app for any new bundled gems and suggest a `bundle install` if necessary.
+
+It slows the process down slightly, and is therefore enabled by setting `git-up.bundler.check` to `true` in your git config, either globally or per-project. To set it globally, run this command anywhere:
+
+    git config --global git-up.bundler.check true
+
+To set it within a project, run this command inside that project's directory:
+
+    git config git-up.bundler.check true
+
+Replace 'true' with 'false' to disable checking.
+
+If you're even lazier, you can tell `git-up` to run `bundle install` for you if it finds missing gems. Simply set `git-up.bundler.autoinstall` to `true`, in the same manner. As above, it works globally or per-project, but make sure `git-up.bundler.check` is also set to `true` or it won't do anything.

data/bin/git-up

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

data/lib/git-up/version.rb

@@ -0,0 +1,3 @@
+class GitUp
+  VERSION = "0.5.1.1"
+end

data/lib/git-up.rb

@@ -0,0 +1,248 @@
+require 'colored'
+require 'grit'
+
+class GitUp
+  def run
+    fetch_remotes
+    with_stash do
+      returning_to_current_branch do
+        col_width = branches.map { |b| b.name.length }.max + 1
+
+        branches.sort_by! do |b|
+          case b.name.downcase
+            when 'master', 'oldest'; "__#{b.name.downcase}"
+            when /\//; "_#{b.name.downcase}"
+            else; b.name.downcase
+          end
+        end
+
+        branches.each do |branch|
+          remote = remote_map[branch.name]
+
+          print branch.name.ljust(col_width)
+
+          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".blue
+            next
+          end
+
+          if base == branch.commit.sha
+            puts "fast-forwarding...".yellow
+          elsif config("auto-rebase")
+            puts "rebasing...".yellow
+          else
+            puts "diverged".red
+            next
+          end
+
+          log(branch, remote)
+          checkout(branch.name)
+          rebase(remote)
+        end
+      end
+    end
+
+    check_bundler
+  rescue GitError => e
+    puts e.message
+    exit 1
+  end
+
+  def repo
+    @repo ||= get_repo
+  end
+
+  def get_repo
+    git_dir = `git rev-parse --git-dir`
+
+    if $? == 0
+      @repo = Grit::Repo.new(File.dirname(git_dir))
+    else
+      raise GitError, "We don't seem to be in a git repository."
+    end
+  end
+
+  def branches
+    @branches ||= repo.branches.select { |b| remote_map.has_key?(b.name) }
+  end
+
+  def remotes
+    @remotes ||= remote_map.values.map { |r| r.name.split('/', 2).first }.uniq
+  end
+
+  def remote_map
+    @remote_map ||= repo.branches.inject({}) { |map, branch|
+      if remote = remote_for_branch(branch)
+        map[branch.name] = remote
+      end
+
+      map
+    }
+  end
+
+  def remote_for_branch(branch)
+    remote_name   = repo.config["branch.#{branch.name}.remote"] || "origin"
+    remote_branch = repo.config["branch.#{branch.name}.merge"] || branch.name
+    remote_branch.sub!(%r{^refs/heads/}, '')
+    repo.remotes.find { |r| r.name == "#{remote_name}/#{remote_branch}" }
+  end
+
+  def fetch_remotes
+    args =
+      (config("prune") ? ['--prune'] : []) +
+      (config("fetch-all") ? ['--all'] : ['--multiple', *remotes])
+    system('git', 'fetch', *args)
+    raise GitError, "`git fetch` failed" unless $? == 0
+    @remote_map = nil # flush cache after fetch
+  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({}, "pop")
+    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 log(branch, remote)
+    if log_hook = config("log-hook")
+      system('sh', '-c', log_hook, 'git-up', branch.name, remote.name)
+    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 check_bundler
+    return unless use_bundler?
+
+    begin
+      require 'bundler'
+      ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile')
+      Gem.loaded_specs.clear
+      Bundler.setup
+    rescue Bundler::GemNotFound, Bundler::GitError
+      puts
+      print 'Gems are missing. '.yellow
+
+      if config("bundler.autoinstall") == 'true'
+        puts "Running `bundle install`.".yellow
+        system "bundle", "install"
+      else
+        puts "You should `bundle install`.".yellow
+      end
+    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
+    def initialize(message, output=nil)
+      @msg = "#{message.red}"
+
+      if output
+        @msg << "\n"
+        @msg << "Here's what Git said:".red
+        @msg << "\n"
+        @msg << output
+      end
+    end
+
+    def message
+      @msg
+    end
+  end
+
+private
+
+  def use_bundler?
+    use_bundler_config? and File.exists? 'Gemfile'
+  end
+
+  def use_bundler_config?
+    if ENV.has_key?('GIT_UP_BUNDLER_CHECK')
+      puts <<-EOS.yellow
+The GIT_UP_BUNDLER_CHECK environment variable is deprecated.
+You can now tell git-up to check (or not check) for missing
+gems on a per-project basis using git's config system. To
+set it globally, run this command anywhere:
+
+    git config --global git-up.bundler.check true
+
+To set it within a project, run this command inside that
+project's directory:
+
+    git config git-up.bundler.check true
+
+Replace 'true' with 'false' to disable checking.
+EOS
+    end
+
+    config("bundler.check") == 'true' || ENV['GIT_UP_BUNDLER_CHECK'] == 'true'
+  end
+
+  def config(key)
+    repo.config["git-up.#{key}"]
+  end
+end
+

metadata

@@ -0,0 +1,90 @@
+--- !ruby/object:Gem::Specification
+name: git-up-decklin
+version: !ruby/object:Gem::Version
+  version: 0.5.1.1
+  prerelease: 
+platform: ruby
+authors:
+- Aanand Prasad
+- Elliot Crosby-McCullough
+- Adrian Irving-Beer
+- Joshua Wehner
+- Decklin Foster
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-12-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thoughtbot-shoulda
+  requirement: &70125576062640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70125576062640
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &70125576062140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70125576062140
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &70125576061720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70125576061720
+description: 
+email:
+- aanand.prasad@gmail.com
+- elliot.cm@gmail.com
+- decklin@red-bean.com
+executables:
+- git-up
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/git-up
+- lib/git-up/version.rb
+- lib/git-up.rb
+- LICENSE
+- README.md
+homepage: http://github.com/aanand/git-up
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.11
+signing_key: 
+specification_version: 3
+summary: git command to fetch and rebase all branches
+test_files: []