bundler 0.9.9 → 0.9.10

data/README.markdown

@@ -276,7 +276,13 @@ Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
 
 Explanations of common Bundler use cases can be found in [Using Bundler in Real Life](http://yehudakatz.com/2010/02/09/using-bundler-in-real-life/). The general philosophy behind Bundler 0.9 is explained at some length in [Bundler 0.9: Heading Toward 1.0](http://yehudakatz.com/2010/02/01/bundler-0-9-heading-toward-1-0/).
 
-Any remaining questions may be directed via email to the [Bundler mailing list](http://groups.google.com/group/ruby-bundler) or via IRC to [#carlhuda](irc://irc.freenode.net/carlhuda) on Freenode.
+### Deploying to memory-constrained servers
+
+When deploying to a server that is memory-constrained, like Dreamhost, you should run `bundle package` on your local development machine, and then check in the resulting `Gemfile.lock` file and `vendor/cache` directory. The lockfile and cached gems will mean bundler can just install the gems immediately, without contacting any gem servers or using a lot of memory to resolve the dependency tree. On the server, you only need to run `bundle install` after you update your deployed code.
+
+### Other questions
+
+Any remaining questions may be asked via IRC in [#carlhuda](irc://irc.freenode.net/carlhuda) on Freenode, or via email on the [Bundler mailing list](http://groups.google.com/group/ruby-bundler).
 
 ## Reporting bugs
 

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems_ext'
 
 module Bundler
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'

data/lib/bundler/environment.rb

@@ -22,7 +22,7 @@ module Bundler
     def group_spec(specs, spec, groups)
       spec.groups.concat(groups)
       spec.groups.uniq!
-      spec.dependencies.select { |d| d.type != :development }.each do |d|
+      spec.bundler_dependencies.select { |d| d.type != :development }.each do |d|
         spec = specs.find { |s| s.name == d.name }
         group_spec(specs, spec, groups)
       end

data/lib/bundler/installer.rb

@@ -7,7 +7,7 @@ module Bundler
     end
 
     def run(options)
-      if dependencies.empty?
+      if actual_dependencies.empty?
         Bundler.ui.warn "The Gemfile specifies no dependencies"
         return
       end
@@ -36,6 +36,10 @@ module Bundler
     end
 
     def dependencies
+      @definition.dependencies
+    end
+
+    def actual_dependencies
       @definition.actual_dependencies
     end
 
@@ -51,19 +55,19 @@ module Bundler
 
     def resolve_locally
       # Return unless all the dependencies have = version requirements
-      return if dependencies.any? { |d| ambiguous?(d) }
+      return if actual_dependencies.any? { |d| ambiguous?(d) }
 
       source_requirements = {}
-      dependencies.each do |dep|
+      actual_dependencies.each do |dep|
         next unless dep.source && dep.source.respond_to?(:local_specs)
         source_requirements[dep.name] = dep.source.local_specs
       end
 
       # Run a resolve against the locally available gems
-      specs = Resolver.resolve(dependencies, local_index, source_requirements)
+      specs = Resolver.resolve(actual_dependencies, local_index, source_requirements)
 
       # Simple logic for now. Can improve later.
-      specs.length == dependencies.length && specs
+      specs.length == actual_dependencies.length && specs
     rescue Bundler::GemNotFound
       nil
       raise if ENV["OMG"]
@@ -73,12 +77,12 @@ module Bundler
       index # trigger building the index
       Bundler.ui.info "Resolving dependencies"
       source_requirements = {}
-      dependencies.each do |dep|
+      actual_dependencies.each do |dep|
         next unless dep.source
         source_requirements[dep.name] = dep.source.specs
       end
 
-      specs = Resolver.resolve(dependencies, index, source_requirements)
+      specs = Resolver.resolve(actual_dependencies, index, source_requirements)
       specs
     end
 
@@ -90,10 +94,6 @@ module Bundler
       @index ||= begin
         index = Index.new
 
-        if File.directory?("#{root}/vendor/cache")
-          index = cache_source.specs.merge(index).freeze
-        end
-
         rg_sources = sources.select { |s| s.is_a?(Source::Rubygems) }
         other_sources = sources.select { |s| !s.is_a?(Source::Rubygems)   }
 
@@ -105,10 +105,14 @@ module Bundler
 
         index = Index.from_installed_gems.merge(index)
 
+        if File.directory?("#{root}/vendor/cache")
+          index = cache_source.specs.merge(index)
+        end
+
         rg_sources.each do |source|
           i = source.specs
           Bundler.ui.debug "Source: Processing index"
-          index = i.merge(index).freeze
+          index = i.merge(index)
         end
 
         index

data/lib/bundler/resolver.rb

@@ -59,7 +59,7 @@ module Bundler
         result.values.each do |spec1|
           index = nil
           place = ordered.detect do |spec2|
-            spec1.dependencies.any? { |d| d.name == spec2.name }
+            spec1.bundler_dependencies.any? { |d| d.name == spec2.name }
           end
           place ?
             ordered.insert(ordered.index(place), spec1) :
@@ -204,7 +204,7 @@ module Bundler
       # Now, we have to loop through all child dependencies and add them to our
       # array of requirements.
       debug { "    Dependencies"}
-      spec.dependencies.each do |dep|
+      spec.bundler_dependencies.each do |dep|
         next if dep.type == :development
         debug { "    * #{dep.name} (#{dep.requirement})" }
         dep.required_by.replace(requirement.required_by)

data/lib/bundler/rubygems_ext.rb

@@ -1,6 +1,6 @@
 unless defined? Gem
-require 'rubygems'
-require 'rubygems/specification'
+  require 'rubygems'
+  require 'rubygems/specification'
 end
 
 module Gem
@@ -17,19 +17,17 @@ module Gem
       @groups ||= []
     end
 
-    module ImplicitRakeDependency
-      def dependencies
-        original = super
-        original << Dependency.new("rake", ">= 0") if implicit_rake_dependency?
-        original
-      end
-
-      private
-        def implicit_rake_dependency?
-          extensions.any? { |e| e =~ /rakefile|mkrf_conf/i }
-        end
+    def bundler_dependencies
+      original = dependencies
+      original << Dependency.new("rake", ">= 0") if implicit_rake_dependency?
+      original
+    end
+
+  private
+
+    def implicit_rake_dependency?
+      extensions.any? { |e| e =~ /rakefile|mkrf_conf/i }
     end
-    include ImplicitRakeDependency
   end
 
   class Dependency

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Carl Lerche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -95,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 1
       - 3
-      - 5
-      version: 1.3.5
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: