From 9375e99f921f428849f19efe2a2e500b3295d1a7 Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Fri, 4 Jan 2013 12:27:26 -0600
Subject: [PATCH] rbenv 0.4.0

---
 README.md               | 50 +++++++++++++++++++++++++++++++++++++++++
 libexec/rbenv---version |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12666f38..8da425a3 100644
--- a/README.md
+++ b/README.md
@@ -403,6 +403,56 @@ tracker](https://github.com/sstephenson/rbenv/issues).
 
 ### Version History
 
+**0.4.0** (January 4, 2013)
+
+* rbenv now prefers `.ruby-version` files to `.rbenv-version` files
+  for specifying local application-specific versions. The
+  `.ruby-version` file has the same format as `.rbenv-version` but is
+  [compatible with other Ruby version
+  managers](https://gist.github.com/1912050).
+* Deprecated `ruby-local-exec` and moved its functionality into the
+  standard `ruby` shim. See the [ruby-local-exec wiki
+  page](https://github.com/sstephenson/wiki/ruby-local-exec) for
+  upgrade instructions.
+* Modified shims to include the full path to rbenv so that they can be
+  invoked without having rbenv's bin directory in the `$PATH`.
+* Sped up `rbenv init` by avoiding rbenv reinintialization and by
+  using a simpler indexing approach. (Users of
+  [chef-rbenv](https://github.com/fnichol/chef-rbenv) should upgrade
+  to the latest version to fix a [compatibility
+  issue](https://github.com/fnichol/chef-rbenv/pull/26).)
+* Reworked `rbenv help` so that usage and documentation is stored as a
+  comment in each subcommand, enabling plugin commands to hook into
+  the help system.
+* Added support for full completion of the command line, not just the
+  first argument.
+* Updated installation instructions for Zsh and Ubuntu users.
+* Fixed `rbenv which` and `rbenv prefix` with system Ruby versions.
+* Changed `rbenv exec` to avoid prepending the system Ruby location to
+  `$PATH` to fix issues running system Ruby commands that invoke other
+  commands.
+* Changed `rbenv rehash` to ensure it exits with a 0 status code under
+  normal operation, and to ensure outdated shims are removed first
+  when rehashing.
+* Modified `rbenv rehash` to run `hash -r` afterwards, when shell
+  integration is enabled, to ensure the shell's command cache is
+  cleared.
+* Removed use of the `+=` operator to support older versions of Bash.
+* Adjusted non-bare `rbenv versions` output to include `system`, if
+  present.
+* Improved documentation for installing and uninstalling Ruby
+  versions.
+* Fixed `rbenv versions` not to display a warning if the currently
+  specified version doesn't exist.
+* Fixed an instance of local variable leakage in the `rbenv` shell
+  function wrapper.
+* Changed `rbenv shell` to ensure it exits with a non-zero status on
+  failure.
+* Added `rbenv --version` for printing the current version of rbenv.
+* Added `/usr/lib/rbenv/hooks` to the plugin hook search path.
+* Fixed `rbenv which` to account for path entries with spaces.
+* Changed `rbenv init` to accept option arguments in any order.
+
 **0.3.0** (December 25, 2011)
 
 * Added an `rbenv root` command which prints the value of
diff --git a/libexec/rbenv---version b/libexec/rbenv---version
index 222ad004..ba5c562f 100755
--- a/libexec/rbenv---version
+++ b/libexec/rbenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$RBENV_DEBUG" ] && set -x
 
-version=0.3.0
+version="0.4.0"
 
 cd "$RBENV_ROOT"
 git_revision="$(git describe --tags HEAD 2>/dev/null || true)"