bundler 1.1.pre.4 → 1.1.pre.5

data/lib/bundler/rubygems_integration.rb

@@ -46,7 +46,7 @@ module Bundler
     end
 
     def gem_dir
-      Gem.dir.to_s
+      Gem.dir
     end
 
     def gem_bindir
@@ -58,9 +58,7 @@ module Bundler
     end
 
     def gem_path
-      # Make sure that Gem.path is an array of Strings, not some
-      # internal Rubygems object
-      Gem.path.map { |x| x.to_s }
+      Gem.path
     end
 
     def marshal_spec_dir
@@ -75,6 +73,11 @@ module Bundler
       Gem.bin_path(gem, bin, ver)
     end
 
+    def preserve_paths
+      # this is a no-op outside of Rubygems 1.8
+      yield
+    end
+
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -120,7 +123,7 @@ module Bundler
         if executables.include? File.basename(caller.first.split(':').first)
           return
         end
-        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+        reqs.pop if reqs.last.is_a?(Hash)
 
         unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
           dep = Gem::Dependency.new(dep, reqs)
@@ -154,6 +157,16 @@ module Bundler
       end
     end
 
+    if defined? ::Deprecate
+      Deprecate = ::Deprecate
+    elsif defined? Gem::Deprecate
+      Deprecate = Gem::Deprecate
+    else
+      class Deprecate
+        def skip_during; yield; end
+      end
+    end
+
     def stub_source_index137(specs)
       # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
       source_index_class = (class << Gem::SourceIndex ; self ; end)
@@ -169,8 +182,19 @@ module Bundler
     def stub_source_index170(specs)
       Gem::SourceIndex.send(:define_method, :initialize) do |*args|
         @gems = {}
-        self.spec_dirs = *args
-        add_specs(*specs)
+        # You're looking at this thinking: Oh! This is how I make those
+        # rubygems deprecations go away!
+        #
+        # You'd be correct BUT using of this method in production code
+        # must be approved by the rubygems team itself!
+        #
+        # This is your warning. If you use this and don't have approval
+        # we can't protect you.
+        #
+        Deprecate.skip_during do
+          self.spec_dirs = *args
+          add_specs(*specs)
+        end
       end
     end
 
@@ -226,56 +250,70 @@ module Bundler
       Gem.clear_paths
     end
 
-    class Modern < RubygemsIntegration
+    # Rubygems versions 1.3.6 through 1.6.2
+    class Legacy < RubygemsIntegration
       def stub_rubygems(specs)
-        Gem::Specification.all = specs
-
-        Gem.post_reset {
-          Gem::Specification.all = specs
-        }
-
-        stub_source_index170(specs)
+        stub_source_index137(specs)
       end
 
       def all_specs
-        Gem::Specification.to_a
+        Gem.source_index.gems.values
       end
 
       def find_name(name)
-        Gem::Specification.find_all_by_name name
+        Gem.source_index.find_name(name)
       end
+    end
 
+    # Rubygems 1.7
+    class Transitional < Legacy
+      def stub_rubygems(specs)
+        stub_source_index170(specs)
+      end
     end
 
-    class Legacy < RubygemsIntegration
+    # Rubygems 1.8.5
+    class Modern < RubygemsIntegration
       def stub_rubygems(specs)
-        stub_source_index137(specs)
+        Gem::Specification.all = specs
+
+        Gem.post_reset {
+          Gem::Specification.all = specs
+        }
+
+        stub_source_index170(specs)
       end
 
       def all_specs
-        Gem.source_index.all_gems.values
+        Gem::Specification.to_a
       end
 
       def find_name(name)
-        Gem.source_index.find_name(name)
+        Gem::Specification.find_all_by_name name
       end
     end
 
-    class Transitional < Legacy
-      def stub_rubygems(specs)
-        stub_source_index170(specs)
+    # Rubygems 1.8.0 to 1.8.4
+    class AlmostModern < Modern
+      # Rubygems [>= 1.8.0, < 1.8.5] has a bug that changes Gem.dir whenever
+      # you call Gem::Installer#install with an :install_dir set. We have to
+      # change it back for our sudo mode to work.
+      def preserve_paths
+        old_dir, old_path = gem_dir, gem_path
+        yield
+        Gem.use_paths(old_dir, old_path)
       end
     end
 
   end
 
-  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
-    if Gem::Specification.respond_to? :all=
-      @rubygems = RubygemsIntegration::Modern.new
-    else
-      @rubygems = RubygemsIntegration::Transitional.new
-    end
-  else
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.5')
+    @rubygems = RubygemsIntegration::Modern.new
+  elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
+    @rubygems = RubygemsIntegration::AlmostModern.new
+  elsif Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
+    @rubygems = RubygemsIntegration::Transitional.new
+  else # Rubygems 1.3.6 through 1.6.2
     @rubygems = RubygemsIntegration::Legacy.new
   end
 

data/lib/bundler/runtime.rb

@@ -85,7 +85,7 @@ module Bundler
     alias gems specs
 
     def cache
-      FileUtils.mkdir_p(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
 
       Bundler.ui.info "Updating .gem files in vendor/cache"
       specs.each do |spec|
@@ -96,7 +96,7 @@ module Bundler
     end
 
     def prune_cache
-      FileUtils.mkdir_p(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
 
       resolve = @definition.resolve
       cached  = Dir["#{cache_path}/*.gem"]

data/lib/bundler/setup.rb

@@ -8,6 +8,9 @@ if Bundler::SharedHelpers.in_bundle?
     rescue Bundler::BundlerError => e
       puts "\e[31m#{e.message}\e[0m"
       puts e.backtrace.join("\n") if ENV["DEBUG"]
+      if Bundler::GemNotFound === e
+        puts "\e[33mRun `bundle install` to install missing gems.\e[0m"
+      end
       exit e.status_code
     end
   else

data/lib/bundler/shared_helpers.rb

@@ -58,9 +58,9 @@ module Bundler
       if defined?(::Gem)
         me = File.expand_path("../../", __FILE__)
         $LOAD_PATH.reject! do |p|
-          next if File.expand_path(p) =~ /^#{me}/
+          next if File.expand_path(p) =~ /^#{Regexp.escape(me)}/
           p != File.dirname(__FILE__) &&
-            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{gp}/ }
+            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ }
         end
         $LOAD_PATH.uniq!
       end

data/lib/bundler/source.rb

@@ -11,6 +11,7 @@ module Bundler
     # TODO: Refactor this class
     class Rubygems
       attr_reader :remotes, :caches
+      attr_accessor :dependencies
 
       def initialize(options = {})
         @options = options
@@ -65,8 +66,8 @@ module Bundler
       end
       alias_method :name, :to_s
 
-      def specs(dependencies = nil)
-        @specs ||= fetch_specs(dependencies)
+      def specs
+        @specs ||= fetch_specs
       end
 
       def fetch(spec)
@@ -74,41 +75,35 @@ module Bundler
         if spec
           path = download_gem_from_uri(spec, uri)
           s = Bundler.rubygems.spec_from_gem(path)
-          spec.__swap__(s)
+          spec.__swap__(s) if spec.is_a?(RemoteSpecification)
         end
       end
 
-      def outdated(spec)
-        installed_spec = installed_specs[spec.name]
-        installed_spec = installed_spec.first
-
-        if installed_spec && spec.version == installed_spec.version
-          Bundler.ui.debug "Up to date: #{spec.name} (#{installed_spec.version}) "
-          return
-        end
-
-        Bundler.ui.info "#{spec.name} (#{spec.version} > #{installed_spec.version}) "
-      end
-
       def install(spec)
-        path = cached_gem(spec)
-
         if installed_specs[spec].any?
           Bundler.ui.info "Using #{spec.name} (#{spec.version}) "
           return
         end
 
         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
+        path = cached_gem(spec)
+
+        Bundler.rubygems.preserve_paths do
+
+          install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
+          options = { :install_dir         => install_path,
+                      :ignore_dependencies => true,
+                      :wrappers            => true,
+                      :env_shebang         => true }
+          options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
 
-        install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
-        options = { :install_dir         => install_path,
-                    :ignore_dependencies => true,
-                    :wrappers            => true,
-                    :env_shebang         => true }
-        options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
+          installer = Gem::Installer.new path, options
+          installer.install
+        end
 
-        installer = Gem::Installer.new path, options
-        installer.install
+        if spec.post_install_message
+          Installer.post_install_messages[spec.name] = spec.post_install_message
+        end
 
         # SUDO HAX
         if Bundler.requires_sudo?
@@ -151,7 +146,11 @@ module Bundler
 
       def cached_gem(spec)
         possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
-        possibilities.find { |p| File.exist?(p) }
+        cached_gem = possibilities.find { |p| File.exist?(p) }
+        unless cached_gem
+          raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation"
+        end
+        cached_gem
       end
 
       def normalize_uri(uri)
@@ -162,11 +161,11 @@ module Bundler
         uri
       end
 
-      def fetch_specs(dependencies = nil)
+      def fetch_specs
         Index.build do |idx|
           idx.use installed_specs
           idx.use cached_specs if @allow_cached || @allow_remote
-          idx.use remote_specs(dependencies) if @allow_remote
+          idx.use remote_specs if @allow_remote
         end
       end
 
@@ -206,7 +205,7 @@ module Bundler
 
           path = Bundler.app_cache
           Dir["#{path}/*.gem"].each do |gemfile|
-            next if gemfile =~ /bundler\-[\d\.]+?\.gem/
+            next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
 
             begin
               s ||= Bundler.rubygems.spec_from_gem(gemfile)
@@ -222,28 +221,17 @@ module Bundler
         idx
       end
 
-      def remote_specs(dependencies = nil)
+      def remote_specs
         @remote_specs ||= begin
           idx     = Index.new
           old     = Bundler.rubygems.sources
 
           remotes.each do |uri|
-            Bundler.ui.info "Fetching source index for #{uri}"
 
             @fetchers[uri] = Bundler::Fetcher.new(uri)
-            gem_names =
-              if dependencies
-                dependencies.map {|d| d.name }
-              end
-            @fetchers[uri].fetch_remote_specs(gem_names) do |n,v|
-              v.each do |name, version, platform|
-                next if name == 'bundler'
-                spec = RemoteSpecification.new(name, version, platform, @fetchers[uri])
-                spec.source = self
-                @spec_fetch_map[spec.full_name] = [spec, uri]
-                idx << spec
-              end
-            end
+            gem_names = dependencies && dependencies.map{|d| d.name }
+
+            idx.use @fetchers[uri].specs(gem_names, self, @spec_fetch_map)
           end
           idx
         ensure
@@ -603,6 +591,19 @@ module Bundler
         Digest::SHA1.hexdigest(input)
       end
 
+      # Escape the URI for git commands
+      def uri_escaped
+        if Bundler::WINDOWS
+          # Windows quoting requires double quotes only, with double quotes
+          # inside the string escaped by being doubled.
+          '"' + uri.gsub('"') {|s| '""'} + '"'
+        else
+          # Bash requires single quoted strings, with the single quotes escaped
+          # by ending the string, escaping the quote, and restarting the string.
+          "'" + uri.gsub("'") {|s| "'\\''"} + "'"
+        end
+      end
+
       def cache_path
         @cache_path ||= begin
           git_scope = "#{base_name}-#{uri_hash}"
@@ -620,12 +621,12 @@ module Bundler
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
           in_cache do
-            git %|fetch --force --quiet --tags "#{uri}" "refs/heads/*:refs/heads/*"|
+            git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
           end
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
-          git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
+          git %|clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks|
         end
       end
 
@@ -634,6 +635,7 @@ module Bundler
           FileUtils.mkdir_p(path.dirname)
           FileUtils.rm_rf(path)
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
+          File.chmod((0777 & ~File.umask), path)
         end
         Dir.chdir(path) do
           git %|fetch --force --quiet --tags "#{cache_path}"|

data/lib/bundler/spec_set.rb

@@ -80,6 +80,7 @@ module Bundler
       materialized = self.for(deps, [], false, true).to_a
       materialized.map! do |s|
         next s unless s.is_a?(LazySpecification)
+        s.source.dependencies = deps if s.source.respond_to?(:dependencies=)
         spec = s.__materialize__
         if missing_specs
           missing_specs << s unless spec

data/lib/bundler/templates/newgem/Gemfile.tt

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in <%=config[:name]%>.gemspec
 gemspec

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -1,2 +1,2 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'

data/lib/bundler/templates/newgem/bin/newgem.tt

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require "<%= config[:name] %>"
+require '<%= config[:name] %>'

data/lib/bundler/templates/newgem/gitignore.tt

@@ -1,4 +1,17 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -1,3 +1,5 @@
+require "<%=config[:name]%>/version"
+
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>
 <%- end -%>