git-up 0.5.2 → 0.5.3

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/lib/git-up.rb

@@ -3,47 +3,58 @@ require 'grit'
 
 class GitUp
   def run
-    system('git', 'fetch', '--multiple', *remotes)
+    command = ['git', 'fetch', '--multiple']
+    command << '--prune' if prune?
+    command += remotes
+
+    # 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
 
-    with_stash do
-      returning_to_current_branch do
-        col_width = branches.map { |b| b.name.length }.max + 1
+    Grit::Git.with_timeout(0) do
+      with_stash do
+        returning_to_current_branch do
+          rebase_all_branches
+        end
+      end
+    end
 
-        branches.each do |branch|
-          remote = remote_map[branch.name]
+    check_bundler
+  rescue GitError => e
+    puts e.message
+    exit 1
+  end
 
-          print branch.name.ljust(col_width)
+  def rebase_all_branches
+    col_width = branches.map { |b| b.name.length }.max + 1
 
-          if remote.commit.sha == branch.commit.sha
-            puts "up to date".green
-            next
-          end
+    branches.each do |branch|
+      remote = remote_map[branch.name]
 
-          base = merge_base(branch.name, remote.name)
+      print branch.name.ljust(col_width)
 
-          if base == remote.commit.sha
-            puts "ahead of upstream".green
-            next
-          end
+      if remote.commit.sha == branch.commit.sha
+        puts "up to date".green
+        next
+      end
 
-          if base == branch.commit.sha
-            puts "fast-forwarding...".yellow
-          else
-            puts "rebasing...".yellow
-          end
+      base = merge_base(branch.name, remote.name)
 
-          checkout(branch.name)
-          rebase(remote)
-        end
+      if base == remote.commit.sha
+        puts "ahead of upstream".green
+        next
       end
-    end
 
-    check_bundler
-  rescue GitError => e
-    puts e.message
-    exit 1
+      if base == branch.commit.sha
+        puts "fast-forwarding...".yellow
+      else
+        puts "rebasing...".yellow
+      end
+
+      checkout(branch.name)
+      rebase(remote)
+    end
   end
 
   def repo
@@ -218,8 +229,27 @@ 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 < required_version
+      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
+    else
+      config_value != 'false'
+    end
+  end
+
   def config(key)
     repo.config["git-up.#{key}"]
   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.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70273874197500 !ruby/object:Gem::Requirement
+  requirement: &70276083994300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273874197500
+  version_requirements: *70276083994300
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70273874196580 !ruby/object:Gem::Requirement
+  requirement: &70276083993620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70273874196580
+  version_requirements: *70276083993620
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70273874195820 !ruby/object:Gem::Requirement
+  requirement: &70276083992540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273874195820
+  version_requirements: *70276083992540
 description: 
 email:
 - aanand.prasad@gmail.com
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches