bundler 0.9.5 → 0.9.6

data/README.markdown

@@ -1,11 +1,5 @@
 ## Bundler : A gem to bundle gems
 
-    Github:       http://github.com/wycats/bundler
-    Mailing list: http://groups.google.com/group/ruby-bundler
-    IRC:          #carlhuda on freenode
-
-## Intro
-
 Bundler is a tool that manages gem dependencies for your ruby application. It
 takes a gem manifest file and is able to fetch, download, and install the gems
 and all child dependencies specified in this manifest. It can manage any update
@@ -14,14 +8,18 @@ you run any ruby code in context of the bundle's gem environment.
 
 ## Installation
 
-Bundler has no dependencies besides Ruby and RubyGems. Just clone the git
-repository and install the gem with the following rake task:
+If you are upgrading from Bundler 0.8, be sure to read the upgrade notes
+located at the bottom of this file.
 
-    rake install
+Bundler has no dependencies besides Ruby and RubyGems. You can install the
+latest release via RubyGems:
 
-You can also install the gem with
+    gem install bundler
 
-    gem install bundler --prerelease
+If you want to contribute, or need a change that hasn't been released yet,
+just clone the git repository and install the gem with rake:
+
+    rake install
 
 ## Usage
 
@@ -78,7 +76,7 @@ Groups are involved in a number of scenarios:
 
 1. When installing gems using bundle install, you can choose to leave
    out any group by specifying `--without {group name}`. This can be
-   helpful if, for instance, you have a gem that you can only compile
+   helpful if, for instance, you have a gem that you cannot compile
    in certain environments.
 2. When setting up load paths using Bundler.setup, Bundler will, by
    default, add the load paths for all groups. You can restrict the
@@ -92,14 +90,15 @@ Groups are involved in a number of scenarios:
 
 ### Installing gems
 
-Once the manifest file has been created, the next step is to install all
-the gems needed to satisfy the Gemfile's dependencies. The `bundle install`
-command will do this.
+Once the Gemfile manifest file has been created, the next step is to install
+all the gems needed to satisfy the manifest's dependencies. The command to
+do this is `bundle install`.
 
 This command will load the Gemfile, resolve all the dependencies, download
-all gems that are missing, and install them to the system's RubyGems
-repository. Every time an update is made to the Gemfile, run `bundle install`
-again to get the new gems installed.
+all gems that are missing, and install them to the bundler's gem repository.
+Gems that are already installed into the system RubyGems repository will be
+referenced, rather than installed again. Every time an update is made to the
+Gemfile, run `bundle install` again to install any newly needed gems.
 
 ### Locking dependencies
 
@@ -108,20 +107,25 @@ Gemfile's dependencies. If you install a newer version of a gem and it
 satisfies the dependencies, it will be used instead of the older one.
 
 The command `bundle lock` will lock the bundle to the current set of
-resolved gems. This ensures that, until the lock file is removed, that
-bundle install and Bundle.setup will always activate the same gems.
+resolved gems. This ensures that, until the lock file is removed,
+`bundle install` and `Bundle.setup` will always activate the same gems.
+
+When you are distributing your application, you should add the Gemfile.lock
+file to your source control, so that the set of libraries your code will
+run against are fixed. Simply run `bundle install` after checking out or
+deploying your code to ensure your libraries are present.
 
 ### Running the application
 
 Bundler must be required and setup before anything else is required. This
-is because it will configure all the load paths and manage rubygems for your.
+is because it will configure all the load paths and manage gems for you.
 To do this, include the following at the beginning of your code.
 
     begin
-      # Require the preresolved locked set of gems.
+      # Try to require the preresolved locked set of gems.
       require File.expand_path('../.bundle/environment', __FILE__)
     rescue LoadError
-      # Fallback on doing the resolve at runtime.
+      # Fall back on doing an unlocked resolve at runtime.
       require "rubygems"
       require "bundler"
       Bundler.setup
@@ -134,17 +138,17 @@ context of the bundle. For example:
 
     bundle exec ruby my_ruby_script.rb
 
-To enter a shell that will run all gem executables (such as rake, rails,
+To enter a shell that will run all gem executables (such as `rake`, `rails`,
 etc... ) use `bundle exec bash` (replacing bash for whatever your favorite
 shell is).
 
 ### Packing the bundle's gems
 
-When sharing or deploying an application, it might be useful to include
+When sharing or deploying an application, you may want to include
 everything necessary to install gem dependencies. `bundle pack` will
 copy .gem files for all of the bundle's dependencies into vendor/cache.
-This way, bundle install can always work no matter what the state of the
-remote sources.
+After that, `bundle install` will always work, since it will install the
+local .gem files, and will not contact any of the remote sources.
 
 ## Gem resolution
 
@@ -180,11 +184,18 @@ so it can detect that all gems *together* require activesupport "2.3.4".
 
 ## Upgrading from Bundler 0.8 to 0.9 and above
 
-Bundler 0.9 changes a number of APIs in the Gemfile.
+Upgrading to Bundler 0.9 from Bundler 0.8 requires upgrading several
+API calls in your Gemfile, and some workarounds if you are using Rails 2.3.
+
+### Rails 2.3
+
+Using Bundler 0.9 with Rails 2.3 requires adding a preinitializer, and
+making a few changes to boot.rb. The exact changes needed can be found at
+[http://gist.github.com/302406](http://gist.github.com/302406).
 
 ### Gemfile Removals
 
-The following Bundler 0.8 APIs are no longer supported:
+Bundler 0.9 removes the following Bundler 0.8 Gemfile APIs:
 
 1. `disable_system_gems`: This is now the default (and only) option
    for bundler. Bundler uses the system gems you have specified
@@ -208,6 +219,8 @@ The following Bundler 0.8 APIs are no longer supported:
 
 ### Gemfile Changes
 
+Bundler 0.9 changes the following Bundler 0.8 Gemfile APIs:
+
 1. Bundler 0.8 supported :only and :except as APIs for describing
    groups of gems. Bundler 0.9 supports a single `group` method,
    which you can use to group gems together. See the above "Group"
@@ -237,13 +250,16 @@ The following Bundler 0.8 APIs are no longer supported:
 
 2. `require 'vendor/gems/environment'`: In unlocked
    mode, where using system gems, this becomes
-   `Bundler.setup(:multiple, groups)`. If you don't
+   `Bundler.setup(:multiple, :groups)`. If you don't
    specify any groups, this puts all groups on the load
    path. In locked, mode, it becomes `require '.bundle/environment'`
 
-## Reporting bugs
+## More information
 
-Please report all bugs on the github issue tracker for the project located
-at:
+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.
+
+## Reporting bugs
 
-    http://github.com/carlhuda/bundler/issues/
+Please report all bugs on the github issue tracker for the project, located at [http://github.com/carlhuda/bundler/issues/](http://github.com/carlhuda/bundler/issues/).

data/bin/bundle

@@ -2,7 +2,7 @@
 require 'bundler'
 $:.each do |path|
   if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
-    abort "Please remove older versions of bundler. This can by running `gem cleanup`."
+    abort "Please remove older versions of bundler. This can be done by running `gem cleanup bundler`."
   end
 end
 require 'bundler/cli'

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems-ext'
 
 module Bundler
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'

data/lib/bundler/dsl.rb

@@ -17,6 +17,9 @@ module Bundler
     def gem(name, *args)
       options = Hash === args.last ? args.pop : {}
       version = args.last || ">= 0"
+      if options[:group]
+        options[:group] = options[:group].to_sym
+      end
 
       _deprecated_options(options)
       _normalize_options(name, version, options)
@@ -48,7 +51,7 @@ module Bundler
     end
 
     def group(name, options = {}, &blk)
-      old, @group = @group, name
+      old, @group = @group, name.to_sym
       yield
     ensure
       @group = old
@@ -77,11 +80,14 @@ module Bundler
     end
 
     def _normalize_hash(opts)
-      opts.each do |k, v|
+      # Cannot modify a hash during an iteration in 1.9
+      opts.keys.each do |k|
         next if String === k
+        v = opts[k]
         opts.delete(k)
         opts[k.to_s] = v
       end
+      opts
     end
 
     def _normalize_options(name, version, opts)

data/lib/bundler/installer.rb

@@ -12,6 +12,9 @@ module Bundler
         return
       end
 
+      # Ensure that BUNDLE_PATH exists
+      FileUtils.mkdir_p(Bundler.bundle_path)
+
       specs.sort_by { |s| s.name }.each do |spec|
         # unless spec.source.is_a?(Source::SystemGems)
           Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} "

data/lib/bundler/runtime.rb

@@ -135,6 +135,7 @@ module Bundler
       shared_helpers = File.read(File.expand_path("../shared_helpers.rb", __FILE__))
       template = File.read(File.expand_path("../templates/environment.erb", __FILE__))
       erb = ERB.new(template, nil, '-')
+      FileUtils.mkdir_p(rb_lock_file.dirname)
       File.open(rb_lock_file, 'w') do |f|
         f.puts erb.result(binding)
       end
@@ -159,9 +160,9 @@ module Bundler
       end
 
       details["dependencies"] = @definition.dependencies.inject({}) do |h,d|
-        h.merge!({d.name => {"version" => d.version_requirements.to_s, "group"   => d.groups} })
-        h[d.name]['require'] = d.autorequire if d.autorequire
-        h
+        info = {"version" => d.version_requirements.to_s, "group" => d.groups}
+        info.merge!("require" => d.autorequire) if d.autorequire
+        h.merge(d.name => info)
       end
       details
     end
@@ -185,7 +186,14 @@ module Bundler
     def autorequires_for_groups(*groups)
       groups.map! { |g| g.to_sym }
       autorequires = Hash.new { |h,k| h[k] = [] }
-      @definition.dependencies.each do |dep|
+
+      ordered_deps = []
+      specs_for(*groups).each do |g|
+        dep = @definition.dependencies.find{|d| d.name == g.name }
+        ordered_deps << dep if dep && !ordered_deps.include?(dep)
+      end
+
+      ordered_deps.each do |dep|
         dep.groups.each do |group|
           # If there is no autorequire, then rescue from
           # autorequiring the gems name
@@ -247,7 +255,8 @@ module Bundler
       source_index_class = (class << Gem::SourceIndex ; self ; end)
       source_index_class.send(:define_method, :from_gems_in) do |*args|
         source_index = Gem::SourceIndex.new
-        source_index.add_specs *specs
+        source_index.spec_dirs = *args
+        source_index.add_specs(*specs)
         source_index
       end
 

data/lib/bundler/shared_helpers.rb

@@ -34,7 +34,7 @@ module Bundler
       until !File.directory?(current) || current == previous
         filename = File.join(current, 'Gemfile')
         return filename if File.file?(filename)
-        current, previous = File.expand_path("#{current}/.."), current
+        current, previous = File.expand_path("..", current), current
       end
     end
 

data/lib/bundler/source.rb

@@ -236,7 +236,7 @@ module Bundler
             # Loop over the lines and extract the relative path and the
             # git hash
             lines.each do |line|
-              next unless line =~ %r{^(\d+) (blob|tree) ([a-zf0-9]+)\t(.*)$}
+              next unless line =~ %r{^(\d+) (blob|tree) ([a-f0-9]+)\t(.*)$}
               hash, file = $3, $4
               # Read the gemspec
               if spec = eval(%x(git cat-file blob #{$3}))

data/lib/bundler/templates/environment.erb

@@ -31,6 +31,7 @@ module Bundler
 
   def self.setup(*groups)
     match_fingerprint
+    clean_load_path
     SPECS.each do |spec|
       spec[:load_paths].each { |path| $LOAD_PATH.unshift path }
     end
@@ -53,6 +54,11 @@ module Bundler
   end
 
   def self.patch_rubygems
+    Kernel.class_eval do
+      private
+      def gem(*) ; end
+    end
+    Gem.source_index # ensure RubyGems is fully loaded
     specs = SPECS
 
     ::Kernel.send(:define_method, :gem) do |dep, *reqs|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 -08:00
+date: 2010-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: []