bundler 1.2.0.rc.2 → 1.2.0

data/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:

data/lib/bundler/cli.rb

@@ -34,6 +34,7 @@ module Bundler
           bundle-install
           bundle-package
           bundle-update
+          bundle-platform
           gemfile.5)
 
       if manpages.include?(command)

data/lib/bundler/dependency.rb

@@ -87,7 +87,7 @@ module Bundler
     end
 
     def ruby_19?
-      ruby? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
+      ruby? && RUBY_VERSION >= "1.9"
     end
 
     def mri?
@@ -99,7 +99,7 @@ module Bundler
     end
 
     def mri_19?
-      mri? && RUBY_VERSION >= "1.9" && RUBY_VERSION < "2.0"
+      mri? && RUBY_VERSION >= "1.9"
     end
 
     def rbx?

data/lib/bundler/runtime.rb

@@ -74,7 +74,9 @@ module Bundler
               Kernel.require namespaced_file
             rescue LoadError
               REGEXPS.find { |r| r =~ e.message }
-              raise if dep.autorequire || $1.gsub('-', '/') != namespaced_file
+              regex_name = $1
+              raise if dep.autorequire || (regex_name && regex_name.gsub('-', '/') != namespaced_file)
+              raise e if regex_name.nil?
             end
           else
             REGEXPS.find { |r| r =~ e.message }

data/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

data/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).

data/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

data/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

data/spec/runtime/require_spec.rb

@@ -107,6 +107,24 @@ describe "Bundler.require" do
       out.should eq("jquery/rails")
     end
 
+    it "silently passes if the require fails" do
+      build_lib "bcrypt-ruby", "1.0.0", :no_default => true do |s|
+        s.write "lib/brcrypt.rb", "BCrypt = '1.0.0'"
+      end
+      gemfile <<-G
+        path "#{lib_path}"
+        gem "bcrypt-ruby"
+      G
+
+      cmd = <<-RUBY
+        require 'bundler'
+        Bundler.require
+      RUBY
+      ruby(cmd, :expect_err => true)
+
+      err.should be_empty
+    end
+
     it "does not mangle explictly given requires" do
       gemfile <<-G
         path "#{lib_path}"
@@ -118,6 +136,28 @@ describe "Bundler.require" do
       R
       err.should == "ZOMG LOAD ERROR"
     end
+
+    it "handles the case where regex fails" do
+      build_lib "load-fuuu", "1.0.0" do |s|
+        s.write "lib/load-fuuu.rb", "raise LoadError.new(\"Could not open library 'libfuuu-1.0': libfuuu-1.0: cannot open shared object file: No such file or directory.\")"
+      end
+
+      gemfile <<-G
+        path "#{lib_path}"
+        gem "load-fuuu"
+      G
+
+      cmd = <<-RUBY
+        begin
+          Bundler.require
+        rescue LoadError => e
+          $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("Could not open library 'libfuuu-1.0'")
+        end
+      RUBY
+      run(cmd, :expect_err => true)
+
+      err.should == "ZOMG LOAD ERROR"
+    end
   end
 
   describe "using bundle exec" do

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: -430324494
-  prerelease: 6
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 2
   - 0
-  - rc
-  - 2
-  version: 1.2.0.rc.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -20,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-09 00:00:00 Z
+date: 2012-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -159,6 +157,7 @@ files:
 - man/bundle-exec.ronn
 - man/bundle-install.ronn
 - man/bundle-package.ronn
+- man/bundle-platform.ronn
 - man/bundle-update.ronn
 - man/bundle.ronn
 - man/gemfile.5.ronn
@@ -245,12 +244,14 @@ files:
 - lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
 - lib/bundler/man/gemfile.5
+- lib/bundler/man/bundle-platform
 - lib/bundler/man/bundle-package
 - lib/bundler/man/bundle-update
 - lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
 - lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-platform.txt
 - lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
 - lib/bundler/man/bundle-package.txt