git-up 0.5.8 → 0.5.9

data/README.md

@@ -6,15 +6,35 @@ git-up
 * It merges upstream changes by default, when it's really more polite to [rebase over them](http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html), unless your collaborators enjoy a commit graph that looks like bedhead.
 * It only updates the branch you're currently on, which means `git push` will shout at you for being behind on branches you don't particularly care about right now.
 
-Solve them once and for all:
+Solve them once and for all.
 
-![gem install git-up](http://dl.dropbox.com/u/166030/nonsense/git-up.png)
+install
+-------
+
+    $ gem install git-up
+
+Windows support is predictably absent. Try the [Python port](https://github.com/msiemens/PyGitUp), which was started for that reason.
+
+use
+---
+
+![$ git up](http://dl.dropbox.com/u/166030/git-up/screenshot.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.
 
+difficulties
+------------
+
+### Windows
+Windows support is an ongoing pain. Have a look at [this ticket](https://github.com/aanand/git-up/issues/34) if you really need it, or if you're bored.
+
+### spawn.rb:187:in `_pspawn': Invalid command name (ArgumentError)
+
+If you're using RVM and you get this error, [read this](https://github.com/aanand/git-up/blob/master/RVM.md).
+
 configuration
 -------------
 
@@ -27,32 +47,30 @@ To set it within a project, run the command inside that project's directory and
     cd myproject
     git config git-up.bundler.check true
 
-### `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.
+### git-up.bundler.check [true|false]
 
-It slows the process down slightly, and therefore defaults to `false`. 
+Default: **false**. If **true**, git-up will check your app for any new bundled gems and suggest a `bundle install` if necessary.
 
-### `git-up.bundler.autoinstall [true|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.
+Default: **false**. If **true**, and if `git-up.bundler.check` is also set to **true**, git-up will run `bundle install` for you if it finds missing gems.
 
-### `git-up.fetch.prune [true|false]`
+### git-up.fetch.prune [true|false]
 
-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 [remove any remote tracking branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch). Set this option to `false` to disable it.
+Default: **true**. Append the `--prune` flag when running `git fetch`, if your git version supports it (1.6.6 or greater), telling it to [remove any remote tracking branches which no longer exist on the remote](http://linux.die.net/man/1/git-fetch).
 
-### `git-up.fetch.all [true|false]`
+### git-up.fetch.all [true|false]
 
-Normally, `git-up` will only fetch remotes for which there is at least one local tracking branch. Setting this option will it `git-up` always fetch from all remotes, which is useful if e.g. you use a remote to push to your CI system but never check those branches out.
+Default: **false**. Normally, git-up will only fetch remotes for which there is at least one local tracking branch. Setting this option to **true** will make git-up always fetch from all remotes, which is useful if e.g. you use a remote to push to your CI system but never check those branches out.
 
-### `git-up.rebase.arguments [string]`
+### git-up.rebase.arguments [string]
 
-If this option is set, its contents will be used by `git-up` as additional arguments when it calls `git rebase`. For example, setting this to `--preserve-merges` will recreate your merge commits in the rebased branch.
+Default: **unset**. Additional arguments to pass to `git rebase`. For example, setting this to `--preserve-merges` will recreate your merge commits in the rebased branch.
 
-### `git-up.rebase.auto [true|false]`
+### git-up.rebase.auto [true|false]
 
-If this option is set to false, `git-up` will not rebase branches for you. Instead, it will print a message saying they are diverged and let you handle rebasing them later. This can be useful if you have a lot of in-progress work that you don't want to deal with at once, but still want to update other branches.
+Default: **true**. If this option is set to **false**, git-up will not rebase branches for you. Instead, it will print a message saying they are diverged and let you handle rebasing them later. This can be useful if you have a lot of in-progress work that you don't want to deal with at once, but still want to update other branches.
 
-### `git-up.rebase.log-hook "COMMAND"`
+### git-up.rebase.log-hook "COMMAND"
 
-Runs COMMAND every time a branch is rebased or fast-forwarded, with the old head as $1 and the new head as $2. This can be used to view logs or diffs of incoming changes. For example: `'echo "changes on $1:"; git log --oneline --decorate $1..$2'`
+Default: **unset**. Runs **COMMAND** every time a branch is rebased or fast-forwarded, with the old head as **$1** and the new head as **$2**. This can be used to view logs or diffs of incoming changes. For example: `'echo "changes on $1:"; git log --oneline --decorate $1..$2'`

data/bin/git-up

@@ -2,5 +2,5 @@
 
 require 'git-up'
 
-GitUp.new.run
+GitUp.new.run(ARGV)
 

data/lib/git-up.rb

@@ -2,7 +2,9 @@ require 'colored'
 require 'grit'
 
 class GitUp
-  def run
+  def run(argv)
+    process_args(argv)
+
     command = ['git', 'fetch', '--multiple']
     command << '--prune' if prune?
     command += config("fetch.all") ? ['--all'] : remotes
@@ -26,6 +28,34 @@ class GitUp
     exit 1
   end
 
+  def process_args(argv)
+    banner = <<BANNER
+Fetch and rebase all remotely-tracked branches.
+
+    $ git up
+    master         #{"up to date".green}
+    development    #{"rebasing...".yellow}
+    staging        #{"fast-forwarding...".yellow}
+    production     #{"up to date".green}
+
+There are no command-line options, but there are a few
+`git config` variables you can set, which are documented here:
+#{"https://github.com/aanand/git-up#configuration".cyan}
+
+BANNER
+
+    case argv
+    when []
+      return
+    when ["-h"], ["--help"]
+      $stderr.puts(banner)
+      exit
+    else
+      $stderr.puts(banner)
+      exit 1
+    end
+  end
+
   def rebase_all_branches
     col_width = branches.map { |b| b.name.length }.max + 1
 

data/lib/git-up/version.rb

@@ -1,3 +1,3 @@
 class GitUp
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: &70162618687840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162618687840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70162618687340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70162618687340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70162618686920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +56,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162618686920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - aanand.prasad@gmail.com
@@ -81,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches