bundler 1.0.0.beta.2 → 1.0.0.beta.3

data/lib/bundler/runtime.rb

@@ -32,9 +32,8 @@ module Bundler
         end
 
         Gem.loaded_specs[spec.name] = spec
-        spec.load_paths.each do |path|
-          $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
-        end
+        load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path)}
+        $LOAD_PATH.unshift(*load_paths)
       end
       self
     end
@@ -78,6 +77,7 @@ module Bundler
 
       Bundler.ui.info "Updating .gem files in vendor/cache"
       specs.each do |spec|
+        next if spec.name == 'bundler'
         spec.source.cache(spec) if spec.source.respond_to?(:cache)
       end
     end

data/lib/bundler/settings.rb

@@ -6,12 +6,12 @@ module Bundler
     end
 
     def [](key)
-      key = "BUNDLE_#{key.to_s.upcase}"
+      key = key_for(key)
       @config[key] || ENV[key]
     end
 
     def []=(key, value)
-      key = "BUNDLE_#{key.to_s.upcase}"
+      key = key_for(key)
       unless @config[key] == value
         @config[key] = value
         FileUtils.mkdir_p(config_file.dirname)
@@ -32,8 +32,24 @@ module Bundler
       self[:without] ? self[:without].split(":").map { |w| w.to_sym } : []
     end
 
+    def path
+      path = ENV[key_for(:path)]
+
+      return path if path
+
+      if path = self[:path]
+        "#{path}/#{Bundler.ruby_scope}"
+      else
+        Gem.dir
+      end
+    end
+
   private
 
+    def key_for(key)
+      "BUNDLE_#{key.to_s.upcase}"
+    end
+
     def config_file
       Pathname.new("#{@root}/.bundle/config")
     end

data/lib/bundler/source.rb

@@ -97,15 +97,15 @@ module Bundler
         # SUDO HAX
         if Bundler.requires_sudo?
           sudo "mkdir -p #{Gem.dir}/gems #{Gem.dir}/specifications"
-          sudo "mv #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/"
-          sudo "mv #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/"
+          sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/"
+          sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/"
         end
 
         spec.loaded_from = "#{Gem.dir}/specifications/#{spec.full_name}.gemspec"
       end
 
       def sudo(str)
-        `sudo -E #{str}`
+        Bundler.sudo(str)
       end
 
       def cache(spec)
@@ -146,21 +146,29 @@ module Bundler
       def installed_specs
         @installed_specs ||= begin
           idx = Index.new
-          Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |name, spec|
-            next if name == 'bundler'
+          have_bundler = false
+          Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |dont_use_this_var, spec|
+            next if spec.name == 'bundler' && spec.version.to_s != VERSION
+            have_bundler = true if spec.name == 'bundler'
             spec.source = self
             idx << spec
           end
+
           # Always have bundler locally
-          bundler = Gem::Specification.new do |s|
-            s.name     = 'bundler'
-            s.version  = VERSION
-            s.platform = Gem::Platform::RUBY
-            s.source   = self
-            # TODO: Remove this
-            s.loaded_from = 'w0t'
+          unless have_bundler
+           # We're running bundler directly from the source
+           # so, let's create a fake gemspec for it (it's a path)
+           # gemspec
+           bundler = Gem::Specification.new do |s|
+             s.name     = 'bundler'
+             s.version  = VERSION
+             s.platform = Gem::Platform::RUBY
+             s.source   = self
+             # TODO: Remove this
+             s.loaded_from = 'w0t'
+           end
+           idx << bundler
           end
-          idx << bundler
           idx
         end
       end
@@ -446,10 +454,11 @@ module Bundler
 
       def initialize(options)
         super
-        @uri      = options["uri"]
-        @ref      = options["ref"] || options["branch"] || options["tag"] || 'master'
-        @revision = options["revision"]
-        @update   = false
+        @uri        = options["uri"]
+        @ref        = options["ref"] || options["branch"] || options["tag"] || 'master'
+        @revision   = options["revision"]
+        @submodules = options["submodules"]
+        @update     = false
       end
 
       def self.from_lock(options)
@@ -460,7 +469,7 @@ module Bundler
         out = "GIT\n"
         out << "  remote: #{@uri}\n"
         out << "  revision: #{shortref_for(revision)}\n"
-        %w(ref branch tag).each do |opt|
+        %w(ref branch tag submodules).each do |opt|
           out << "  #{opt}: #{options[opt]}\n" if options[opt]
         end
         out << "  glob: #{@glob}\n" unless @glob == DEFAULT_GLOB
@@ -487,7 +496,15 @@ module Bundler
       end
 
       def path
-        Bundler.install_path.join("#{base_name}-#{shortref_for(revision)}")
+        @install_path ||= begin
+          git_scope = "#{base_name}-#{shortref_for(revision)}"
+
+          if Bundler.requires_sudo?
+            Bundler.user_bundle_path.join(Bundler.ruby_scope).join(git_scope)
+          else
+            Bundler.install_path.join(git_scope)
+          end
+        end
       end
 
       def unlock!
@@ -525,11 +542,7 @@ module Bundler
     private
 
       def git(command)
-        if Bundler.requires_sudo?
-          out = %x{sudo -E git #{command}}
-        else
-          out = %x{git #{command}}
-        end
+        out = %x{git #{command}}
 
         if $? != 0
           raise GitError, "An error has occurred in git. Cannot complete bundling."
@@ -558,7 +571,15 @@ module Bundler
       end
 
       def cache_path
-        @cache_path ||= Bundler.cache.join("git", "#{base_name}-#{uri_hash}")
+        @cache_path ||= begin
+          git_scope = "#{base_name}-#{uri_hash}"
+
+          if Bundler.requires_sudo?
+            Bundler.user_bundle_path.join("cache/git", git_scope)
+          else
+            Bundler.cache.join("git", git_scope)
+          end
+        end
       end
 
       def cache
@@ -567,7 +588,7 @@ module Bundler
           in_cache { git %|fetch --force --quiet "#{uri}" refs/heads/*:refs/heads/*| }
         else
           Bundler.ui.info "Fetching #{uri}"
-          FileUtils.mkdir_p(cache_path.dirname)
+          Bundler.mkdir_p(cache_path.dirname)
           git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
         end
       end
@@ -580,8 +601,11 @@ module Bundler
         Dir.chdir(path) do
           git "fetch --force --quiet"
           git "reset --hard #{revision}"
-          git "submodule init"
-          git "submodule update"
+
+          if @submodules
+            git "submodule init"
+            git "submodule update"
+          end
         end
       end
 

data/lib/bundler/spec_set.rb

@@ -18,6 +18,7 @@ module Bundler
 
     def for(dependencies, skip = [], check = false, match_current_platform = false)
       handled, deps, specs = {}, dependencies.dup, []
+      skip << 'bundler'
 
       until deps.empty?
         dep = deps.shift
@@ -44,6 +45,10 @@ module Bundler
         end
       end
 
+      if spec = lookup['bundler'].first
+        specs << spec
+      end
+
       check ? true : SpecSet.new(specs)
     end
 
@@ -56,6 +61,13 @@ module Bundler
       lookup[key].reverse
     end
 
+    def []=(key, value)
+      @specs << value
+      @lookup = nil
+      @sorted = nil
+      value
+    end
+
     def to_a
       sorted.dup
     end
@@ -80,7 +92,12 @@ module Bundler
     end
 
     def merge(set)
-      SpecSet.new(sorted + set.to_a)
+      arr = sorted.dup
+      set.each do |s|
+        next if arr.any? { |s2| s2.name == s.name && s2.version == s.version && s2.platform == s.platform }
+        arr << s
+      end
+      SpecSet.new(arr)
     end
 
   private
@@ -114,4 +131,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/templates/Executable

@@ -1,28 +1,14 @@
 #!/usr/bin/env ruby
-# This is not actually required by the actual library
-# loads the bundled environment
-require 'rubygems'
-
-begin
-  require 'bundler/setup'
-rescue LoadError
-  # Let's not complain if bundler isn't around
-end
-
-base  = File.basename($0)
-paths = ENV['PATH'].split(File::PATH_SEPARATOR)
-here  = File.expand_path(File.dirname(__FILE__))
+#
+# This file was generated by Bundler.
+#
+# The application '<%= executable %>' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-gem_stub = paths.find do |path|
-  path = File.expand_path(path)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../<%= relative_gemfile_path %>", __FILE__)
 
-  next if path == here
-
-  File.exist?("#{path}/#{base}")
-end
+require 'rubygems'
+require 'bundler/setup'
 
-if gem_stub
-  load "#{gem_stub}/#{base}"
-else
-  abort "The gem stub #{base} could not be found"
-end
+load Gem.bin_path('<%= spec.name %>', '<%= executable %>')

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.0.beta.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.0.beta.3" unless defined?(::Bundler::VERSION)
 end

data/lib/bundler/version.rbc

@@ -0,0 +1,130 @@
+!RBIX
+1993355899764403924
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+7
+Bundler
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+7
+Bundler
+i
+12
+5
+66
+65
+7
+0
+7
+1
+64
+49
+2
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+7
+VERSION
+s
+8
+0.10.pre
+x
+9
+const_set
+p
+3
+I
+2
+I
+2
+I
+c
+x
+49
+/Users/wycats/Code/bundler/lib/bundler/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+49
+/Users/wycats/Code/bundler/lib/bundler/version.rb
+p
+0

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 2
-  version: 1.0.0.beta.2
+  - 3
+  version: 1.0.0.beta.3
 platform: ruby
 authors: 
 - Carl Lerche
@@ -18,13 +18,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,6 +45,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/bundle
+- bin/rake
 - lib/bundler/cli.rb
 - lib/bundler/definition.rb
 - lib/bundler/dependency.rb
@@ -57,6 +59,7 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
+- lib/bundler/rubygems_ext.rbc
 - lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
@@ -85,14 +88,16 @@ files:
 - lib/bundler/vendor/thor/version.rb
 - lib/bundler/vendor/thor.rb
 - lib/bundler/version.rb
+- lib/bundler/version.rbc
 - lib/bundler.rb
+- lib/bundler.rbc
 - LICENSE
 - README.md
 - ROADMAP.md
 - CHANGELOG.md
 - TODO.md
 has_rdoc: true
-homepage: http://github.com/carlhuda/bundler
+homepage: http://gembundler.com
 licenses: []
 
 post_install_message: 
@@ -101,6 +106,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -108,6 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -119,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies