Merge branch '1-2-stable'

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.0 (Aug 30, 2012)
+
+Bugfixes:
+
+  - raise original error message from LoadError's
+
+Documentation:
+
+  - `platform` man pages
+
 ## 1.2.0.rc.2 (Aug 8, 2012)
 
 Bugfixes:

lib/bundler/cli.rb

@@ -35,6 +35,7 @@ def help(cli = nil)
           bundle-install
           bundle-package
           bundle-update
+          bundle-platform
           gemfile.5)
 
       if manpages.include?(command)

lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.2.0.rc.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.2.0" unless defined?(::Bundler::VERSION)
 end

man/bundle-platform.ronn

@@ -0,0 +1,42 @@
+bundle-platform(1) -- Displays platform compatibility information
+=================================================================
+
+## SYNOPSIS
+
+`bundle platform` [--ruby]
+
+## DESCRIPTION
+
+`platform` will display information from your Gemfile, Gemfile.lock, and Ruby
+VM about your platform.
+
+For instance, using this Gemfile(5):
+
+    source "http://rubygems.org"
+
+    ruby "1.9.3"
+
+    gem "rack"
+
+If you run `bundle platform` on Ruby 1.9.3, it will display the following output:
+
+    Your platform is: x86_64-linux
+
+    Your app has gems that work on these platforms:
+    * ruby
+
+    Your Gemfile specifies a Ruby version requirement:
+    * ruby 1.9.3
+
+    Your current platform satisfies the Ruby version requirement.
+
+`platform` will list all the platforms in your `Gemfile.lock` as well as the
+`ruby` directive if applicable from your Gemfile(5). It will also let you know
+if the `ruby` directive requirement has been met. If `ruby` directive doesn't
+match the running Ruby VM, it will tell you what part does not.
+
+## OPTIONS
+
+* `--ruby`:
+  It will just display the ruby directive information, so you don't have to
+  parse it from the Gemfile(5).

man/bundle.ronn

@@ -73,6 +73,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 * `bundle gem(1)`:
   Create a simple gem, suitable for development with bundler
 
+* `bundle platform(1)`:
+  Displays platform compatibility information
+
 ## OBSOLETE
 
 These commands are obsolete and should no longer be used

man/index.txt

@@ -4,3 +4,4 @@ bundle-update      bundle-update.1
 bundle-package     bundle-package.1
 bundle-exec        bundle-exec.1
 bundle-config      bundle-config.1
+bundle-platform    bundle-platform.1