bundler 1.14.6 → 1.15.0.pre.1

data/lib/bundler/source/path/installer.rb

@@ -13,7 +13,7 @@ module Bundler
           @format_executable  = options[:format_executable] || false
           @build_args         = options[:build_args] || Bundler.rubygems.build_args
           @gem_bin_dir        = "#{Bundler.rubygems.gem_dir}/bin"
-          @disable_extentions = options[:disable_extensions]
+          @disable_extensions = options[:disable_extensions]
 
           if Bundler.requires_sudo?
             @tmp_dir = Bundler.tmp(spec.full_name).to_s
@@ -27,7 +27,7 @@ module Bundler
           SharedHelpers.chdir(@gem_dir) do
             run_hooks(:pre_install)
 
-            unless @disable_extentions
+            unless @disable_extensions
               build_extensions
               run_hooks(:post_build)
             end

data/lib/bundler/source/rubygems.rb

@@ -289,8 +289,10 @@ module Bundler
           idx = Index.new
           have_bundler = false
           Bundler.rubygems.all_specs.reverse_each do |spec|
-            next if spec.name == "bundler" && spec.version.to_s != VERSION
-            have_bundler = true if spec.name == "bundler"
+            if spec.name == "bundler"
+              next unless spec.version.to_s == VERSION
+              have_bundler = true
+            end
             spec.source = self
             if Bundler.rubygems.spec_missing_extensions?(spec, false)
               Bundler.ui.debug "Source #{self} is ignoring #{spec} because it is missing extensions"
@@ -410,6 +412,7 @@ module Bundler
         return false unless spec.remote
         uri = spec.remote.uri
         spec.fetch_platform
+        Bundler.ui.confirm("Fetching #{version_message(spec)}")
 
         download_path = requires_sudo? ? Bundler.tmp(spec.full_name) : rubygems_dir
         gem_path = "#{rubygems_dir}/cache/#{spec.full_name}.gem"

data/lib/bundler/spec_set.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "tsort"
 require "forwardable"
+require "set"
 
 module Bundler
   class SpecSet
@@ -11,20 +12,18 @@ module Bundler
     def_delegators :sorted, :each
 
     def initialize(specs)
-      @specs = specs.sort_by(&:name)
+      @specs = specs
     end
 
-    def for(dependencies, skip = [], check = false, match_current_platform = false)
-      handled = {}
+    def for(dependencies, skip = [], check = false, match_current_platform = false, raise_on_missing = true)
+      handled = Set.new
       deps = dependencies.dup
       specs = []
       skip += ["bundler"]
 
       loop do
         break unless dep = deps.shift
-        next if handled[dep] || skip.include?(dep.name)
-
-        handled[dep] = true
+        next if !handled.add?(dep) || skip.include?(dep.name)
 
         if spec = spec_for_dependency(dep, match_current_platform)
           specs << spec
@@ -36,6 +35,8 @@ module Bundler
           end
         elsif check
           return false
+        elsif raise_on_missing
+          raise "Unable to find a spec satisfying #{dep} in the set. Perhaps the lockfile is corrupted?"
         end
       end
 
@@ -75,20 +76,21 @@ module Bundler
     end
 
     def materialize(deps, missing_specs = nil)
-      materialized = self.for(deps, [], false, true).to_a
+      materialized = self.for(deps, [], false, true, missing_specs).to_a
       deps = materialized.map(&:name).uniq
       materialized.map! do |s|
         next s unless s.is_a?(LazySpecification)
         s.source.dependency_names = deps if s.source.respond_to?(:dependency_names=)
         spec = s.__materialize__
-        if missing_specs
-          missing_specs << s unless spec
-        else
-          raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec
+        unless spec
+          unless missing_specs
+            raise GemNotFound, "Could not find #{s.full_name} in any of the sources"
+          end
+          missing_specs << s
         end
-        spec if spec
+        spec
       end
-      SpecSet.new(materialized.compact)
+      SpecSet.new(missing_specs ? materialized.compact : materialized)
     end
 
     # Materialize for all the specs in the spec set, regardless of what platform they're for
@@ -118,6 +120,13 @@ module Bundler
       @specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
     end
 
+    def what_required(spec)
+      unless req = find {|s| s.dependencies.any? {|d| d.type == :runtime && d.name == spec.name } }
+        return [spec]
+      end
+      what_required(req) << spec
+    end
+
   private
 
     def sorted

data/lib/bundler/stub_specification.rb

@@ -9,12 +9,14 @@ module Bundler
       spec
     end
 
-    attr_accessor :stub
+    attr_accessor :stub, :ignored
 
     def to_yaml
       _remote_specification.to_yaml
     end
 
+    # @!group Stub Delegates
+
     if Bundler.rubygems.provides?(">= 2.3")
       # This is defined directly to avoid having to load every installed spec
       def missing_extensions?
@@ -22,10 +24,70 @@ module Bundler
       end
     end
 
+    def activated
+      stub.activated
+    end
+
+    def activated=(activated)
+      stub.instance_variable_set(:@activated, activated)
+    end
+
+    def default_gem
+      stub.default_gem
+    end
+
+    def full_gem_path
+      # deleted gems can have their stubs return nil, so in that case grab the
+      # expired path from the full spec
+      stub.full_gem_path || method_missing(:full_gem_path)
+    end
+
+    if Bundler.rubygems.provides?(">= 2.2.0")
+      def full_require_paths
+        stub.full_require_paths
+      end
+
+      # This is what we do in bundler/rubygems_ext
+      # full_require_paths is always implemented in >= 2.2.0
+      def load_paths
+        full_require_paths
+      end
+    end
+
+    def loaded_from
+      stub.loaded_from
+    end
+
+    if Bundler.rubygems.stubs_provide_full_functionality?
+      def matches_for_glob(glob)
+        stub.matches_for_glob(glob)
+      end
+    end
+
+    def raw_require_paths
+      stub.raw_require_paths
+    end
+
   private
 
     def _remote_specification
-      stub.to_spec
+      @_remote_specification ||= begin
+        rs = stub.to_spec
+        if rs.equal?(self) # happens when to_spec gets the spec from Gem.loaded_specs
+          rs = Gem::Specification.load(loaded_from)
+          Bundler.rubygems.stub_set_spec(stub, rs)
+        end
+
+        unless rs
+          raise GemspecError, "The gemspec for #{full_name} at #{loaded_from}" \
+            " was missing or broken. Try running `gem pristine #{name} -v #{version}`" \
+            " to fix the cached spec."
+        end
+
+        rs.source = source
+
+        rs
+      end
     end
   end
 end

data/lib/bundler/templates/Executable

@@ -1,4 +1,4 @@
-#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG['ruby_install_name'] %>
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
 # frozen_string_literal: true
 #
 # This file was generated by Bundler.

data/lib/bundler/templates/Executable.standalone

@@ -1,4 +1,4 @@
-#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG['ruby_install_name'] %>
+#!/usr/bin/env <%= Bundler.settings[:shebang] || RbConfig::CONFIG["ruby_install_name"] %>
 #
 # This file was generated by Bundler.
 #
@@ -6,9 +6,9 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
+require "pathname"
 path = Pathname.new(__FILE__)
-$:.unshift File.expand_path '../<%= standalone_path %>', path.realpath
+$:.unshift File.expand_path "../<%= standalone_path %>", path.realpath
 
-require 'bundler/setup'
-load File.expand_path '../<%= executable_path %>', path.realpath
+require "bundler/setup"
+load File.expand_path "../<%= executable_path %>", path.realpath

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

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

data/lib/bundler/templates/newgem/LICENSE.txt.tt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) <%=Time.now.year%> <%=config[:author]%>
+Copyright (c) <%= Time.now.year %> <%= config[:author] %>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/bundler/templates/newgem/README.md.tt

@@ -1,6 +1,6 @@
-# <%=config[:constant_name]%>
+# <%= config[:constant_name] %>
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%=config[:namespaced_path]%>`. To experiment with that code, run `bin/console` for an interactive prompt.
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/<%= config[:namespaced_path] %>`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
 
@@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem '<%=config[:name]%>'
+gem '<%= config[:name] %>'
 ```
 
 And then execute:
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install <%=config[:name]%>
+    $ gem install <%= config[:name] %>
 
 ## Usage
 
@@ -33,9 +33,15 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/<%= config[:github_username] %>/<%= config[:name] %>.<% if config[:coc] %> This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.<% end %>
-<% if config[:mit] %>
+<% if config[:mit] -%>
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-<% end %>
+<% end -%>
+
+<% if config[:coc] -%>
+## Code of Conduct
+
+Everyone interacting in the <%= config[:constant_name] %> project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/master/CODE_OF_CONDUCT.md).
+<% end -%>

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

@@ -1,14 +1,14 @@
 require "bundler/gem_tasks"
-<% if config[:test] == 'minitest' -%>
+<% if config[:test] == "minitest" -%>
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-<% elsif config[:test] == 'rspec' -%>
+<% elsif config[:test] == "rspec" -%>
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
@@ -19,8 +19,8 @@ require "rake/extensiontask"
 
 task :build => :compile
 
-Rake::ExtensionTask.new("<%=config[:underscored_name]%>") do |ext|
-  ext.lib_dir = "lib/<%=config[:namespaced_path]%>"
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+  ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
 
 task :default => [:clobber, :compile, :<%= config[:test_task] %>]

data/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt

@@ -1,9 +1,9 @@
-#include "<%=config[:underscored_name]%>.h"
+#include "<%= config[:underscored_name] %>.h"
 
-VALUE rb_m<%=config[:constant_array].join%>;
+VALUE rb_m<%= config[:constant_array].join %>;
 
 void
-Init_<%=config[:underscored_name]%>(void)
+Init_<%= config[:underscored_name] %>(void)
 {
-  rb_m<%=config[:constant_array].join%> = rb_define_module(<%=config[:constant_name].inspect%>);
+  rb_m<%= config[:constant_array].join %> = rb_define_module(<%= config[:constant_name].inspect %>);
 }

data/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt

@@ -1,6 +1,6 @@
-#ifndef <%=config[:underscored_name].upcase%>_H
-#define <%=config[:underscored_name].upcase%>_H 1
+#ifndef <%= config[:underscored_name].upcase %>_H
+#define <%= config[:underscored_name].upcase %>_H 1
 
 #include "ruby.h"
 
-#endif /* <%=config[:underscored_name].upcase%>_H */
+#endif /* <%= config[:underscored_name].upcase %>_H */

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

@@ -1,12 +1,12 @@
-require "<%=config[:namespaced_path]%>/version"
+require "<%= config[:namespaced_path] %>/version"
 <%- if config[:ext] -%>
-require "<%=config[:namespaced_path]%>/<%=config[:underscored_name]%>"
+require "<%= config[:namespaced_path] %>/<%= config[:underscored_name] %>"
 <%- end -%>
 
-<%- config[:constant_array].each_with_index do |c,i| -%>
-<%= '  '*i %>module <%= c %>
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
 <%- end -%>
-<%= '  '*config[:constant_array].size %># Your code goes here...
+<%= "  " * config[:constant_array].size %># Your code goes here...
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
-<%= '  '*i %>end
+<%= "  " * i %>end
 <%- end -%>

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

@@ -1,7 +1,7 @@
-<%- config[:constant_array].each_with_index do |c,i| -%>
-<%= '  '*i %>module <%= c %>
+<%- config[:constant_array].each_with_index do |c, i| -%>
+<%= "  " * i %>module <%= c %>
 <%- end -%>
-<%= '  '*config[:constant_array].size %>VERSION = "0.1.0"
+<%= "  " * config[:constant_array].size %>VERSION = "0.1.0"
 <%- (config[:constant_array].size-1).downto(0) do |i| -%>
-<%= '  '*i %>end
+<%= "  " * i %>end
 <%- end -%>

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

@@ -1,13 +1,13 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require '<%=config[:namespaced_path]%>/version'
+require "<%= config[:namespaced_path] %>/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = <%=config[:name].inspect%>
-  spec.version       = <%=config[:constant_name]%>::VERSION
-  spec.authors       = [<%=config[:author].inspect%>]
-  spec.email         = [<%=config[:email].inspect%>]
+  spec.name          = <%= config[:name].inspect %>
+  spec.version       = <%= config[:constant_name] %>::VERSION
+  spec.authors       = [<%= config[:author].inspect %>]
+  spec.email         = [<%= config[:email].inspect %>]
 
   spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
   spec.description   = %q{TODO: Write a longer description or delete this line.}
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 <%- if config[:ext] -%>
-  spec.extensions    = ["ext/<%=config[:underscored_name]%>/extconf.rb"]
+  spec.extensions    = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
 <%- end -%>
 
   spec.add_development_dependency "bundler", "~> <%= config[:bundler_version] %>"
@@ -41,6 +41,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake-compiler"
 <%- end -%>
 <%- if config[:test] -%>
-  spec.add_development_dependency "<%=config[:test]%>", "~> <%=config[:test_framework_version]%>"
+  spec.add_development_dependency "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
 <%- end -%>
 end

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

@@ -5,6 +5,9 @@ RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
 
+  # Disable RSpec exposing methods globally on `Module` and `main`
+  config.disable_monkey_patching!
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class <%= config[:constant_name] %>Test < Minitest::Test
   def test_that_it_has_a_version_number