bundler 1.0.20.rc → 1.0.20

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.20 (September 27, 2011)
+
+Features:
+
+  - Add platform :maglev (@timfel, #1444)
+
+Bugfixes:
+
+  - Ensure yaml is required even if psych is found
+  - Handle directory names that contain invalid regex characters
+
 ## 1.0.20.rc (September 18, 2011)
 
 Features:

data/lib/bundler.rb

@@ -4,8 +4,9 @@ require 'pathname'
 
 begin
   # Pull in Psych if we can, but not if Syck is already loaded
-  require 'psych' unless defined?(YAML)
+  require 'psych' unless defined?(::YAML)
 rescue LoadError
+ensure
   require 'yaml'
 end
 

data/lib/bundler/cli.rb

@@ -220,7 +220,8 @@ module Bundler
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
-        relative_path = File.expand_path(Bundler.settings[:path]).sub(/^#{File.expand_path('.')}/, '.')
+        absolute_path = File.expand_path(Bundler.settings[:path])
+        relative_path = absolute_path.sub(File.expand_path('.'), '.')
         Bundler.ui.confirm "Your bundle is complete! " +
           "It was installed into #{relative_path}"
       else

data/lib/bundler/dependency.rb

@@ -79,7 +79,7 @@ module Bundler
   private
 
     def ruby?
-      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx")
+      !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
 
     def ruby_18?
@@ -110,6 +110,10 @@ module Bundler
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end
 
+    def maglev?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "maglev"
+    end
+
     def mswin?
       Bundler::WINDOWS
     end

data/lib/bundler/resolver.rb

@@ -179,15 +179,15 @@ module Bundler
           activated[a.name] ? 0 : gems_size(a) ]
       end
 
-      debug { "Activated:\n" + activated.values.map { |a| "  #{a.name} (#{a.version})" }.join("\n") }
-      debug { "Requirements:\n" + reqs.map { |r| "  #{r.name} (#{r.requirement})"}.join("\n") }
+      debug { "Activated:\n" + activated.values.map {|a| "  #{a}" }.join("\n") }
+      debug { "Requirements:\n" + reqs.map {|r| "  #{r}"}.join("\n") }
 
       activated = activated.dup
 
       # Pull off the first requirement so that we can resolve it
       current = reqs.shift
 
-      debug { "Attempting:\n  #{current.name} (#{current.requirement})"}
+      debug { "Attempting:\n  #{current}"}
 
       # Check if the gem has already been activated, if it has, we will make sure
       # that the currently activated gem satisfies the requirement.

data/lib/bundler/rubygems_ext.rb

@@ -186,7 +186,7 @@ module Bundler
     end
 
     def to_s
-      @dep.to_s
+      "#{name} (#{requirement}) #{__platform}"
     end
 
   private

data/lib/bundler/runtime.rb

@@ -21,7 +21,7 @@ module Bundler
 
         if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version
           e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
-                                 "but your Gemfile requires #{spec.name} #{spec.version}. Consider using bundle exec."
+                                 "but your Gemfile requires #{spec.name} #{spec.version}. Using bundle exec may solve this."
           e.name = spec.name
           if e.respond_to?(:requirement=)
             e.requirement = Gem::Requirement.new(spec.version.to_s)

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.0.20.rc" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.20" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/flex_spec.rb

@@ -199,8 +199,8 @@ describe "bundle flex_install" do
             rack (0.9.1)
 
           In Gemfile:
-            rack-obama (= 2.0) depends on
-              rack (= 1.2)
+            rack-obama (= 2.0) ruby depends on
+              rack (= 1.2) ruby
 
         Running `bundle update` will rebuild your snapshot from scratch, using only
         the gems in your Gemfile, which may resolve the conflict.

data/spec/install/gems/simple_case_spec.rb

@@ -471,6 +471,18 @@ describe "bundle install with gem sources" do
       out.should include "The disable-shared-gem option is no longer available"
     end
 
+    it "handles paths with regex characters in them" do
+      dir = bundled_app("bun++dle")
+      dir.mkpath
+
+      Dir.chdir(dir) do
+        bundle "install --path vendor/bundle"
+        out.should include("installed into ./vendor/bundle")
+      end
+
+      dir.rmtree
+    end
+
     ["install vendor/bundle", "install --path vendor/bundle"].each do |install|
       if install == "install vendor/bundle"
         it "displays the deprecation warning for path as an argument to install" do
@@ -624,7 +636,7 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
-            bundler (= 0.9.2)
+            bundler (= 0.9.2) ruby
 
           Current Bundler version:
             bundler (#{Bundler::VERSION})
@@ -681,10 +693,10 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            activemerchant depends on
-              activesupport (>= 2.0.0)
+            activemerchant (>= 0) ruby depends on
+              activesupport (>= 2.0.0) ruby
 
-            rails_fail depends on
+            rails_fail (>= 0) ruby depends on
               activesupport (1.2.3)
       E
       out.should == nice_error
@@ -701,8 +713,8 @@ describe "bundle install with gem sources" do
         Fetching source index for file:#{gem_repo2}/
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            rails_fail depends on
-              activesupport (= 1.2.3)
+            rails_fail (>= 0) ruby depends on
+              activesupport (= 1.2.3) ruby
 
             activesupport (2.3.5)
       E

data/spec/install/git_spec.rb

@@ -403,7 +403,7 @@ describe "bundle install with git sources" do
         gem "has_submodule"
       end
     G
-    out.should =~ /could not find gem 'submodule'/i
+    out.should =~ /could not find gem 'submodule/i
 
     should_not_be_installed "has_submodule 1.0", :expect_err => true
   end

data/spec/runtime/setup_spec.rb

@@ -450,7 +450,7 @@ describe "Bundler.setup" do
           end
         R
 
-        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Consider using bundle exec."
+        out.should == "You have already activated thin 1.1, but your Gemfile requires thin 1.0. Using bundle exec may solve this."
       end
 
       it "version_requirement is now deprecated in rubygems 1.4.0+" do

data/spec/spec_helper.rb

@@ -1,6 +1,13 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
+begin
+  require 'psych'
+rescue LoadError
+ensure
+  require 'yaml'
+end
+
 require 'fileutils'
 require 'rubygems'
 require 'bundler'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 7712090
-  prerelease: true
+  hash: 63
+  prerelease: false
   segments: 
   - 1
   - 0
   - 20
-  - rc
-  version: 1.0.20.rc
+  version: 1.0.20
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -07:00
+date: 2011-09-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency