git-up-decklin 0.5.1.1 → 0.5.5.1

data/README.md

@@ -15,16 +15,25 @@ although
 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-up` has a few configuration options, which use git's configuration system. Each can be set either globally or per-project. To set an option globally, append the `--global` flag to `git config`, which you can run anywhere:
 
     git config --global git-up.bundler.check true
 
-To set it within a project, run this command inside that project's directory:
+To set it within a project, run the command inside that project's directory and omit the `--global` flag:
 
+    cd myproject
     git config git-up.bundler.check true
 
-Replace 'true' with 'false' to disable checking.
+### `git-up.bundler.check [true|false]`
+
+If set to `true`, `git-up` will check your app for any new bundled gems and suggest a `bundle install` if necessary.
+
+It slows the process down slightly, and therefore defaults to `false`. 
+
+### `git-up.bundler.autoinstall [true|false]`
+
+If you're even lazier, you can tell `git-up` to run `bundle install` for you if it finds missing gems. Make sure `git-up.bundler.check` is also set to `true` or it won't do anything.
+
+### `git-up.fetch.prune [true|false]`
 
-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.
+By default, `git-up` will append the `--prune` flag to the `git fetch` command if your git version supports it (1.6.6 or greater), telling it to [delete any branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.

data/bin/git-up

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$: << "#{File.dirname(File.realdirpath(__FILE__))}/../lib"
 require 'git-up'
 
 GitUp.new.run

data/lib/git-up.rb

@@ -3,48 +3,20 @@ 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
+    command = ['git', 'fetch', '--multiple']
+    command << '--prune' if prune?
+    command << '--all' if config("fetch.all")
+    command += remotes
 
-          if base == branch.commit.sha
-            puts "fast-forwarding...".yellow
-          elsif config("auto-rebase")
-            puts "rebasing...".yellow
-          else
-            puts "diverged".red
-            next
-          end
+    # puts command.join(" ") # TODO: implement a 'debug' config option
+    system(*command)
+    raise GitError, "`git fetch` failed" unless $? == 0
+    @remote_map = nil # flush cache after fetch
 
-          log(branch, remote)
-          checkout(branch.name)
-          rebase(remote)
+    Grit::Git.with_timeout(0) do
+      with_stash do
+        returning_to_current_branch do
+          rebase_all_branches
         end
       end
     end
@@ -55,15 +27,61 @@ class GitUp
     exit 1
   end
 
+  def rebase_all_branches
+    col_width = branches.map { |b| b.name.length }.max + 1
+
+    if config("case-insensitive")
+      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
+    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
+
   def repo
     @repo ||= get_repo
   end
 
   def get_repo
-    git_dir = `git rev-parse --git-dir`
+    repo_dir = `git rev-parse --show-toplevel`.chomp
 
     if $? == 0
-      @repo = Grit::Repo.new(File.dirname(git_dir))
+      Dir.chdir repo_dir
+      @repo = Grit::Repo.new(repo_dir)
     else
       raise GitError, "We don't seem to be in a git repository."
     end
@@ -94,21 +112,9 @@ class GitUp
     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
@@ -241,8 +247,48 @@ EOS
     config("bundler.check") == 'true' || ENV['GIT_UP_BUNDLER_CHECK'] == 'true'
   end
 
+  def prune?
+    required_version = "1.6.6"
+    config_value = config("fetch.prune")
+
+    if git_version_at_least?(required_version)
+      config_value != 'false'
+    else
+      if config_value == 'true'
+        puts "Warning: fetch.prune is set to 'true' but your git version doesn't seem to support it (#{git_version} < #{required_version}). Defaulting to 'false'.".yellow
+      end
+
+      false
+    end
+  end
+
+  def change_count
+    @change_count ||= begin
+      diff_status   = repo.status
+      actual_status = repo.git.status(:porcelain => true).split("\n").map {|l| l[3..-1]}
+    
+      added         = diff_status.added.select { |(x,y)| actual_status.include? x }
+      changed       = diff_status.changed.select { |(x,y)| actual_status.include? x }
+      deleted       = diff_status.deleted.select { |(x,y)| actual_status.include? x }
+    
+      added.length + changed.length + deleted.length
+    end
+  end
+
   def config(key)
     repo.config["git-up.#{key}"]
   end
+
+  def git_version_at_least?(required_version)
+    (version_array(git_version) <=> version_array(required_version)) >= 0
+  end
+
+  def version_array(version_string)
+    version_string.split('.').map { |s| s.to_i }
+  end
+
+  def git_version
+    `git --version`[/\d+(\.\d+)+/]
+  end
 end
 

data/lib/git-up/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up-decklin
 version: !ruby/object:Gem::Version
-  version: 0.5.1.1
+  version: 0.5.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70125576062640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125576062640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70125576062140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +41,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70125576062140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70125576061720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,7 +57,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125576061720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - aanand.prasad@gmail.com
@@ -83,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches