bundler 1.15.4 → 1.16.0.pre.1

data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph'
 
 module Bundler::Molinillo

data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler::Molinillo
   # A state that a {Resolution} can be in
   # @attr [String] name the name of the current requirement
@@ -7,7 +8,8 @@ module Bundler::Molinillo
   # @attr [Object] requirement the current requirement
   # @attr [Object] possibilities the possibilities to satisfy the current requirement
   # @attr [Integer] depth the depth of the resolution
-  # @attr [Set<Object>] conflicts unresolved conflicts
+  # @attr [Hash] conflicts unresolved conflicts, indexed by dependency name
+  # @attr [Array<UnwindDetails>] unused_unwind_options unwinds for previous conflicts that weren't explored
   ResolutionState = Struct.new(
     :name,
     :requirements,
@@ -15,14 +17,15 @@ module Bundler::Molinillo
     :requirement,
     :possibilities,
     :depth,
-    :conflicts
+    :conflicts,
+    :unused_unwind_options
   )
 
   class ResolutionState
     # Returns an empty resolution state
     # @return [ResolutionState] an empty state
     def self.empty
-      new(nil, [], DependencyGraph.new, nil, nil, 0, Set.new)
+      new(nil, [], DependencyGraph.new, nil, nil, 0, {}, [])
     end
   end
 
@@ -40,7 +43,8 @@ module Bundler::Molinillo
         requirement,
         [possibilities.pop],
         depth + 1,
-        conflicts.dup
+        conflicts.dup,
+        unused_unwind_options.dup
       ).tap do |state|
         state.activated.tag(state)
       end

data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb

@@ -814,7 +814,7 @@ class Bundler::Persistent::Net::HTTP::Persistent
 
   ##
   # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
-  # block is given.  Returns all responses recieved.
+  # block is given.  Returns all responses received.
   #
   # See
   # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]

data/lib/bundler/vendored_fileutils.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Bundler; end
+if RUBY_VERSION >= "2.4"
+  require "bundler/vendor/fileutils/lib/fileutils"
+else
+  # the version we vendor is 2.4+
+  require "fileutils"
+end

data/lib/bundler/vendored_molinillo.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 module Bundler; end
 require "bundler/vendor/molinillo/lib/molinillo"

data/lib/bundler/vendored_persistent.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # We forcibly require OpenSSL, because net/http/persistent will only autoload
 # it. On some Rubies, autoload fails but explicit require succeeds.
 begin
@@ -15,3 +16,36 @@ module Bundler
   end
 end
 require "bundler/vendor/net-http-persistent/lib/net/http/persistent"
+
+module Bundler
+  class PersistentHTTP < Persistent::Net::HTTP::Persistent
+    def connection_for(uri)
+      connection = super
+      warn_old_tls_version_rubygems_connection(uri, connection)
+      connection
+    end
+
+    def warn_old_tls_version_rubygems_connection(uri, connection)
+      return unless connection.use_ssl?
+      return unless (uri.host || "").end_with?("rubygems.org")
+
+      socket = connection.instance_variable_get(:@socket)
+      socket_io = socket.io
+      return unless socket_io.respond_to?(:ssl_version)
+      ssl_version = socket_io.ssl_version
+
+      case ssl_version
+      when /TLSv([\d\.]+)/
+        version = Gem::Version.new($1)
+        if version < Gem::Version.new("1.2")
+          Bundler.ui.warn \
+            "Warning: Your Ruby version is compiled against a copy of OpenSSL that is very old. " \
+            "Starting in January 2018, RubyGems.org will refuse connection requests from these " \
+            "very old versions of OpenSSL. If you will need to continue installing gems after " \
+            "January 2018, please follow this guide to upgrade: http://ruby.to/tls-outdated.",
+            :wrap => true
+        end
+      end
+    end
+  end
+end

data/lib/bundler/vendored_thor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   def self.require_thor_actions
     Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")

data/lib/bundler/version.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 # Ruby 1.9.3 and old RubyGems don't play nice with frozen version strings
 # rubocop:disable MutableConstant
@@ -7,7 +7,7 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.15.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.16.0.pre.1" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin
@@ -21,4 +21,8 @@ module Bundler
   end
   private_class_method :overwrite_loaded_gem_version
   overwrite_loaded_gem_version
+
+  def self.bundler_major_version
+    @bundler_major_version ||= VERSION.split(".").first.to_i
+  end
 end

data/lib/bundler/version_ranges.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Bundler
   module VersionRanges
     NEq = Struct.new(:version)

data/lib/bundler/vlad.rb

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
+
+require "bundler/shared_helpers"
+Bundler::SharedHelpers.major_deprecation 2,
+  "The Bundler task for Vlad"
+
 # Vlad task for Bundler.
 #
 # Add "require 'bundler/vlad'" in your Vlad deploy.rb, and

data/lib/bundler/worker.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "thread"
 
 module Bundler

data/lib/bundler/yaml_serializer.rb

@@ -37,7 +37,7 @@ module Bundler
     HASH_REGEX = /
       ^
       ([ ]*) # indentations
-      (.*) # key
+      (.+) # key
       (?::(?=(?:\s|$))) # :  (without the lookahead the #key includes this when : is present in value)
       [ ]?
       (?: !\s)? # optional exclamation mark found with ruby 1.9.3
@@ -54,10 +54,10 @@ module Bundler
       last_empty_key = nil
       str.split(/\r?\n/).each do |line|
         if match = HASH_REGEX.match(line)
-          indent, key, _, val = match.captures
+          indent, key, quote, val = match.captures
           key = convert_to_backward_compatible_key(key)
           depth = indent.scan(/  /).length
-          if val.empty?
+          if quote.empty? && val.empty?
             new_hash = {}
             stack[depth][key] = new_hash
             stack[depth + 1] = new_hash

data/man/bundle-add.1

@@ -0,0 +1,43 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-ADD" "1" "June 2017" "" ""
+.
+.SH "NAME"
+\fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
+.
+.SH "SYNOPSIS"
+\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE]
+.
+.SH "DESCRIPTION"
+Adds the named gem to the Gemfile and run \fBbundle install\fR\.
+.
+.P
+Example:
+.
+.P
+bundle add rails
+.
+.P
+bundle add rails \-\-version "< 3\.0, > 1\.1"
+.
+.P
+bundle add rails \-\-version "~> 5\.0\.0" \-\-source "https://gems\.example\.com" \-\-group "development"
+.
+.P
+bundle add rails \-\-group "development, test"
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-version\fR, \fB\-v\fR
+Specify version requirements(s) for the added gem\.
+.
+.TP
+\fB\-\-group\fR, \fB\-g\fR
+Specify the group(s) for the added gem\. Multiple groups should be separated by commas\.
+.
+.TP
+\fB\-\-source\fR, , \fB\-s\fR
+Specify the source for the added gem\.
+

data/man/bundle-add.1.txt

@@ -0,0 +1,40 @@
+BUNDLE-ADD(1)							 BUNDLE-ADD(1)
+
+
+
+1mNAME0m
+       1mbundle-add 22m- Add gem to the Gemfile and run bundle install
+
+1mSYNOPSIS0m
+       1mbundle     add     4m22mGEM_NAME24m	 [--group=GROUP]     [--version=VERSION]
+       [--source=SOURCE]
+
+1mDESCRIPTION0m
+       Adds the named gem to the Gemfile and run 1mbundle install22m.
+
+       Example:
+
+       bundle add rails
+
+       bundle add rails --version "< 3.0, > 1.1"
+
+       bundle add rails  --version  "~>  5.0.0"  --source  "https://gems.exam-
+       ple.com" --group "development"
+
+       bundle add rails --group "development, test"
+
+1mOPTIONS0m
+       1m--version22m, 1m-v0m
+	      Specify version requirements(s) for the added gem.
+
+       1m--group22m, 1m-g0m
+	      Specify  the  group(s) for the added gem. Multiple groups should
+	      be separated by commas.
+
+       1m--source22m, , 1m-s0m
+	      Specify the source for the added gem.
+
+
+
+
+				   June 2017			 BUNDLE-ADD(1)

data/man/bundle-binstubs.1

@@ -0,0 +1,40 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-BINSTUBS" "1" "August 2017" "" ""
+.
+.SH "NAME"
+\fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
+.
+.SH "SYNOPSIS"
+\fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
+.
+.SH "DESCRIPTION"
+Binstubs are scripts that wrap aroung executables\. Bundler creates a small Ruby file (a binstub) that loads Bundler, runs the command, and puts it into \fBbin/\fR\. Binstubs are a shortcut—or alternative— to always using \fBbundle exec\fR\. This gives you a file that can by run directly, and one that will always run the correct gem version used by the application\.
+.
+.P
+For example, if you run \fBbundle binstubs rspec\-core\fR, Bundler will create the file \fBbin/rspec\fR\. That file will contain enough code to load Bundler, tell it to load the bundled gems, and then run rspec\.
+.
+.P
+This command generates binstubs for executables in \fBGEM_NAME\fR\. Binstubs are put into \fBbin\fR, or the \fB\-\-path\fR directory if one has been set\. Calling binstubs with [GEM [GEM]] will create binstubs for all given gems\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-force\fR
+Overwrite existing binstubs if they exist\.
+.
+.TP
+\fB\-\-path\fR
+The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
+.
+.TP
+\fB\-\-standalone\fR
+Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
+.
+.TP
+\fB\-\-sheband\fR
+Specify a different shebang executable name than the default (default \'ruby\')
+.
+.SH "BUNDLE INSTALL \-\-BINSTUBS"
+To create binstubs for all the gems in the bundle you can use the \fB\-\-binstubs\fR flag in [bundle install(1)][bundle\-install]\.

data/man/bundle-binstubs.1.txt

@@ -0,0 +1,48 @@
+BUNDLE-BINSTUBS(1)					    BUNDLE-BINSTUBS(1)
+
+
+
+1mNAME0m
+       1mbundle-binstubs 22m- Install the binstubs of the listed gems
+
+1mSYNOPSIS0m
+       1mbundle binstubs 4m22mGEM_NAME24m [--force] [--path PATH] [--standalone]
+
+1mDESCRIPTION0m
+       Binstubs  are  scripts  that wrap aroung executables. Bundler creates a
+       small Ruby file (a binstub) that loads Bundler, runs the  command,  and
+       puts  it  into  1mbin/22m. Binstubs are a shortcutaor alternativea to always
+       using 1mbundle exec22m. This gives you a file that can by run directly,	and
+       one  that  will always run the correct gem version used by the applica-
+       tion.
+
+       For example, if you run 1mbundle binstubs rspec-core22m, Bundler will create
+       the file 1mbin/rspec22m. That file will contain enough code to load Bundler,
+       tell it to load the bundled gems, and then run rspec.
+
+       This command generates binstubs for executables in  1mGEM_NAME22m.  Binstubs
+       are  put into 1mbin22m, or the 1m--path 22mdirectory if one has been set. Calling
+       binstubs with [GEM [GEM]] will create binstubs for all given gems.
+
+1mOPTIONS0m
+       1m--force0m
+	      Overwrite existing binstubs if they exist.
+
+       1m--path 22mThe location to install the specified binstubs to. This defaults
+	      to 1mbin22m.
+
+       1m--standalone0m
+	      Makes  binstubs  that  can work without depending on Rubygems or
+	      Bundler at runtime.
+
+       1m--sheband0m
+	      Specify a different shebang executable  name  than  the  default
+	      (default 'ruby')
+
+1mBUNDLE INSTALL --BINSTUBS0m
+       To  create  binstubs  for  all  the  gems in the bundle you can use the
+       1m--binstubs 22mflag in [bundle install(1)][bundle-install].
+
+
+
+				  August 2017		    BUNDLE-BINSTUBS(1)

data/man/bundle-binstubs.ronn

@@ -7,6 +7,17 @@ bundle-binstubs(1) -- Install the binstubs of the listed gems
 
 ## DESCRIPTION
 
+Binstubs are scripts that wrap aroung executables. Bundler creates a
+small Ruby file (a binstub) that loads Bundler, runs the command,
+and puts it into `bin/`. Binstubs are a shortcut—or alternative—
+to always using `bundle exec`. This gives you a file that can by run
+directly, and one that will always run the correct gem version
+used by the application.
+
+For example, if you run `bundle binstubs rspec-core`, Bundler will create
+the file `bin/rspec`. That file will contain enough code to load Bundler,
+tell it to load the bundled gems, and then run rspec.
+
 This command generates binstubs for executables in `GEM_NAME`.
 Binstubs are put into `bin`, or the `--path` directory if one has been set.
 Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
@@ -23,6 +34,9 @@ Calling binstubs with [GEM [GEM]] will create binstubs for all given gems.
   Makes binstubs that can work without depending on Rubygems or Bundler at
   runtime.
 
+* `--sheband`:
+  Specify a different shebang executable name than the default (default 'ruby')
+
 ## BUNDLE INSTALL --BINSTUBS
 
 To create binstubs for all the gems in the bundle you can use the `--binstubs`

data/man/bundle-check.1

@@ -0,0 +1,31 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-CHECK" "1" "June 2017" "" ""
+.
+.SH "NAME"
+\fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
+.
+.SH "SYNOPSIS"
+\fBbundle check\fR [\-\-dry\-run] [\-\-gemfile=FILE] [\-\-path=PATH]
+.
+.SH "DESCRIPTION"
+\fBcheck\fR searches the local machine for each of the gems requested in the Gemfile\. If all gems are found, Bundler prints a success message and exits with a status of 0\.
+.
+.P
+If not, the first missing gem is listed and Bundler exits status 1\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-\-dry\-run\fR
+Locks the \fBGemfile(5)\fR before running the command\.
+.
+.TP
+\fB\-\-gemfile\fR
+Use the specified gemfile instead of the \fBGemfile(5)\fR
+.
+.TP
+\fB\-\-path\fR
+Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME)\. Bundler will remember this value for future installs on this machine\.
+

data/man/bundle-check.1.txt

@@ -0,0 +1,32 @@
+BUNDLE-CHECK(1) 					       BUNDLE-CHECK(1)
+
+
+
+1mNAME0m
+       1mbundle-check 22m- Verifies if dependencies are satisfied by installed gems
+
+1mSYNOPSIS0m
+       1mbundle check 22m[--dry-run] [--gemfile=FILE] [--path=PATH]
+
+1mDESCRIPTION0m
+       1mcheck	22msearches the local machine for each of the gems requested in the
+       Gemfile. If all gems are found, Bundler prints a  success  message  and
+       exits with a status of 0.
+
+       If not, the first missing gem is listed and Bundler exits status 1.
+
+1mOPTIONS0m
+       1m--dry-run0m
+	      Locks the 1mGemfile(5) 22mbefore running the command.
+
+       1m--gemfile0m
+	      Use the specified gemfile instead of the 1mGemfile(5)0m
+
+       1m--path 22mSpecify  a  different path than the system default ($BUNDLE_PATH
+	      or $GEM_HOME). Bundler  will  remember  this  value  for	future
+	      installs on this machine.
+
+
+
+
+				   June 2017		       BUNDLE-CHECK(1)