bundler 0.9.16 → 0.9.17

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.9.17 (April 7, 2010)
+
+Features:
+
+  - Bundler.require now calls Bundler.setup automatically
+  - Gem::Specification#add_bundler_dependencies added for gemspecs
+
+Bugfixes:
+
+  - Gem paths are not longer duplicated while loading bundler
+  - exec no longer duplicates RUBYOPT if it is already set correctly
+
 ## 0.9.16 (April 3, 2010)
 
 Features:

data/lib/bundler.rb

@@ -70,7 +70,7 @@ module Bundler
     end
 
     def require(*groups)
-      load.require(*groups)
+      setup(*groups).require(*groups)
     end
 
     def load
@@ -144,7 +144,7 @@ module Bundler
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
         ENV['GEM_PATH'] = ''
       else
-        paths = [Gem.dir, Gem.path].flatten.compact.reject{|p| p.empty? }
+        paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
       end

data/lib/bundler/cli.rb

@@ -163,9 +163,11 @@ module Bundler
 
       # Set RUBYOPT
       rubyopt = [ENV["RUBYOPT"]].compact
-      rubyopt.unshift "-rbundler/setup"
-      rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
-      ENV["RUBYOPT"] = rubyopt.join(' ')
+      if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
+        rubyopt.unshift "-rbundler/setup"
+        rubyopt.unshift "-I#{File.expand_path('../..', __FILE__)}"
+        ENV["RUBYOPT"] = rubyopt.join(' ')
+      end
 
       begin
         # Run

data/lib/bundler/rubygems_ext.rb

@@ -31,6 +31,17 @@ module Gem
       gemfile << dependencies_to_gemfile(development_dependencies, :development)
     end
 
+    def add_bundler_dependencies(*groups)
+      groups = [:default] if groups.empty?
+      Bundler.definition.dependencies.each do |dep|
+        if dep.groups.include?(:development)
+          self.add_development_dependency(dep.name, dep.requirement.to_s)
+        elsif (dep.groups & groups).any?
+          self.add_dependency(dep.name, dep.requirement.to_s)
+        end
+      end
+    end
+
   private
 
     def dependencies_to_gemfile(dependencies, group = nil)

data/lib/bundler/runtime.rb

@@ -15,7 +15,9 @@ module Bundler
       # Has to happen first
       clean_load_path
 
-      specs = groups.any? ? specs_for(groups) : requested_specs
+      unloaded = groups - (@loaded_groups || [])
+      @loaded_groups = groups | (@loaded_groups || [])
+      specs = unloaded.any? ? specs_for(unloaded) : requested_specs
 
       cripple_rubygems(specs)
 
@@ -26,7 +28,9 @@ module Bundler
         end
 
         Gem.loaded_specs[spec.name] = spec
-        $LOAD_PATH.unshift(*spec.load_paths)
+        spec.load_paths.each do |path|
+          $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+        end
       end
       self
     end

data/lib/bundler/templates/environment.erb

@@ -50,8 +50,11 @@ module Bundler
     configure_gem_path_and_home(SPECS)
     SPECS.each do |spec|
       Gem.loaded_specs[spec.name] = spec
-      $LOAD_PATH.unshift(*spec.require_paths)
+      spec.require_paths.each do |path|
+        $LOAD_PATH.unshift(path) unless $LOAD_PATH.include?(path)
+      end
     end
+    self
   end
 
   def self.require(*groups)

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.16"
+  VERSION = "0.9.17"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 16
-  version: 0.9.16
+  - 17
+  version: 0.9.17
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -07:00
+date: 2010-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency