bundler 1.7.15 → 1.8.0.pre

data/lib/bundler/friendly_errors.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "bundler/vendored_thor"
 
 module Bundler
@@ -33,10 +34,42 @@ module Bundler
   rescue SystemExit => e
     exit e.status
   rescue Exception => e
-    Bundler.ui.error <<-ERR, :wrap => true
-      Unfortunately, a fatal error has occurred. Please see the Bundler \
-      troubleshooting documentation at http://bit.ly/bundler-issues. Thanks!
-    ERR
-    raise e
+    request_issue_report_for(e)
+    exit 1
+  end
+
+  def self.request_issue_report_for(e)
+    Bundler.ui.info <<-EOS.gsub(/^ {6}/, '')
+      #{'――― ERROR REPORT TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+      - What did you do?
+      - What did you expect to happen?
+      - What happened instead?
+
+      Error details
+
+          #{e.class}: #{e.message}
+          #{e.backtrace.join("\n          ")}
+
+      #{Bundler::Env.new.report(:print_gemfile => false).gsub(/\n/, "\n      ").strip}
+      #{'――― TEMPLATE END ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+
+    EOS
+
+    Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
+
+    Bundler.ui.warn <<-EOS.gsub(/^ {6}/, '')
+
+      First, try this link to see if there are any existing issue reports for this error:
+      #{issues_url(e)}
+
+      If there aren't any reports for this error yet, please create copy and paste the report template above into a new issue. Don't forget to anonymize any private data! The new issue form is located at:
+      https://github.com/bundler/bundler/issues/new
+    EOS
   end
+
+  def self.issues_url(exception)
+    'https://github.com/bundler/bundler/search?q=' \
+    "#{CGI.escape(exception.message)}&type=Issues"
+  end
+
 end

data/lib/bundler/gem_helper.rb

@@ -44,9 +44,22 @@ module Bundler
         install_gem(built_gem_path)
       end
 
-      desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems"
-      task 'release' => 'build' do
-        release_gem(built_gem_path)
+      desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems\n" \
+           "To prevent publishing in Rubygems use `gem_push=no rake release`"
+      task 'release' => ['build', 'release:guard_clean',
+                         'release:source_control_push', 'release:rubygem_push'] do
+      end
+
+      task 'release:guard_clean' do
+        guard_clean
+      end
+
+      task 'release:source_control_push' do
+        tag_version { git_push } unless already_tagged?
+      end
+
+      task 'release:rubygem_push' do
+        rubygem_push(built_gem_path) if gem_push?
       end
 
       GemHelper.instance = self
@@ -70,13 +83,6 @@ module Bundler
       Bundler.ui.confirm "#{name} (#{version}) installed."
     end
 
-    def release_gem(built_gem_path=nil)
-      guard_clean
-      built_gem_path ||= build_gem
-      tag_version { git_push } unless already_tagged?
-      rubygem_push(built_gem_path) if gem_push?
-    end
-
     protected
     def rubygem_push(path)
       if Pathname.new("~/.gem/credentials").expand_path.exist?

data/lib/bundler/gem_helpers.rb

@@ -5,6 +5,7 @@ module Bundler
     GENERICS = [
       [Gem::Platform.new('java'), Gem::Platform.new('java')],
       [Gem::Platform.new('mswin32'), Gem::Platform.new('mswin32')],
+      [Gem::Platform.new('mswin64'), Gem::Platform.new('mswin64')],
       [Gem::Platform.new('x64-mingw32'), Gem::Platform.new('x64-mingw32')],
       [Gem::Platform.new('x86_64-mingw32'), Gem::Platform.new('x64-mingw32')],
       [Gem::Platform.new('mingw32'), Gem::Platform.new('x86-mingw32')]

data/lib/bundler/graph.rb

@@ -3,12 +3,13 @@ module Bundler
   class Graph
     GRAPH_NAME = :Gemfile
 
-    def initialize(env, output_file, show_version = false, show_requirements = false, output_format = "png")
+    def initialize(env, output_file, show_version = false, show_requirements = false, output_format = "png", without = [])
       @env               = env
       @output_file       = output_file
       @show_version      = show_version
       @show_requirements = show_requirements
       @output_format     = output_format
+      @without_groups    = without.map(&:to_sym)
 
       @groups            = []
       @relations         = Hash.new {|h, k| h[k] = Set.new}
@@ -53,6 +54,8 @@ module Bundler
       relations = Hash.new {|h, k| h[k] = Set.new}
       @env.current_dependencies.each do |dependency|
         dependency.groups.each do |group|
+          next if @without_groups.include?(group)
+
           relations[group.to_s].add(dependency)
           @relations[group.to_s].add(dependency.name)
 

data/lib/bundler/index.rb

@@ -16,7 +16,7 @@ module Bundler
     def initialize
       @sources = []
       @cache = {}
-      @specs = Hash.new { |h,k| h[k] = [] }
+      @specs = Hash.new { |h,k| h[k] = Hash.new }
       @all_specs = Hash.new { |h,k| h[k] = [] }
     end
 
@@ -24,11 +24,11 @@ module Bundler
       super
       @sources = @sources.dup
       @cache = {}
-      @specs = Hash.new { |h,k| h[k] = [] }
+      @specs = Hash.new { |h,k| h[k] = Hash.new }
       @all_specs = Hash.new { |h,k| h[k] = [] }
 
-      o.specs.each do |name, array|
-        @specs[name] = array.dup
+      o.specs.each do |name, hash|
+        @specs[name] = hash.dup
       end
       o.all_specs.each do |name, array|
         @all_specs[name] = array.dup
@@ -88,33 +88,24 @@ module Bundler
     alias [] search
 
     def <<(spec)
-      arr = specs_by_name(spec.name)
+      @specs[spec.name]["#{spec.version}-#{spec.platform}"] = spec
 
-      arr.delete_if do |s|
-        same_version?(s.version, spec.version) && s.platform == spec.platform
-      end
-
-      arr << spec
       spec
     end
 
     def each(&blk)
-      specs.values.each do |specs|
-        specs.each(&blk)
+      specs.values.each do |spec_sets|
+        spec_sets.values.each(&blk)
       end
     end
 
     # returns a list of the dependencies
     def unmet_dependency_names
-      names = dependency_names
-      names.delete_if{|n| n == "bundler" }
-      names.select{|n| search(n).empty? }
-    end
-
-    def dependency_names
       names = []
       each{|s| names.push(*s.dependencies.map{|d| d.name }) }
-      names.uniq
+      names.uniq!
+      names.delete_if{|n| n == "bundler" }
+      names.select{|n| search(n).empty? }
     end
 
     def use(other, override_dupes = false)
@@ -123,9 +114,9 @@ module Bundler
         if (dupes = search_by_spec(s)) && dupes.any?
           @all_specs[s.name] = [s] + dupes
           next unless override_dupes
-          @specs[s.name] -= dupes
+          self << s
         end
-        @specs[s.name] << s
+        self << s
       end
       self
     end
@@ -155,7 +146,7 @@ module Bundler
   private
 
     def specs_by_name(name)
-      @specs[name]
+      @specs[name].values
     end
 
     def search_by_dependency(dependency, base = nil)
@@ -182,9 +173,8 @@ module Bundler
     end
 
     def search_by_spec(spec)
-      specs_by_name(spec.name).select do |s|
-        same_version?(s.version, spec.version) && Gem::Platform.new(s.platform) == Gem::Platform.new(spec.platform)
-      end
+      spec = @specs[spec.name]["#{spec.version}-#{spec.platform}"]
+      spec ? [spec] : []
     end
 
     if RUBY_VERSION < '1.9'

data/lib/bundler/installer.rb

@@ -1,6 +1,6 @@
 require 'erb'
 require 'rubygems/dependency_installer'
-require 'bundler/parallel_workers'
+require 'bundler/worker'
 
 module Bundler
   class Installer < Environment
@@ -84,7 +84,7 @@ module Bundler
       # that said, it's a rare situation (other than rake), and parallel
       # installation is just SO MUCH FASTER. so we let people opt in.
       jobs = [Bundler.settings[:jobs].to_i-1, 1].max
-      if jobs > 1 && can_install_parallely?
+      if jobs > 1 && can_install_in_parallel?
         install_in_parallel jobs, options[:standalone]
       else
         install_sequentially options[:standalone]
@@ -194,7 +194,7 @@ module Bundler
 
   private
 
-    def can_install_parallely?
+    def can_install_in_parallel?
       min_rubygems = "2.0.7"
       if Bundler.current_ruby.mri? || Bundler.rubygems.provides?(">= #{min_rubygems}")
         true
@@ -254,7 +254,7 @@ module Bundler
         file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]"
         file.puts "path = File.expand_path('..', __FILE__)"
         paths.each do |path|
-          file.puts %{$:.unshift File.expand_path("\#{path}/#{path}")}
+          file.puts %{$:.unshift "\#{path}/#{path}"}
         end
       end
     end
@@ -277,9 +277,9 @@ module Bundler
         remains[spec.name] = true
       end
 
-      worker_pool = ParallelWorkers.worker_pool size, lambda { |name, worker|
+      worker_pool = Worker.new size, lambda { |name, worker_num|
         spec = name2spec[name]
-        message = install_gem_from_spec spec, standalone, worker
+        message = install_gem_from_spec spec, standalone, worker_num
         { :name => spec.name, :post_install => message }
       }
 

data/lib/bundler/lockfile_parser.rb

@@ -52,9 +52,9 @@ module Bundler
   private
 
     TYPES = {
-      "GIT"  => Bundler::Source::Git,
-      "GEM"  => Bundler::Source::Rubygems,
-      "PATH" => Bundler::Source::Path
+      GIT  => Bundler::Source::Git,
+      GEM  => Bundler::Source::Rubygems,
+      PATH => Bundler::Source::Path,
     }
 
     def parse_source(line)
@@ -64,18 +64,18 @@ module Bundler
         @opts, @type = {}, line
       when SPECS
         case @type
-        when "PATH"
+        when PATH
           @current_source = TYPES[@type].from_lock(@opts)
           @sources << @current_source
-        when "GIT"
+        when GIT
           @current_source = TYPES[@type].from_lock(@opts)
           # Strip out duplicate GIT sections
-          if @type == "GIT" && @sources.include?(@current_source)
+          if @sources.include?(@current_source)
             @current_source = @sources.find { |s| s == @current_source }
           else
             @sources << @current_source
           end
-        when "GEM"
+        when GEM
           Array(@opts["remote"]).each do |url|
             @rubygems_aggregate.add_remote(url)
           end

data/lib/bundler/resolver.rb

@@ -141,6 +141,7 @@ module Bundler
       @index                = index
       @deps_for             = {}
       @missing_gems         = Hash.new(0)
+      @prereleases_cache    = Hash.new { |h,k| h[k] = k.prerelease? }
       @source_requirements  = source_requirements
       @iteration_counter    = 0
       @started_at           = Time.now
@@ -269,7 +270,7 @@ module Bundler
 
         reqs = reqs.sort_by do |a|
           [ activated[a.name] ? 0 : 1,
-            a.requirement.prerelease? ? 0 : 1,
+            @prereleases_cache[a.requirement] ? 0 : 1,
             @errors[a.name]   ? 0 : 1,
             activated[a.name] ? 0 : @gems_size[a] ]
         end

data/lib/bundler/ruby_version.rb

@@ -38,7 +38,7 @@ module Bundler
         patchlevel     == other.patchlevel
     end
 
-    # Returns a tuple of thsee things:
+    # Returns a tuple of these things:
     #   [diff, this, other]
     #   The priority of attributes are
     #   1. engine

data/lib/bundler/rubygems_ext.rb

@@ -149,6 +149,7 @@ module Gem
   class Platform
     JAVA  = Gem::Platform.new('java') unless defined?(JAVA)
     MSWIN = Gem::Platform.new('mswin32') unless defined?(MSWIN)
+    MSWIN64 = Gem::Platform.new('mswin64') unless defined?(MSWIN64)
     MINGW = Gem::Platform.new('x86-mingw32') unless defined?(MINGW)
     X64_MINGW = Gem::Platform.new('x64-mingw32') unless defined?(X64_MINGW)
 

data/lib/bundler/rubygems_integration.rb

@@ -306,12 +306,12 @@ module Bundler
 
         if exec_name
           spec = specs.find { |s| s.executables.include?(exec_name) }
+          spec or raise Gem::Exception, "can't find executable #{exec_name}"
           unless spec.name == name
             warn "Bundler is using a binstub that was created for a different gem.\n" \
               "This is deprecated, in future versions you may need to `bundle binstub #{name}` " \
               "to work around a system/bundle conflict."
           end
-          spec or raise Gem::Exception, "can't find executable #{exec_name}"
         else
           spec = specs.find  { |s| s.name == name }
           exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"

data/lib/bundler/runtime.rb

@@ -46,7 +46,7 @@ module Bundler
       self
     end
 
-    REGEXPS = [
+    REQUIRE_ERRORS = [
       /^no such file to load -- (.+)$/i,
       /^Missing \w+ (?:file\s*)?([^\s]+.rb)$/i,
       /^Missing API definition file in (.+)$/i,
@@ -76,20 +76,21 @@ module Bundler
             Kernel.require file
           end
         rescue LoadError => e
-          REGEXPS.find { |r| r =~ e.message }
+          REQUIRE_ERRORS.find { |r| r =~ e.message }
           raise if dep.autorequire || $1 != required_file
 
           if dep.autorequire.nil? && dep.name.include?('-')
             begin
               namespaced_file = dep.name.gsub('-', '/')
               Kernel.require namespaced_file
-            rescue LoadError
-              REGEXPS.find { |r| r =~ e.message }
-              regex_name = $1
-              raise e if dep.autorequire || (regex_name && regex_name.gsub('-', '/') != namespaced_file)
-              raise e if regex_name.nil?
+            rescue LoadError => e
+              REQUIRE_ERRORS.find { |r| r =~ e.message }
+              raise if $1 != namespaced_file
             end
           end
+        rescue => e
+          Bundler.ui.debug e
+          Bundler.ui.warn "Unable to require #{required_file}. #{e.class}: #{e.message}."
         end
       end
     end
@@ -105,12 +106,13 @@ module Bundler
     alias gems specs
 
     def cache(custom_path = nil)
-      cache_path = cache_path(custom_path)
+      cache_path = Bundler.app_cache(custom_path)
       FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
 
-      Bundler.ui.info "Updating files in vendor/cache"
+      Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}"
       specs.each do |spec|
         next if spec.name == 'bundler'
+        spec.source.send(:fetch_gem, spec) if Bundler.settings[:cache_all_platforms] && spec.source.respond_to?(:fetch_gem, true)
         spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache)
       end
 
@@ -119,15 +121,14 @@ module Bundler
         FileUtils.touch(File.expand_path("../.bundlecache", git_dir))
       end
 
-      prune_cache(custom_path) unless Bundler.settings[:no_prune]
+      prune_cache(cache_path) unless Bundler.settings[:no_prune]
     end
 
-    def prune_cache(custom_path)
-      cache_path = cache_path(custom_path)
+    def prune_cache(cache_path)
       FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
       resolve = @definition.resolve
-      prune_gem_cache(resolve, custom_path)
-      prune_git_and_path_cache(resolve, custom_path)
+      prune_gem_cache(resolve, cache_path)
+      prune_git_and_path_cache(resolve, cache_path)
     end
 
     def clean(dry_run = false)
@@ -218,31 +219,16 @@ module Bundler
         ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__)
       end
 
-      # Set PATH
-      paths = (ENV["PATH"] || "").split(File::PATH_SEPARATOR)
-      paths.unshift "#{Bundler.bundle_path}/bin"
-      ENV["PATH"] = paths.uniq.join(File::PATH_SEPARATOR)
-
       # Set BUNDLE_GEMFILE
       ENV["BUNDLE_GEMFILE"] = default_gemfile.to_s
 
-      # Set RUBYOPT
-      rubyopt = [ENV["RUBYOPT"]].compact
-      if rubyopt.empty? || rubyopt.first !~ /-rbundler\/setup/
-        rubyopt.unshift %|-rbundler/setup|
-        ENV["RUBYOPT"] = rubyopt.join(' ')
-      end
-
-      # Set RUBYLIB
-      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift File.expand_path('../..', __FILE__)
-      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
+      SharedHelpers.set_bundle_environment
     end
 
   private
 
-    def prune_gem_cache(resolve, custom_path)
-      cached  = Dir["#{cache_path(custom_path)}/*.gem"]
+    def prune_gem_cache(resolve, cache_path)
+      cached  = Dir["#{cache_path}/*.gem"]
 
       cached = cached.delete_if do |path|
         spec = Bundler.rubygems.spec_from_gem path
@@ -253,7 +239,7 @@ module Bundler
       end
 
       if cached.any?
-        Bundler.ui.info "Removing outdated .gem files from vendor/cache"
+        Bundler.ui.info "Removing outdated .gem files from #{Bundler.settings.app_cache_path}"
 
         cached.each do |path|
           Bundler.ui.info "  * #{File.basename(path)}"
@@ -262,8 +248,8 @@ module Bundler
       end
     end
 
-    def prune_git_and_path_cache(resolve, custom_path)
-      cached  = Dir["#{cache_path(custom_path)}/*/.bundlecache"]
+    def prune_git_and_path_cache(resolve, cache_path)
+      cached  = Dir["#{cache_path}/*/.bundlecache"]
 
       cached = cached.delete_if do |path|
         name = File.basename(File.dirname(path))
@@ -275,7 +261,7 @@ module Bundler
       end
 
       if cached.any?
-        Bundler.ui.info "Removing outdated git and path gems from vendor/cache"
+        Bundler.ui.info "Removing outdated git and path gems from #{Bundler.settings.app_cache_path}"
 
         cached.each do |path|
           path = File.dirname(path)
@@ -302,9 +288,5 @@ module Bundler
       end
     end
 
-    def cache_path(custom_path = nil)
-      path = custom_path || root
-      path.join("vendor/cache")
-    end
   end
 end