bundler 1.0.0.beta.8 → 1.0.0.beta.9

data/CHANGELOG.md

@@ -1,4 +1,44 @@
-## 0.10.0
+## 1.0.0.beta.9 (July 21, 2010)
+
+  - Fix install failure when switching from a path to git source
+  - Fix `bundle exec bundle *` in a bundle with --disable-shared-gems
+  - Fix `bundle *` from inside a bundle with --disable-shared-gem
+  - Shim Gem.refresh. This is used by Unicorn
+  - Fix install failure when a path's dependencies changed
+
+## 1.0.0.beta.8 (July 20, 2010)
+
+  - Fix a Beta 7 bug involving Ruby 1.9
+
+## 1.0.0.beta.7 (July 20, 2010, yanked)
+
+  - Running `bundle install` twice in a row with a git source always crashed
+
+## 1.0.0.beta.6 (July 20, 2010, yanked)
+
+  - Create executables with bundle install --binstubs
+  - You can customize the location (default is app/bin) with --binstubs other/location
+  - Fix a bug where the Gemfile.lock would be deleted even if the update was exited
+  - Fix a bug where cached gems for other platforms were sometimes deleted
+  - Clean up output when nothing was deleted from cache (it previously said
+    "Removing outdated gems ...")
+  - Improve performance of bundle install if the git gem was already checked out,
+    and the revision being used already exists locally
+  - Fix bundle show bundler in some cases
+  - Fix bugs with bundle update
+  - Don't ever run git commands at runtime (fixes a number of common passenger issues)
+  - Fixes an obscure bug where switching the source of a gem could fail to correctly
+    change the source of its dependencies
+  - Support multiple version dependencies in the Gemfile
+    (gem "rails", ">= 3.0.0.beta1", "<= 3.0.0")
+  - Raise an exception for ambiguous uses of multiple declarations of the same gem
+    (for instance, with different versions or sources).
+  - Fix cases where the same dependency appeared several times in the Gemfile.lock
+  - Fix a bug where require errors were being swallowed during Bundler.require
+
+## BACKFILL COMING
+
+## 1.0.0.beta.1
 
   - No `bundle lock` command. Locking happens automatically on install or update
   - No .bundle/environment.rb. Require 'bundler/setup' instead.

data/lib/bundler/cli.rb

@@ -212,21 +212,7 @@ module Bundler
     def exec(*)
       ARGV.delete("exec")
 
-      # Set PATH
-      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
-      paths.unshift "#{Bundler.bundle_path}/bin"
-      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
-
-      # Set BUNDLE_GEMFILE
-      ENV["BUNDLE_GEMFILE"] = Bundler::SharedHelpers.default_gemfile.to_s
-
-      # Set RUBYOPT
-      rubyopt = [ENV["RUBYOPT"]].compact
-      if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
-        rubyopt.unshift "-rbundler/setup"
-        rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
-        ENV["RUBYOPT"] = rubyopt.join(' ')
-      end
+      Bundler.setup
 
       begin
         # Run

data/lib/bundler/definition.rb

@@ -204,9 +204,16 @@ module Bundler
       end
     end
 
+    # Remove elements from the locked specs that are expired. This will most
+    # commonly happen if the Gemfile has changed since the lockfile was last
+    # generated
     def converge_locked_specs
       deps = []
 
+      # Build a list of dependencies that are the same in the Gemfile
+      # and Gemfile.lock. If the Gemfile modified a dependency, but
+      # the gem in the Gemfile.lock still satisfies it, this is fine
+      # too.
       @dependencies.each do |dep|
         if in_locked_deps?(dep) || satisfies_locked_spec?(dep)
           deps << dep
@@ -217,10 +224,22 @@ module Bundler
       @last_resolve.each do |s|
         s.source = @sources.find { |src| s.source == src }
 
+        # Don't add a spec to the list if its source is expired. For example,
+        # if you change a Git gem to Rubygems.
         next if s.source.nil? || @unlock[:sources].include?(s.name)
         # If the spec is from a path source and it doesn't exist anymore
         # then we just unlock it.
-        next if s.source.instance_of?(Source::Path) && s.source.specs[s].empty?
+
+        # Path sources have special logic
+        if s.source.instance_of?(Source::Path)
+          other = s.source.specs[s].first
+
+          # If the spec is no longer in the path source, unlock it. This
+          # commonly happens if the version changed in the gemspec
+          next unless other
+          # If the dependencies of the path source have changed, unlock it
+          next unless s.dependencies.sort == other.dependencies.sort
+        end
 
         converged << s
       end

data/lib/bundler/runtime.rb

@@ -10,6 +10,7 @@ module Bundler
 
       specs = groups.any? ? @definition.specs_for(groups) : requested_specs
 
+      setup_environment
       cripple_rubygems(specs)
 
       # Activate the specs
@@ -120,5 +121,28 @@ module Bundler
       root.join("vendor/cache")
     end
 
+    def setup_environment
+      begin
+        ENV["BUNDLE_BIN_PATH"] = Gem.bin_path("bundler", "bundle", VERSION)
+      rescue Gem::GemNotFoundException
+        ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__)
+      end
+
+      # Set PATH
+      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
+      paths.unshift "#{Bundler.bundle_path}/bin"
+      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
+
+      # Set BUNDLE_GEMFILE
+      ENV["BUNDLE_GEMFILE"] = default_gemfile.to_s
+
+      # Set RUBYOPT
+      rubyopt = [ENV["RUBYOPT"]].compact
+      if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
+        rubyopt.unshift "-rbundler/setup"
+        rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
+        ENV["RUBYOPT"] = rubyopt.join(' ')
+      end
+    end
   end
 end

data/lib/bundler/setup.rb

@@ -12,4 +12,4 @@ if Bundler::SharedHelpers.in_bundle?
   # Add bundler to the load path after disabling system gems
   bundler_lib = File.expand_path("../..", __FILE__)
   $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
-end
+end

data/lib/bundler/shared_helpers.rb

@@ -118,9 +118,14 @@ module Bundler
 
       # OMG more hacks
       gem_class = (class << Gem ; self ; end)
+      gem_class.send(:define_method, :refresh) { }
       gem_class.send(:define_method, :bin_path) do |name, *args|
         exec_name, *reqs = args
 
+        if exec_name == 'bundle'
+          return ENV['BUNDLE_BIN_PATH']
+        end
+
         spec = nil
 
         if exec_name
@@ -141,4 +146,4 @@ module Bundler
 
     extend self
   end
-end
+end

data/lib/bundler/source.rb

@@ -305,7 +305,7 @@ module Bundler
       end
 
       def eql?(o)
-        Path === o     &&
+        o.instance_of?(Path) &&
         path == o.path &&
         name == o.name &&
         version == o.version

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

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 8
-  version: 1.0.0.beta.8
+  - 9
+  version: 1.0.0.beta.9
 platform: ruby
 authors: 
 - Carl Lerche
@@ -18,14 +18,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -07:00
+date: 2010-07-21 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 
@@ -103,7 +102,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -111,7 +109,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -123,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies