bundler 1.0.22 → 1.1.pre

data/lib/bundler/source.rb

@@ -1,5 +1,4 @@
 require "uri"
-require 'rubygems/user_interaction'
 require "rubygems/installer"
 require "rubygems/spec_fetcher"
 require "rubygems/format"
@@ -15,14 +14,11 @@ module Bundler
       def initialize(options = {})
         @options = options
         @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) }
+        @fetchers = {}
         @allow_remote = false
         @allow_cached = false
 
-        # Hardcode the paths for now
-        @caches = [ Bundler.app_cache ] + Bundler.rubygems.gem_path.map do |x|
-          File.expand_path("#{x}/cache")
-        end
-
+        @caches = [ Bundler.app_cache ] + Gem.path.map{ |p| File.expand_path("#{p}/cache") }
         @spec_fetch_map = {}
       end
 
@@ -66,53 +62,51 @@ module Bundler
       end
       alias_method :name, :to_s
 
-      def specs
-        @specs ||= fetch_specs
+      def specs(dependencies = nil)
+        @specs ||= fetch_specs(dependencies)
       end
 
       def fetch(spec)
         spec, uri = @spec_fetch_map[spec.full_name]
         if spec
           path = download_gem_from_uri(spec, uri)
-          s = Bundler.rubygems.spec_from_gem(path)
+          s = Gem::Format.from_file_by_path(path).spec
           spec.__swap__(s)
         end
       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 : 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 = Bundler::GemInstaller.new path, options
-          installer.install
-        end
+        installer = Gem::Installer.new path, options
+        installer.install
 
         # SUDO HAX
         if Bundler.requires_sudo?
-          sudo "mkdir -p #{Bundler.rubygems.gem_dir}/gems #{Bundler.rubygems.gem_dir}/specifications"
-          sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/"
-          sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/"
+          sudo "mkdir -p #{Gem.dir}/gems #{Gem.dir}/specifications"
+          sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/"
+          sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/"
           spec.executables.each do |exe|
-            sudo "mkdir -p #{Bundler.rubygems.gem_bindir}"
-            sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}"
+            sudo "mkdir -p #{Gem.bindir}"
+            sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.bindir}"
           end
         end
 
-        spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
+        spec.loaded_from = "#{Gem.dir}/specifications/#{spec.full_name}.gemspec"
       end
 
       def sudo(str)
@@ -142,11 +136,7 @@ module Bundler
 
       def cached_gem(spec)
         possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
-        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
+        possibilities.find { |p| File.exist?(p) }
       end
 
       def normalize_uri(uri)
@@ -157,25 +147,19 @@ module Bundler
         uri
       end
 
-      def fetch_specs
-        # remote_specs usually generates a way larger Index than the other
-        # sources, and large_idx.use small_idx is way faster than
-        # small_idx.use large_idx.
-        if @allow_remote
-          idx = remote_specs.dup
-        else
-          idx = Index.new
+      def fetch_specs(dependencies = nil)
+        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
         end
-        idx.use(cached_specs, :override_dupes) if @allow_cached || @allow_remote
-        idx.use(installed_specs, :override_dupes)
-        idx
       end
 
       def installed_specs
         @installed_specs ||= begin
           idx = Index.new
           have_bundler = false
-          Bundler.rubygems.all_specs.reverse.each do |spec|
+          Gem.source_index.to_a.reverse.each do |dont_use_this_var, spec|
             next if spec.name == 'bundler' && spec.version.to_s != VERSION
             have_bundler = true if spec.name == 'bundler'
             spec.source = self
@@ -192,7 +176,6 @@ module Bundler
              s.version  = VERSION
              s.platform = Gem::Platform::RUBY
              s.source   = self
-             s.authors  = ["bundler team"]
              s.loaded_from = File.expand_path("..", __FILE__)
            end
            idx << bundler
@@ -207,10 +190,10 @@ 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)
+              s ||= Gem::Format.from_file_by_path(gemfile).spec
             rescue Gem::Package::FormatError
               raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
             end
@@ -223,18 +206,23 @@ module Bundler
         idx
       end
 
-      def remote_specs
+      def remote_specs(dependencies = nil)
         @remote_specs ||= begin
           idx     = Index.new
-          old     = Bundler.rubygems.sources
+          old     = Gem.sources
 
           remotes.each do |uri|
             Bundler.ui.info "Fetching source index for #{uri}"
-            Gem.sources = ["#{uri}"]
-            fetch_all_remote_specs do |n,v|
+
+            @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, uri)
+                spec = RemoteSpecification.new(name, version, platform, @fetchers[uri])
                 spec.source = self
                 @spec_fetch_map[spec.full_name] = [spec, uri]
                 idx << spec
@@ -243,36 +231,21 @@ module Bundler
           end
           idx
         ensure
-          Bundler.rubygems.sources = old
-        end
-      end
-
-      def fetch_all_remote_specs(&blk)
-        begin
-          # Fetch all specs, minus prerelease specs
-          Gem::SpecFetcher.new.list(true, false).each(&blk)
-          # Then fetch the prerelease specs
-          begin
-            Gem::SpecFetcher.new.list(false, true).each(&blk)
-          rescue Gem::RemoteFetcher::FetchError
-            Bundler.ui.warn "Could not fetch prerelease specs from #{self}"
-          end
-        rescue Gem::RemoteFetcher::FetchError
-          Bundler.ui.warn "Could not reach #{self}"
+          Gem.sources = old
         end
       end
 
       def download_gem_from_uri(spec, uri)
         spec.fetch_platform
 
-        download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
-        gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
+        download_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
+        gem_path = "#{Gem.dir}/cache/#{spec.full_name}.gem"
 
         FileUtils.mkdir_p("#{download_path}/cache")
-        Bundler.rubygems.download_gem(spec, uri, download_path)
+        Gem::RemoteFetcher.fetcher.download(spec, uri, download_path)
 
         if Bundler.requires_sudo?
-          sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache"
+          sudo "mkdir -p #{Gem.dir}/cache"
           sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
         end
 
@@ -286,7 +259,7 @@ module Bundler
       attr_writer   :name
       attr_accessor :version
 
-      DEFAULT_GLOB = "{,*,*/*}.gemspec"
+      DEFAULT_GLOB = "{,*/}*.gemspec"
 
       def initialize(options)
         @options = options
@@ -334,13 +307,14 @@ module Bundler
       def eql?(o)
         o.instance_of?(Path) &&
         path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) &&
+        name == o.name &&
         version == o.version
       end
 
       alias == eql?
 
       def name
-        File.basename(path.expand_path(Bundler.root).to_s)
+        File.basename(@path.to_s)
       end
 
       def load_spec_files
@@ -366,11 +340,9 @@ module Bundler
               s.platform = Gem::Platform::RUBY
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
-              s.authors  = ["no one"]
               if expanded_path.join("bin").exist?
-                executables = expanded_path.join("bin").children
-                executables.reject!{|p| File.directory?(p) }
-                s.executables = executables.map{|c| c.basename.to_s }
+                binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s }
+                s.executables = binaries
               end
             end
           end
@@ -381,15 +353,15 @@ module Bundler
         index
       end
 
-      def local_specs
+      def local_specs(*)
         @local_specs ||= load_spec_files
       end
 
-      class Installer < Bundler::GemInstaller
+      class Installer < Gem::Installer
         def initialize(spec, options = {})
           @spec              = spec
-          @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin"
-          @gem_dir           = Bundler.rubygems.path(spec.full_gem_path)
+          @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Gem.dir}/bin"
+          @gem_dir           = spec.full_gem_path
           @wrappers          = options[:wrappers] || true
           @env_shebang       = options[:env_shebang] || true
           @format_executable = options[:format_executable] || false
@@ -403,9 +375,9 @@ module Bundler
           end
           super
           if Bundler.requires_sudo?
-            Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/bin"
+            Bundler.mkdir_p "#{Gem.dir}/bin"
             spec.executables.each do |exe|
-              Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_dir}/bin/"
+              Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.dir}/bin/"
             end
           end
         end
@@ -490,7 +462,6 @@ module Bundler
         @revision   = options["revision"]
         @submodules = options["submodules"]
         @update     = false
-        @installed  = nil
       end
 
       def self.from_lock(options)
@@ -545,7 +516,7 @@ module Bundler
       end
 
       # TODO: actually cache git specs
-      def specs
+      def specs(*)
         if allow_git_ops? && !@update
           # Start by making sure the git cache is up to date
           cache
@@ -579,9 +550,7 @@ module Bundler
           out = %x{git #{command}}
 
           if $?.exitstatus != 0
-            msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
-            msg << "\nIf this error persists you could try removing the cache directory '#{cache_path}'" if cached?
-            raise GitError, msg
+            raise GitError, "An error has occurred in git when running `git #{command}`. Cannot complete bundling."
           end
           out
         else
@@ -592,7 +561,7 @@ module Bundler
       end
 
       def base_name
-        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)?(//\w*/)?(\w*/)*},''),".git")
+        File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)},''), ".git")
       end
 
       def shortref_for_display(ref)
@@ -615,19 +584,6 @@ 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}"
@@ -645,12 +601,12 @@ module Bundler
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
           in_cache do
-            git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
+            git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*|
           end
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
-          git %|clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks|
+          git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
         end
       end
 
@@ -659,7 +615,6 @@ 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

@@ -1,18 +1,21 @@
 require 'tsort'
-require 'forwardable'
 
 module Bundler
   class SpecSet
-    extend Forwardable
     include TSort, Enumerable
 
-    def_delegators :@specs, :<<, :length, :add, :remove
-    def_delegators :sorted, :each
-
     def initialize(specs)
       @specs = specs.sort_by { |s| s.name }
     end
 
+    def each
+      sorted.each { |s| yield s }
+    end
+
+    def length
+      @specs.length
+    end
+
     def for(dependencies, skip = [], check = false, match_current_platform = false)
       handled, deps, specs = {}, dependencies.dup, []
       skip << 'bundler'
@@ -65,10 +68,6 @@ module Bundler
       value
     end
 
-    def sort!
-      self
-    end
-
     def to_a
       sorted.dup
     end

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

@@ -1 +1,2 @@
-require "bundler/gem_tasks"
+require 'bundler'
+Bundler::GemHelper.install_tasks

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

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

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

@@ -5,8 +5,9 @@ require "<%=config[:name]%>/version"
 Gem::Specification.new do |s|
   s.name        = <%=config[:name].inspect%>
   s.version     = <%=config[:constant_name]%>::VERSION
-  s.authors     = ["<%= config[:author_name] %>"]
-  s.email       = ["<%= config[:author_email] %>"]
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["TODO: Write your name"]
+  s.email       = ["TODO: Write your email address"]
   s.homepage    = ""
   s.summary     = %q{TODO: Write a gem summary}
   s.description = %q{TODO: Write a gem description}
@@ -17,8 +18,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
 end

data/lib/bundler/ui.rb

@@ -1,5 +1,3 @@
-require 'rubygems/user_interaction'
-
 module Bundler
   class UI
     def warn(message)
@@ -55,10 +53,9 @@ module Bundler
       end
     end
 
-    class RGProxy < ::Gem::SilentUI
+    class RGProxy < Gem::SilentUI
       def initialize(ui)
         @ui = ui
-        super()
       end
 
       def say(message)