bundler 1.13.6 → 1.17.3

data/lib/bundler/version_ranges.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Bundler
+  module VersionRanges
+    NEq = Struct.new(:version)
+    ReqR = Struct.new(:left, :right)
+    class ReqR
+      Endpoint = Struct.new(:version, :inclusive)
+      def to_s
+        "#{left.inclusive ? "[" : "("}#{left.version}, #{right.version}#{right.inclusive ? "]" : ")"}"
+      end
+      INFINITY = Object.new.freeze
+      ZERO = Gem::Version.new("0.a")
+
+      def cover?(v)
+        return false if left.inclusive && left.version > v
+        return false if !left.inclusive && left.version >= v
+
+        if right.version != INFINITY
+          return false if right.inclusive && right.version < v
+          return false if !right.inclusive && right.version <= v
+        end
+
+        true
+      end
+
+      def empty?
+        left.version == right.version && !(left.inclusive && right.inclusive)
+      end
+
+      def single?
+        left.version == right.version
+      end
+
+      UNIVERSAL = ReqR.new(ReqR::Endpoint.new(Gem::Version.new("0.a"), true), ReqR::Endpoint.new(ReqR::INFINITY, false)).freeze
+    end
+
+    def self.for_many(requirements)
+      requirements = requirements.map(&:requirements).flatten(1).map {|r| r.join(" ") }
+      requirements << ">= 0.a" if requirements.empty?
+      requirement = Gem::Requirement.new(requirements)
+      self.for(requirement)
+    end
+
+    def self.for(requirement)
+      ranges = requirement.requirements.map do |op, v|
+        case op
+        when "=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v, true))
+        when "!=" then NEq.new(v)
+        when ">=" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(ReqR::INFINITY, false))
+        when ">" then ReqR.new(ReqR::Endpoint.new(v, false), ReqR::Endpoint.new(ReqR::INFINITY, false))
+        when "<" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, false))
+        when "<=" then ReqR.new(ReqR::Endpoint.new(ReqR::ZERO, true), ReqR::Endpoint.new(v, true))
+        when "~>" then ReqR.new(ReqR::Endpoint.new(v, true), ReqR::Endpoint.new(v.bump, false))
+        else raise "unknown version op #{op} in requirement #{requirement}"
+        end
+      end.uniq
+      ranges, neqs = ranges.partition {|r| !r.is_a?(NEq) }
+
+      [ranges.sort_by {|range| [range.left.version, range.left.inclusive ? 0 : 1] }, neqs.map(&:version)]
+    end
+
+    def self.empty?(ranges, neqs)
+      !ranges.reduce(ReqR::UNIVERSAL) do |last_range, curr_range|
+        next false unless last_range
+        next false if curr_range.single? && neqs.include?(curr_range.left.version)
+        next curr_range if last_range.right.version == ReqR::INFINITY
+        case last_range.right.version <=> curr_range.left.version
+        when 1 then next curr_range
+        when 0 then next(last_range.right.inclusive && curr_range.left.inclusive && !neqs.include?(curr_range.left.version) && curr_range)
+        when -1 then next false
+        end
+      end
+    end
+  end
+end

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
@@ -25,18 +26,16 @@ module Bundler
       @request_queue = Queue.new
       @response_queue = Queue.new
       @func = func
-      @threads = Array.new(size) do |i|
-        Thread.start { process_queue(i) }.tap do |thread|
-          thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
-        end
-      end
-      trap("INT") { abort_threads }
+      @size = size
+      @threads = nil
+      SharedHelpers.trap("INT") { abort_threads }
     end
 
     # Enqueue a request to be executed in the worker pool
     #
     # @param obj [String] mostly it is name of spec that should be downloaded
     def enq(obj)
+      create_threads unless @threads
       @request_queue.enq obj
     end
 
@@ -70,13 +69,38 @@ module Bundler
     # Stop the worker threads by sending a poison object down the request queue
     # so as worker threads after retrieving it, shut themselves down
     def stop_threads
+      return unless @threads
       @threads.each { @request_queue.enq POISON }
       @threads.each(&:join)
+      @threads = nil
     end
 
     def abort_threads
+      return unless @threads
+      Bundler.ui.debug("\n#{caller.join("\n")}")
       @threads.each(&:exit)
       exit 1
     end
+
+    def create_threads
+      creation_errors = []
+
+      @threads = Array.new(@size) do |i|
+        begin
+          Thread.start { process_queue(i) }.tap do |thread|
+            thread.name = "#{name} Worker ##{i}" if thread.respond_to?(:name=)
+          end
+        rescue ThreadError => e
+          creation_errors << e
+          nil
+        end
+      end.compact
+
+      return if creation_errors.empty?
+
+      message = "Failed to create threads for the #{name} worker: #{creation_errors.map(&:to_s).uniq.join(", ")}"
+      raise ThreadCreationError, message if @threads.empty?
+      Bundler.ui.info message
+    end
   end
 end

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
@@ -52,12 +52,12 @@ module Bundler
       stack = [res]
       last_hash = nil
       last_empty_key = nil
-      str.split("\n").each do |line|
+      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,58 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "BUNDLE\-ADD" "1" "December 2018" "" ""
+.
+.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] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
+.
+.SH "DESCRIPTION"
+Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-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 \-\-skip\-install
+.
+.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\.
+.
+.TP
+\fB\-\-skip\-install\fR
+Adds the gem to the Gemfile but does not install it\.
+.
+.TP
+\fB\-\-optimistic\fR
+Adds optimistic declaration of version
+.
+.TP
+\fB\-\-strict\fR
+Adds strict declaration of version
+

data/man/bundle-add.1.txt

@@ -0,0 +1,52 @@
+BUNDLE-ADD(1)							 BUNDLE-ADD(1)
+
+
+
+NAME
+       bundle-add - Add gem to the Gemfile and run bundle install
+
+SYNOPSIS
+       bundle	  add	  GEM_NAME     [--group=GROUP]	   [--version=VERSION]
+       [--source=SOURCE] [--skip-install] [--strict] [--optimistic]
+
+DESCRIPTION
+       Adds the named gem to  the  Gemfile  and  run  bundle  install.	bundle
+       install can be avoided by using the flag --skip-install.
+
+       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 --skip-install
+
+       bundle add rails --group "development, test"
+
+OPTIONS
+       --version, -v
+	      Specify version requirements(s) for the added gem.
+
+       --group, -g
+	      Specify the group(s) for the added gem. Multiple	groups	should
+	      be separated by commas.
+
+       --source, , -s
+	      Specify the source for the added gem.
+
+       --skip-install
+	      Adds the gem to the Gemfile but does not install it.
+
+       --optimistic
+	      Adds optimistic declaration of version
+
+       --strict
+	      Adds strict declaration of version
+
+
+
+
+				 December 2018			 BUNDLE-ADD(1)

data/man/bundle-add.ronn

@@ -0,0 +1,40 @@
+bundle-add(1) -- Add gem to the Gemfile and run bundle install
+================================================================
+
+## SYNOPSIS
+
+`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--skip-install] [--strict] [--optimistic]
+
+## DESCRIPTION
+Adds the named gem to the Gemfile and run `bundle install`. `bundle install` can be avoided by using the flag `--skip-install`.
+
+Example:
+
+bundle add rails
+
+bundle add rails --version "< 3.0, > 1.1"
+
+bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"
+
+bundle add rails --skip-install
+
+bundle add rails --group "development, test"
+
+## OPTIONS
+* `--version`, `-v`:
+  Specify version requirements(s) for the added gem.
+
+* `--group`, `-g`:
+  Specify the group(s) for the added gem. Multiple groups should be separated by commas.
+
+* `--source`, , `-s`:
+  Specify the source for the added gem.
+
+* `--skip-install`:
+  Adds the gem to the Gemfile but does not install it.
+
+* `--optimistic`:
+  Adds optimistic declaration of version
+
+* `--strict`:
+  Adds strict declaration of version

data/{lib/bundler/man/bundle-binstubs → man/bundle-binstubs.1}

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-BINSTUBS" "1" "October 2016" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
@@ -10,6 +10,12 @@
 \fBbundle binstubs\fR \fIGEM_NAME\fR [\-\-force] [\-\-path PATH] [\-\-standalone]
 .
 .SH "DESCRIPTION"
+Binstubs are scripts that wrap around 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"
@@ -26,5 +32,9 @@ The location to install the specified binstubs to\. This defaults to \fBbin\fR\.
 \fB\-\-standalone\fR
 Makes binstubs that can work without depending on Rubygems or Bundler at runtime\.
 .
+.TP
+\fB\-\-shebang\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) \fIbundle\-install\.1\.html\fR\.

data/man/bundle-binstubs.1.txt

@@ -0,0 +1,48 @@
+BUNDLE-BINSTUBS(1)					    BUNDLE-BINSTUBS(1)
+
+
+
+NAME
+       bundle-binstubs - Install the binstubs of the listed gems
+
+SYNOPSIS
+       bundle binstubs GEM_NAME [--force] [--path PATH] [--standalone]
+
+DESCRIPTION
+       Binstubs  are  scripts  that wrap around 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 applica-
+       tion.
+
+       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.
+
+OPTIONS
+       --force
+	      Overwrite existing binstubs if they exist.
+
+       --path The location to install the specified binstubs to. This defaults
+	      to bin.
+
+       --standalone
+	      Makes  binstubs  that  can work without depending on Rubygems or
+	      Bundler at runtime.
+
+       --shebang
+	      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 flag in bundle install(1) bundle-install.1.html.
+
+
+
+				 November 2018		    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 around 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,7 +34,10 @@ 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.
 
+* `--shebang`:
+  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`
-flag in [bundle install(1)][bundle-install].
+flag in [bundle install(1)](bundle-install.1.html).