bundler 1.1.pre.9 → 1.1.pre.10

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.pre.10 (Sep 27, 2011)
+
+Features:
+
+  - `config system_bindir foo` added, works like "-n foo" in your .gemrc file
+
 ## 1.1.pre.9 (Sep 18, 2011)
 
 Features:
@@ -125,6 +131,17 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
+## 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
 
@@ -219,18 +220,27 @@ module Bundler
       SharedHelpers.default_lockfile
     end
 
+    def system_bindir
+      # Gem.bindir doesn't always return the location that Rubygems will install
+      # system binaries. If you put '-n foo' in your .gemrc, Rubygems will
+      # install binstubs there instead. Unfortunately, Rubygems doesn't expose
+      # that directory at all, so rather than parse .gemrc ourselves, we allow
+      # the directory to be set as well, via `bundle config bindir foo`.
+      Bundler.settings[:system_bindir] || Bundler.rubygems.gem_bindir
+    end
+
     def requires_sudo?
       return @requires_sudo if defined?(@checked_for_sudo)
 
       path = bundle_path
       path = path.parent until path.exist?
       sudo_present = !(`which sudo` rescue '').empty?
-      bin_dir = Pathname.new(Bundler.rubygems.gem_bindir)
+      bin_dir = Pathname.new(Bundler.system_bindir)
       bin_dir = bin_dir.parent until bin_dir.exist?
 
       @checked_for_sudo = true
-      can_write_gems = !File.writable?(path) || !File.writable?(bin_dir)
-      @requires_sudo = settings.allow_sudo? && can_write_gems && sudo_present
+      sudo_gems = !File.writable?(path) || !File.writable?(bin_dir)
+      @requires_sudo = settings.allow_sudo? && sudo_gems && sudo_present
     end
 
     def mkdir_p(path)

data/lib/bundler/cli.rb

@@ -217,7 +217,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/fetcher.rb

@@ -32,7 +32,7 @@ module Bundler
         Bundler.rubygems.download_gem(spec, uri, download_path)
 
         if Bundler.requires_sudo?
-          Bundler.sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache"
+          Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
           Bundler.sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
         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

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

data/lib/bundler/rubygems_integration.rb

@@ -50,12 +50,7 @@ module Bundler
     end
 
     def gem_bindir
-      # We use Gem.dir/bin because on OS X, Gem.bindir is hardcoded to return
-      # /usr/bin, a directory owned by root. Users who chown Gem.dir need bins
-      # to be installed where they have permissions. Furthermore, the official
-      # solution to change the bindir is adding -n to .gemrc, but Rubygems does
-      # not honor the -n option in either Gem.bindir or Installer.new.bindir.
-      File.join Gem.dir, "bin"
+      Gem.bindir
     end
 
     def user_home

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/source.rb

@@ -78,15 +78,21 @@ module Bundler
 
         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
         path = cached_gem(spec)
-        install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
+        if Bundler.requires_sudo?
+          install_path = Bundler.tmp
+          bin_path     = install_path.join("bin")
+        else
+          install_path = Bundler.rubygems.gem_dir
+          bin_path     = Bundler.system_bindir
+        end
 
         Bundler.rubygems.preserve_paths do
           Bundler::GemInstaller.new(path,
-            :install_dir         => install_path,
+            :install_dir         => install_path.to_s,
+            :bin_dir             => bin_path.to_s,
             :ignore_dependencies => true,
             :wrappers            => true,
-            :env_shebang         => true,
-            :bin_dir => "#{install_path}/bin"
+            :env_shebang         => true
           ).install
         end
 
@@ -96,12 +102,13 @@ module Bundler
 
         # SUDO HAX
         if Bundler.requires_sudo?
-          Bundler.sudo "mkdir -p #{Bundler.rubygems.gem_dir}/gems #{Bundler.rubygems.gem_dir}/specifications"
+          Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/gems"
+          Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/specifications"
           Bundler.sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/"
           Bundler.sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/"
           spec.executables.each do |exe|
-            Bundler.sudo "mkdir -p #{Bundler.rubygems.gem_bindir}"
-            Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}"
+            Bundler.mkdir_p Bundler.system_bindir
+            Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.system_bindir}"
           end
         end
 

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.1.pre.9" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.10" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -259,7 +259,7 @@ describe "gemcutter's dependency API" do
   end
 
   it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
-    sys_exec "mkdir -p #{system_gem_path("bin")}"
+    sudo "mkdir -p #{system_gem_path("bin")}"
     sudo "chown -R root #{system_gem_path("bin")}"
 
     gemfile <<-G

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

@@ -491,6 +491,18 @@ describe "bundle install with gem sources" do
       should_be_installed "rack 1.0.0"
     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
+
     it "prints a warning to let the user know what has happened with bundle --path vendor/bundle" do
       bundle "install --path vendor/bundle"
       out.should include("It was installed into ./vendor")
@@ -601,7 +613,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})
@@ -658,10 +670,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
@@ -678,8 +690,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
@@ -733,22 +745,22 @@ describe "bundle install with gem sources" do
     end
   end
 
-  describe "when Gem.bindir is hardcoded to a root-owned directory" do
-    # On OS X, Gem.bindir is hardcoded to /usr/bin. :(
-    it "installs binstubs into Gem.dir+'/bin' instead" do
+  describe "when system_bindir is set" do
+    # On OS X, Gem.bindir defaults to /usr/bin, so system_bindir is useful if
+    # you want to avoid sudo installs for system gems with OS X's default ruby
+    it "overrides Gem.bindir" do
       Pathname.new("/usr/bin").should_not be_writable
-
       gemfile <<-G
         require 'rubygems'
-        def Gem.bindir(dir=Gem.dir); "/usr/bin"; end
-
+        def Gem.bindir; "/usr/bin"; end
         source "file://#{gem_repo1}"
         gem "rack"
       G
 
+      config "BUNDLE_SYSTEM_BINDIR" => system_gem_path('altbin').to_s
       bundle :install
       should_be_installed "rack 1.0.0"
-      system_gem_path("bin/rackup").should exist
+      system_gem_path("altbin/rackup").should exist
     end
   end
 

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,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1923831891
+  hash: 1923831893
   prerelease: true
   segments: 
   - 1
   - 1
   - pre
-  - 9
-  version: 1.1.pre.9
+  - 10
+  version: 1.1.pre.10
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -07:00
+date: 2011-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency