bundler 0.7.2 → 0.7.3.pre

data/README.markdown

@@ -66,6 +66,15 @@ information, please refer to Bundler::ManifestBuilder.
     # the gemspec is found in.
     gem "rspec", "1.1.6", :vendored_at => "vendor/rspec"
 
+    # You can also control what will happen when you run Bundler.require_env
+    # by using the :require_as option, as per the next two examples.
+
+    # Don't auto-require this gem.
+    gem "rspec-rails", "1.2.9", :require_as => nil
+
+    # Require something other than the default.
+    gem "yajl-ruby", "0.6.7", :require_as => "yajl/json_gem"
+
     # Works exactly like :vendored_at, but first downloads the repo from
     # git and handles stashing the files for you. As with :vendored_at,
     # Bundler will automatically use *.gemspec files in the root or anywhere

data/lib/bundler.rb

@@ -19,7 +19,7 @@ require "bundler/dependency"
 require "bundler/remote_specification"
 
 module Bundler
-  VERSION = "0.7.2"
+  VERSION = "0.7.3.pre"
 
   class << self
     attr_writer :logger

data/lib/bundler/bundle.rb

@@ -7,10 +7,14 @@ module Bundler
     def initialize(path, bindir)
       FileUtils.mkdir_p(path)
 
-      @path   = Pathname.new(path)
+      @path = Pathname.new(path)
       @bindir = Pathname.new(bindir)
 
-      @cache = GemDirectorySource.new(:location => @path.join("cache"))
+      @cache_path = @path.join('cache')
+      @cache = GemDirectorySource.new(:location => @cache_path)
+
+      @specs_path = @path.join('specifications')
+      @gems_path = @path.join('gems')
     end
 
     def install(dependencies, sources, options = {})
@@ -51,10 +55,10 @@ module Bundler
     end
 
     def cache(*gemfiles)
-      FileUtils.mkdir_p(@path.join("cache"))
+      FileUtils.mkdir_p(@cache_path)
       gemfiles.each do |gemfile|
         Bundler.logger.info "Caching: #{File.basename(gemfile)}"
-        FileUtils.cp(gemfile, @path.join("cache"))
+        FileUtils.cp(gemfile, @cache_path)
       end
     end
 
@@ -70,7 +74,7 @@ module Bundler
         specs.each do |spec|
           unless bundle.any? { |s| s.name == spec.name && s.version == spec.version }
             Bundler.logger.info "Pruning #{spec.name} (#{spec.version}) from the cache"
-            FileUtils.rm @path.join("cache", "#{spec.full_name}.gem")
+            FileUtils.rm @cache_path.join("#{spec.full_name}.gem")
           end
         end
       end
@@ -85,8 +89,8 @@ module Bundler
     end
 
     def source_index
-      index = Gem::SourceIndex.from_gems_in(@path.join("specifications"))
-      index.each { |n, spec| spec.loaded_from = @path.join("specifications", "#{spec.full_name}.gemspec") }
+      index = Gem::SourceIndex.from_gems_in(@specs_path)
+      index.each { |n, spec| spec.loaded_from = @specs_path.join("#{spec.full_name}.gemspec") }
       index
     end
 
@@ -110,9 +114,9 @@ module Bundler
     def do_install(bundle, options)
       bundle.each do |spec|
         next if options[:no_bundle].include?(spec.name)
-        spec.loaded_from = @path.join("specifications", "#{spec.full_name}.gemspec")
+        spec.loaded_from = @specs_path.join("#{spec.full_name}.gemspec")
         # Do nothing if the gem is already expanded
-        next if @path.join("gems", spec.full_name).directory?
+        next if @gems_path.join(spec.full_name).directory?
 
         case spec.source
         when GemSource, GemDirectorySource, SystemGemSource
@@ -129,11 +133,12 @@ module Bundler
         # HAX -- Generate the bin
         bin_dir = @bindir
         path    = @path
+        gems_path = @gems_path
         installer = Gem::Installer.allocate
         installer.instance_eval do
           @spec     = spec
           @bin_dir  = bin_dir
-          @gem_dir  = path.join("gems", "#{spec.full_name}")
+          @gem_dir  = gems_path.join(spec.full_name)
           @gem_home = path
           @wrappers = true
           @format_executable = false
@@ -146,7 +151,7 @@ module Bundler
     def expand_gemfile(spec, options)
       Bundler.logger.info "Installing #{spec.name} (#{spec.version})"
 
-      gemfile = @path.join("cache", "#{spec.full_name}.gem").to_s
+      gemfile = @cache_path.join("#{spec.full_name}.gem").to_s
 
       if build_args = options[:build_options] && options[:build_options][spec.name]
         Gem::Command.build_args = build_args.map {|k,v| "--with-#{k}=#{v}"}
@@ -169,12 +174,12 @@ module Bundler
 
     def expand_vendored_gem(spec, options)
       add_spec(spec)
-      FileUtils.mkdir_p(@path.join("gems"))
-      File.symlink(spec.location, @path.join("gems", spec.full_name))
+      FileUtils.mkdir_p(@gems_path)
+      File.symlink(spec.location, @gems_path.join(spec.full_name))
     end
 
     def add_spec(spec)
-      destination = path.join('specifications')
+      destination = @specs_path
       destination.mkdir unless destination.exist?
 
       File.open(destination.join("#{spec.full_name}.gemspec"), 'w') do |f|
@@ -203,8 +208,8 @@ module Bundler
     end
 
     def cleanup_spec(spec)
-      FileUtils.rm_rf(@path.join("specifications", "#{spec.full_name}.gemspec"))
-      FileUtils.rm_rf(@path.join("gems", spec.full_name))
+      FileUtils.rm_rf(@specs_path.join("#{spec.full_name}.gemspec"))
+      FileUtils.rm_rf(@gems_path.join(spec.full_name))
     end
 
     def expand(options)
@@ -214,12 +219,16 @@ module Bundler
     end
 
     def configure(specs, options)
+      FileUtils.mkdir_p(path)
       generate_environment(specs, options)
+      generate_environment_picker
     end
 
-    def generate_environment(specs, options)
-      FileUtils.mkdir_p(path)
+    def generate_environment_picker
+      FileUtils.cp("#{File.dirname(__FILE__)}/templates/environment_picker.erb", path.join("../../environment.rb"))
+    end
 
+    def generate_environment(specs, options)
       load_paths = load_paths_for_specs(specs, options)
       bindir     = @bindir.relative_path_from(path).to_s
       filename   = options[:manifest].relative_path_from(path).to_s
@@ -236,7 +245,9 @@ module Bundler
       specs.each do |spec|
         next if options[:no_bundle].include?(spec.name)
         gem_path = Pathname.new(spec.full_gem_path)
-        load_paths << load_path_for(gem_path, spec.bindir) if spec.bindir
+        if spec.bindir && gem_path.join(spec.bindir).exist?
+          load_paths << load_path_for(gem_path, spec.bindir)
+        end
         spec.require_paths.each do |path|
           load_paths << load_path_for(gem_path, path)
         end

data/lib/bundler/dsl.rb

@@ -107,7 +107,7 @@ module Bundler
       options = args.last.is_a?(Hash) ? args.pop : {}
       version = args.last
 
-      keys = %w(vendored_at path only except git path bundle require_as tag branch ref).map(&:to_sym)
+      keys = :vendored_at, :path, :only, :except, :git, :path, :bundle, :require_as, :tag, :branch, :ref
       unless (invalid = options.keys - keys).empty?
         raise InvalidKey, "Only #{keys.join(", ")} are valid options to #gem. You used #{invalid.join(", ")}"
       end
@@ -171,7 +171,7 @@ module Bundler
 
     def _handle_git_option(name, version, options)
       git    = options[:git].to_s
-      ref    = options[:commit] || options[:tag]
+      ref    = options[:ref] || options[:tag]
       branch = options[:branch]
 
       if source = @git || @git_sources[git]

data/lib/bundler/environment.rb

@@ -9,6 +9,10 @@ module Bundler
     attr_accessor :rubygems, :system_gems
     attr_writer :gem_path, :bindir
 
+    def self.default_gem_path(root)
+      Pathname.new("#{root}/vendor/gems/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}")
+    end
+
     def initialize(filename)
       @filename         = filename
       @default_sources  = default_sources
@@ -114,7 +118,7 @@ module Bundler
     end
 
     def gem_path
-      @gem_path ||= root.join("vendor", "gems")
+      @gem_path ||= self.class.default_gem_path(root)
     end
 
     def bindir

data/lib/bundler/resolver.rb

@@ -235,7 +235,7 @@ module Bundler
           found.reject! { |spec| spec.version.prerelease? }
         end
 
-        found.sort_by {|s| [s.version, s.platform == 'ruby' ? "\0" : s.platform] }
+        found.sort_by {|s| [s.version, s.platform.to_s == 'ruby' ? "\0" : s.platform.to_s] }
       end
     end
   end

data/lib/bundler/source.rb

@@ -69,17 +69,10 @@ module Bundler
 
     def fetch_specs
       Bundler.logger.info "Updating source: #{to_s}"
+      build_gem_index(fetch_main_specs + fetch_prerelease_specs)
+    end
 
-      fetcher = Gem::RemoteFetcher.fetcher
-      main_index = fetcher.fetch_path("#{uri}/specs.4.8.gz")
-      begin
-        prerelease_index = fetcher.fetch_path("#{uri}/prerelease_specs.4.8.gz")
-        index = Marshal.load(main_index) + Marshal.load(prerelease_index)
-      rescue Gem::RemoteFetcher::FetchError
-        Bundler.logger.warn "Source '#{uri}' does not support prerelease gems"
-        index = Marshal.load(main_index)
-      end
-
+    def build_gem_index(index)
       gems = Hash.new { |h,k| h[k] = [] }
       index.each do |name, version, platform|
         spec = RemoteSpecification.new(name, version, platform, @uri)
@@ -87,9 +80,20 @@ module Bundler
         gems[spec.name] << spec if Gem::Platform.match(spec.platform)
       end
       gems
+    end
+
+    def fetch_main_specs
+      Marshal.load(Gem::RemoteFetcher.fetcher.fetch_path("#{uri}/specs.4.8.gz"))
     rescue Gem::RemoteFetcher::FetchError => e
       raise ArgumentError, "#{to_s} is not a valid source: #{e.message}"
     end
+
+    def fetch_prerelease_specs
+      Marshal.load(Gem::RemoteFetcher.fetcher.fetch_path("#{uri}/prerelease_specs.4.8.gz"))
+    rescue Gem::RemoteFetcher::FetchError
+      Bundler.logger.warn "Source '#{uri}' does not support prerelease gems"
+      []
+    end
   end
 
   class SystemGemSource < Source
@@ -288,8 +292,8 @@ module Bundler
     def initialize(options)
       super
       @uri = options[:uri]
-      @ref = options[:ref]
-      @branch = options[:branch]
+      @branch = options[:branch] || 'master'
+      @ref = options[:ref] || "origin/#{@branch}"
     end
 
     def location
@@ -298,24 +302,8 @@ module Bundler
     end
 
     def gems
-      unless location.directory?
-        # Raise an error if the source should run in local mode,
-        # but it has not been cached yet.
-        if local
-          raise SourceNotCached, "Git repository '#{@uri}' has not been cloned yet"
-        end
-
-        FileUtils.mkdir_p(location.dirname)
-
-        Bundler.logger.info "Cloning git repository at: #{@uri}"
-        `git clone #{@uri} #{location} --no-hardlinks`
-
-        if @ref
-          Dir.chdir(location) { `git checkout --quiet #{@ref}` }
-        elsif @branch && @branch != "master"
-          Dir.chdir(location) { `git checkout --quiet origin/#{@branch}` }
-        end
-      end
+      update
+      checkout
       super
     end
 
@@ -326,5 +314,37 @@ module Bundler
     def to_s
       "git: #{uri}"
     end
+
+    private
+      def update
+        if location.directory?
+          fetch
+        else
+          clone
+        end
+      end
+
+      def fetch
+        unless local
+          Bundler.logger.info "Fetching git repository at: #{@uri}"
+          Dir.chdir(location) { `git fetch origin` }
+        end
+      end
+
+      def clone
+        # Raise an error if the source should run in local mode,
+        # but it has not been cached yet.
+        if local
+          raise SourceNotCached, "Git repository '#{@uri}' has not been cloned yet"
+        end
+
+        Bundler.logger.info "Cloning git repository at: #{@uri}"
+        FileUtils.mkdir_p(location.dirname)
+        `git clone #{@uri} #{location} --no-hardlinks`
+      end
+
+      def checkout
+        Dir.chdir(location) { `git checkout --quiet #{@ref}` }
+      end
   end
 end

data/lib/bundler/templates/environment.erb

@@ -26,7 +26,7 @@ module Bundler
   @gemfile = "#{dir}/<%= filename %>"
 
 <% if options[:rubygems] -%>
-  require "rubygems"
+  require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded
 
   @bundled_specs = {}
 <% specs.each do |spec| -%>

data/lib/bundler/templates/environment_picker.erb

@@ -0,0 +1,4 @@
+require 'rbconfig'
+engine  = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+version = Config::CONFIG['ruby_version']
+require File.expand_path("../#{engine}/#{version}/environment", __FILE__)

metadata

@@ -1,52 +1,53 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3.pre
 platform: ruby
 authors: 
-  - Yehuda Katz
-  - Carl Lerche
+- Yehuda Katz
+- Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 -08:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: An easy way to vendor gem dependencies
 email: 
-  - wycats@gmail.com
-  - clerche@engineyard.com
+- wycats@gmail.com
+- clerche@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-  - README.markdown
-  - LICENSE
+- README.markdown
+- LICENSE
 files: 
-  - LICENSE
-  - README.markdown
-  - Rakefile
-  - lib/bundler.rb
-  - lib/rubygems_plugin.rb
-  - lib/bundler/bundle.rb
-  - lib/bundler/cli.rb
-  - lib/bundler/dependency.rb
-  - lib/bundler/dsl.rb
-  - lib/bundler/environment.rb
-  - lib/bundler/finder.rb
-  - lib/bundler/gem_bundle.rb
-  - lib/bundler/gem_ext.rb
-  - lib/bundler/remote_specification.rb
-  - lib/bundler/resolver.rb
-  - lib/bundler/runtime.rb
-  - lib/bundler/source.rb
-  - lib/bundler/commands/bundle_command.rb
-  - lib/bundler/commands/exec_command.rb
-  - lib/bundler/templates/app_script.erb
-  - lib/bundler/templates/environment.erb
+- LICENSE
+- README.markdown
+- Rakefile
+- lib/bundler/bundle.rb
+- lib/bundler/cli.rb
+- lib/bundler/commands/bundle_command.rb
+- lib/bundler/commands/exec_command.rb
+- lib/bundler/dependency.rb
+- lib/bundler/dsl.rb
+- lib/bundler/environment.rb
+- lib/bundler/finder.rb
+- lib/bundler/gem_bundle.rb
+- lib/bundler/gem_ext.rb
+- lib/bundler/remote_specification.rb
+- lib/bundler/resolver.rb
+- lib/bundler/runtime.rb
+- lib/bundler/source.rb
+- lib/bundler/templates/app_script.erb
+- lib/bundler/templates/environment.erb
+- lib/bundler/templates/environment_picker.erb
+- lib/bundler.rb
+- lib/rubygems_plugin.rb
 has_rdoc: true
 homepage: http://github.com/wycats/bundler
 licenses: []
@@ -55,18 +56,18 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.5
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.3.5
   version: 
 requirements: []