bundler 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d56462f2f8c79cbbedc0181c42011735545ba490563aa6ffd54fc3fdcf059a0d
-  data.tar.gz: 75f2fea3dde35a7cf22b2e208676670c619b43f86b7b30b5154f6e4f74eca50c
+SHA1:
+  metadata.gz: 1740d2e5ead04fc448d7676f9e57b2621dfdc16c
+  data.tar.gz: e36b94d810b1eba94863fcd681157abacbed3516
 SHA512:
-  metadata.gz: 5e297400591076de5fdb17dd50d4cc36615d1294e402fb6675df7fd138e46aecce70dff55ff5efbb1b0ab9044f2c6df3ac7a838353693570f4be5fa0a2fa993e
-  data.tar.gz: ed1ceb6eaeafd2208447f362bc77867d7a0207ed1379c78e88e0e37b91f929f64376cce5fab1e2393833a78a836a3de51d19f93b630e5247d4cc4be190ea9444
+  metadata.gz: 29116c83cab200dc0a8103736f80ba25d238b129f2b650947f67e0aae871f655383ee6933683a5162a0de3c2209303c69aa8aae99136effdaec3fd633939371f
+  data.tar.gz: 635d4a391d1c24695b9bb0f313b51f16f832462dfb5384fd8201c57c89537a78cc1919cce4ec4134b4518683fd6fd33fcfabd2196c40852f47ac22e255dfcb45

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.16.1 (2017-12-12)
+
+Bugfixes:
+
+  - avoid hanging on complex resolver errors ([#6114](https://github.com/bundler/bundler/issues/6114), @halfbyte)
+  - avoid an error when running `bundle update --group` ([#6156](https://github.com/bundler/bundler/issues/6156), @mattbrictson)
+  - ensure the resolver prefers non-pre-release gems when possible ([#6181](https://github.com/bundler/bundler/issues/6181), @greysteil)
+  - include bundler's gemspec in the built gem ([#6165](https://github.com/bundler/bundler/issues/6165), @dr-itz)
+  - ensure locally installed specs are not overriden by those in remote sources during dependency resolution ([#6072](https://github.com/bundler/bundler/issues/6072), @indirect)
+  - ensure custom gemfiles are respected in generated binstubs (@pftg)
+  - fail gracefully when loading a bundler-generated binstub when `bin/bundle` was not generated by bundler ([#6149](https://github.com/bundler/bundler/issues/6149), @hsbt)
+  - allow `bundle init` to be run even when a parent directory contains a gemfile ([#6205](https://github.com/bundler/bundler/issues/6205), @colby-swandale)
+
 ## 1.16.0 (2017-10-31)
 
 Bugfixes:

data/bundler.gemspec

@@ -0,0 +1,57 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require File.expand_path("../lib/bundler/version", __FILE__)
+require "shellwords"
+
+Gem::Specification.new do |s|
+  s.name        = "bundler"
+  s.version     = Bundler::VERSION
+  s.license     = "MIT"
+  s.authors     = [
+    "André Arko", "Samuel Giddins", "Chris Morris", "James Wen", "Tim Moore",
+    "André Medeiros", "Jessica Lynn Suttles", "Terence Lee", "Carl Lerche",
+    "Yehuda Katz"
+  ]
+  s.email       = ["team@bundler.io"]
+  s.homepage    = "http://bundler.io"
+  s.summary     = "The best way to manage your application's dependencies"
+  s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
+
+  if s.respond_to?(:metadata=)
+    s.metadata = {
+      "bug_tracker_uri" => "http://github.com/bundler/bundler/issues",
+      "changelog_uri" => "https://github.com/bundler/bundler/blob/master/CHANGELOG.md",
+      "homepage_uri" => "https://bundler.io/",
+      "source_code_uri" => "http://github.com/bundler/bundler/",
+    }
+  end
+
+  if s.version >= Gem::Version.new("2.a".dup)
+    s.required_ruby_version     = ">= 2.3.0"
+    s.required_rubygems_version = ">= 2.5.0"
+  else
+    s.required_ruby_version     = ">= 1.8.7"
+    s.required_rubygems_version = ">= 1.3.6"
+  end
+
+  s.add_development_dependency "automatiek", "~> 0.1.0"
+  s.add_development_dependency "mustache",   "0.99.6"
+  s.add_development_dependency "rake",       "~> 10.0"
+  s.add_development_dependency "rdiscount",  "~> 2.2"
+  s.add_development_dependency "ronn",       "~> 0.7.3"
+  s.add_development_dependency "rspec",      "~> 3.6"
+
+  s.files = `git ls-files -z`.split("\x0").select {|f| f.match(%r{^(lib|exe)/}) }
+  # we don't check in man pages, but we need to ship them because
+  # we use them to generate the long-form help for each command.
+  s.files += Dir.glob("man/**/*")
+  # Include the CHANGELOG.md, LICENSE.md, README.md manually
+  s.files += %w[CHANGELOG.md LICENSE.md README.md]
+  # include the gemspec itself because warbler breaks w/o it
+  s.files += %w[bundler.gemspec]
+
+  s.bindir        = "exe"
+  s.executables   = %w[bundle bundler]
+  s.require_paths = ["lib"]
+end

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2017-10-31".freeze
-    @git_commit_sha = "10f20fa33".freeze
+    @built_at = "2017-12-21".freeze
+    @git_commit_sha = "0034ef341".freeze
     @release = true
     # end ivars
 

data/lib/bundler/cli/gem.rb

@@ -83,7 +83,7 @@ module Bundler
         config[:test] = test_framework
         config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
 
-        templates.merge!(".travis.yml.tt" => ".travis.yml")
+        templates.merge!("travis.yml.tt" => ".travis.yml")
 
         case test_framework
         when "rspec"

data/lib/bundler/cli/init.rb

@@ -36,11 +36,7 @@ module Bundler
   private
 
     def gemfile
-      @gemfile ||= begin
-        Bundler.default_gemfile
-      rescue GemfileNotFound
-        Bundler.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile"
-      end
+      @gemfile ||= Bundler.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile"
     end
   end
 end

data/lib/bundler/cli/update.rb

@@ -68,7 +68,9 @@ module Bundler
 
       if locked_gems = Bundler.definition.locked_gems
         gems.each do |name|
-          locked_version = locked_gems.specs.find {|s| s.name == name }.version
+          locked_version = locked_gems.specs.find {|s| s.name == name }
+          locked_version &&= locked_version.version
+          next unless locked_version
           new_version = Bundler.definition.specs[name].first
           new_version &&= new_version.version
           if !new_version

data/lib/bundler/definition.rb

@@ -295,7 +295,7 @@ module Bundler
         end
 
         sources.all_sources.each do |source|
-          source.double_check_for(unmet_dependency_names, :override_dupes)
+          source.double_check_for(unmet_dependency_names)
         end
 
         break if idxcount == idx.size

data/lib/bundler/resolver.rb

@@ -245,7 +245,8 @@ module Bundler
           if all <= 1
             all - 1_000_000
           else
-            search = search_for(dependency).size
+            search = search_for(dependency)
+            search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
             search - all
           end
         end
@@ -305,6 +306,8 @@ module Bundler
         :solver_name => "Bundler",
         :possibility_type => "gem",
         :reduce_trees => lambda do |trees|
+          # bail out if tree size is too big for Array#combination to make any sense
+          return trees if trees.size > 15
           maximal = 1.upto(trees.size).map do |size|
             trees.map(&:last).flatten(1).combination(size).to_a
           end.flatten(1).select do |deps|

data/lib/bundler/source/rubygems.rb

@@ -252,10 +252,8 @@ module Bundler
         end
       end
 
-      def double_check_for(unmet_dependency_names, override_dupes = false, index = specs)
+      def double_check_for(unmet_dependency_names)
         return unless @allow_remote
-        raise ArgumentError, "missing index" unless index
-
         return unless api_fetchers.any?
 
         unmet_dependency_names = unmet_dependency_names.call
@@ -270,7 +268,7 @@ module Bundler
 
         Bundler.ui.debug "Double checking for #{unmet_dependency_names || "all specs (due to the size of the request)"} in #{self}"
 
-        fetch_names(api_fetchers, unmet_dependency_names, index, override_dupes)
+        fetch_names(api_fetchers, unmet_dependency_names, specs, false)
       end
 
       def dependency_names_to_double_check

data/lib/bundler/templates/.document

@@ -0,0 +1 @@
+# Ignore all files in this directory

data/lib/bundler/templates/Executable

@@ -8,13 +8,21 @@
 # this file is here to facilitate running it.
 #
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-load(bundle_binstub) if File.file?(bundle_binstub)
-
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../<%= relative_gemfile_path %>",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/lib/bundler/version.rb

@@ -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.16.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.16.1" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle-add.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-ADD" "1" "September 2017" "" ""
+.TH "BUNDLE\-ADD" "1" "June 2017" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

data/man/bundle-add.1.txt

@@ -2,15 +2,15 @@ BUNDLE-ADD(1)							 BUNDLE-ADD(1)
 
 
 
-1mNAME0m
-       1mbundle-add 22m- Add gem to the Gemfile and run bundle install
+NAME
+       bundle-add - Add gem to the Gemfile and run bundle install
 
-1mSYNOPSIS0m
-       1mbundle     add     4m22mGEM_NAME24m	 [--group=GROUP]     [--version=VERSION]
+SYNOPSIS
+       bundle	  add	  GEM_NAME     [--group=GROUP]	   [--version=VERSION]
        [--source=SOURCE]
 
-1mDESCRIPTION0m
-       Adds the named gem to the Gemfile and run 1mbundle install22m.
+DESCRIPTION
+       Adds the named gem to the Gemfile and run bundle install.
 
        Example:
 
@@ -23,18 +23,18 @@ BUNDLE-ADD(1)							 BUNDLE-ADD(1)
 
        bundle add rails --group "development, test"
 
-1mOPTIONS0m
-       1m--version22m, 1m-v0m
+OPTIONS
+       --version, -v
 	      Specify version requirements(s) for the added gem.
 
-       1m--group22m, 1m-g0m
+       --group, -g
 	      Specify  the  group(s) for the added gem. Multiple groups should
 	      be separated by commas.
 
-       1m--source22m, , 1m-s0m
+       --source, , -s
 	      Specify the source for the added gem.
 
 
 
 
-				September 2017			 BUNDLE-ADD(1)
+				   June 2017			 BUNDLE-ADD(1)

data/man/bundle-binstubs.1.txt

@@ -2,46 +2,46 @@ BUNDLE-BINSTUBS(1)					    BUNDLE-BINSTUBS(1)
 
 
 
-1mNAME0m
-       1mbundle-binstubs 22m- Install the binstubs of the listed gems
+NAME
+       bundle-binstubs - Install the binstubs of the listed gems
 
-1mSYNOPSIS0m
-       1mbundle binstubs 4m22mGEM_NAME24m [--force] [--path PATH] [--standalone]
+SYNOPSIS
+       bundle binstubs GEM_NAME [--force] [--path PATH] [--standalone]
 
-1mDESCRIPTION0m
+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  1mbin/22m. Binstubs are a shortcut-or alternative- to always
-       using 1mbundle exec22m. This gives you a file that can by run directly,	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 1mbundle binstubs rspec-core22m, Bundler will create
-       the file 1mbin/rspec22m. That file will contain enough code to load Bundler,
+       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  1mGEM_NAME22m.  Binstubs
-       are  put into 1mbin22m, or the 1m--path 22mdirectory if one has been set. Calling
+       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.
 
-1mOPTIONS0m
-       1m--force0m
+OPTIONS
+       --force
 	      Overwrite existing binstubs if they exist.
 
-       1m--path 22mThe location to install the specified binstubs to. This defaults
-	      to 1mbin22m.
+       --path The location to install the specified binstubs to. This defaults
+	      to bin.
 
-       1m--standalone0m
+       --standalone
 	      Makes  binstubs  that  can work without depending on Rubygems or
 	      Bundler at runtime.
 
-       1m--sheband0m
+       --sheband
 	      Specify a different shebang executable  name  than  the  default
 	      (default 'ruby')
 
-1mBUNDLE INSTALL --BINSTUBS0m
+BUNDLE INSTALL --BINSTUBS
        To  create  binstubs  for  all  the  gems in the bundle you can use the
-       1m--binstubs 22mflag in [bundle install(1)][bundle-install].
+       --binstubs flag in [bundle install(1)][bundle-install].
 
 
 

data/man/bundle-check.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CHECK" "1" "September 2017" "" ""
+.TH "BUNDLE\-CHECK" "1" "February 2017" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

data/man/bundle-check.1.txt

@@ -2,31 +2,31 @@ BUNDLE-CHECK(1) 					       BUNDLE-CHECK(1)
 
 
 
-1mNAME0m
-       1mbundle-check 22m- Verifies if dependencies are satisfied by installed gems
+NAME
+       bundle-check - Verifies if dependencies are satisfied by installed gems
 
-1mSYNOPSIS0m
-       1mbundle check 22m[--dry-run] [--gemfile=FILE] [--path=PATH]
+SYNOPSIS
+       bundle check [--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
+DESCRIPTION
+       check 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.
 
        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.
+OPTIONS
+       --dry-run
+	      Locks the Gemfile(5) before running the command.
 
-       1m--gemfile0m
-	      Use the specified gemfile instead of the 1mGemfile(5)0m
+       --gemfile
+	      Use the specified gemfile instead of the Gemfile(5)
 
-       1m--path 22mSpecify  a  different path than the system default ($BUNDLE_PATH
-	      or $GEM_HOME). Bundler  will  remember  this  value  for	future
+       --path Specify a different path than the system	default  ($BUNDLE_PATH
+	      or  $GEM_HOME).  Bundler	will  remember	this  value for future
 	      installs on this machine.
 
 
 
 
-				September 2017		       BUNDLE-CHECK(1)
+				 February 2017		       BUNDLE-CHECK(1)

data/man/bundle-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-CLEAN" "1" "September 2017" "" ""
+.TH "BUNDLE\-CLEAN" "1" "February 2017" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

data/man/bundle-clean.1.txt

@@ -2,25 +2,25 @@ BUNDLE-CLEAN(1) 					       BUNDLE-CLEAN(1)
 
 
 
-1mNAME0m
-       1mbundle-clean 22m- Cleans up unused gems in your bundler directory
+NAME
+       bundle-clean - Cleans up unused gems in your bundler directory
 
-1mSYNOPSIS0m
-       1mbundle clean 22m[--dry-run] [--force]
+SYNOPSIS
+       bundle clean [--dry-run] [--force]
 
-1mDESCRIPTION0m
+DESCRIPTION
        This  command  will  remove  all unused gems in your bundler directory.
        This is useful when you have made many changes to  your	gem  dependen-
        cies.
 
-1mOPTIONS0m
-       1m--dry-run0m
+OPTIONS
+       --dry-run
 	      Print the changes, but do not clean the unused gems.
 
-       1m--force0m
-	      Force a clean even if 1m--path 22mis not set.
+       --force
+	      Force a clean even if --path is not set.
 
 
 
 
-				September 2017		       BUNDLE-CLEAN(1)
+				 February 2017		       BUNDLE-CLEAN(1)