bundler 2.0.0.pre.1 → 2.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe356e1f165bb9c3ec3d24dc7541a043e8b1f6a5f1d3cf585b675b3a794964c8
-  data.tar.gz: 95e940f85d2ec75e4cac1e257ec3e1b8a729ae4eacb0847f30eaa484b5e7814c
+  metadata.gz: c00db23c306b0850d943d52d4f9684bc202449b0242307f0c7c0c927352c2d72
+  data.tar.gz: f687b90267e691289558336cfb92fb8cde9274098f7836d564bda3d7f82131cd
 SHA512:
-  metadata.gz: 1a260c7506e6e7b1a823bd8522be57abac3ac089b425d41c063e95da184327956177f09d26f83ebf90f5840fe0260333e09a300b297e37f87df043e6c01d26f1
-  data.tar.gz: 7281d0347e4c26c2d1696a04f6fba1de29cfe72d776d5f43781dec004c522422f49898a8f0a019a784ac9905a1557781cb089eb36e8f574c77c36c6b3290c5bb
+  metadata.gz: 182bf747adaad098ed6bed102ce296ff71984437829bfeaceb50dce7c38249bd880fd0325954a37a886871348ab95f4588730b528bce7719c306fef1dc9e730f
+  data.tar.gz: e502772b05e38b5bf8bbb756bd49c2bc5337f1702f79e378f629886da1f3f83785d725a1b7d4847d07fc6826c4cd3b55716b54ae1679f22f7da378b55d05dede

data/CHANGELOG.md

@@ -1,8 +1,22 @@
-## 2.0.0.pre.1 (2018-11-04)
+## 2.0.0.pre.2 (2018-11-27)
 
-- Dropped support for versions of Ruby < 2.3
-- Dropped support for version of RubyGems < 2.5
-- Moved error messages from STDOUT to STDERR
+Breaking Changes:
+
+  - :github source in the Gemfile now defaults to using HTTPS
+
+Changes
+
+  - Add compatability for Bundler merge into ruby-src
+
+Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
+
+## 2.0.0.pre.1 (2018-11-09)
+
+Breaking Changes:
+
+  - Dropped support for versions of Ruby < 2.3
+  - Dropped support for version of RubyGems < 2.5
+  - Moved error messages from STDOUT to STDERR
 
 Note: To upgrade your Gemfile to Bundler 2 you will need to run `bundle update --bundler`
 

data/bundler.gemspec

@@ -1,7 +1,13 @@
 # coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path("../lib/bundler/version", __FILE__)
+begin
+  require File.expand_path("../lib/bundler/version", __FILE__)
+rescue LoadError
+  # for Ruby core repository
+  require File.expand_path("../bundler/version", __FILE__)
+end
+
 require "shellwords"
 
 Gem::Specification.new do |s|

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 = "2018-11-09".freeze
-    @git_commit_sha = "eff1e3d1e".freeze
+    @built_at = "2018-11-27".freeze
+    @git_commit_sha = "e21da5e05".freeze
     @release = true
     # end ivars
 
@@ -30,12 +30,19 @@ module Bundler
       # If Bundler has been installed without its .git directory and without a
       # commit instance variable then we can't determine its commits SHA.
       git_dir = File.join(File.expand_path("../../..", __FILE__), ".git")
-      return "unknown" unless File.directory?(git_dir)
+      if File.directory?(git_dir)
+        return @git_commit_sha = Dir.chdir(git_dir) { `git rev-parse --short HEAD`.strip.freeze }
+      end
 
-      # Otherwise shell out to git.
-      @git_commit_sha = Dir.chdir(File.expand_path("..", __FILE__)) do
-        `git rev-parse --short HEAD`.strip.freeze
+      # If Bundler is a submodule in RubyGems, get the submodule commit
+      git_sub_dir = File.join(File.expand_path("../../../..", __FILE__), ".git")
+      if File.directory?(git_sub_dir)
+        return @git_commit_sha = Dir.chdir(git_sub_dir) do
+          `git ls-tree --abbrev=8 HEAD bundler`.split(/\s/).fetch(2, "").strip.freeze
+        end
       end
+
+      @git_commit_sha ||= "unknown"
     end
 
     # Whether this is an official release build of Bundler.

data/lib/bundler/dsl.rb

@@ -474,7 +474,7 @@ repo_name ||= user_name
         msg = "This Gemfile contains multiple primary sources. " \
           "Each source after the first must include a block to indicate which gems " \
           "should come from that source"
-        unless Bundler.feature_flag.bundler_2_mode?
+        unless Bundler.feature_flag.bundler_3_mode?
           msg += ". To downgrade this error to a warning, run " \
             "`bundle config --delete disable_multisource`"
         end
@@ -499,7 +499,7 @@ repo_name ||= user_name
       end
 
       Bundler::SharedHelpers.major_deprecation 3, <<-EOS
-The :#{name} git source is deprecated, and will be removed in Bundler 2.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
+The :#{name} git source is deprecated, and will be removed in Bundler 3.0.#{additional_message} Add this code to the top of your Gemfile to ensure it continues to work:
 
     git_source(:#{name}) #{replacement}
 

data/lib/bundler/feature_flag.rb

@@ -61,6 +61,8 @@ module Bundler
 
     settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
 
+    settings_method(:github_https?, "github.https") { bundler_2_mode? }
+
     def initialize(bundler_version)
       @bundler_version = Gem::Version.create(bundler_version)
     end

data/lib/bundler/shared_helpers.rb

@@ -274,7 +274,15 @@ module Bundler
       until !File.directory?(current) || current == previous
         if ENV["BUNDLE_SPEC_RUN"]
           # avoid stepping above the tmp directory when testing
-          return nil if File.file?(File.join(current, "bundler.gemspec"))
+          gemspec = if ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]
+            # for Ruby Core
+            "lib/bundler.gemspec"
+          else
+            "bundler.gemspec"
+          end
+
+          # avoid stepping above the tmp directory when testing
+          return nil if File.file?(File.join(current, gemspec))
         end
 
         names.each do |name|
@@ -303,10 +311,12 @@ module Bundler
         unless File.exist?(exe_file)
           exe_file = File.expand_path("../../../exe/bundle", __FILE__)
         end
-
         Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
       rescue Gem::GemNotFoundException
-        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", File.expand_path("../../../exe/bundle", __FILE__)
+        exe_file = File.expand_path("../../../exe/bundle", __FILE__)
+        # for Ruby core repository
+        exe_file = File.expand_path("../../../../bin/bundle", __FILE__) unless File.exist?(exe_file)
+        Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
       end
 
       # Set BUNDLE_GEMFILE

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

@@ -1,6 +1,4 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in <%= config[:name] %>.gemspec
 gemspec

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 = "2.0.0.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "2.0.0.pre.2" 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" "October 2018" "" ""
+.TH "BUNDLE\-ADD" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install

data/man/bundle-add.1.txt

@@ -49,4 +49,4 @@ OPTIONS
 
 
 
-				 October 2018			 BUNDLE-ADD(1)
+				 November 2018			 BUNDLE-ADD(1)

data/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 2018" "" ""
+.TH "BUNDLE\-BINSTUBS" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-binstubs\fR \- Install the binstubs of the listed gems

data/man/bundle-binstubs.1.txt

@@ -45,4 +45,4 @@ BUNDLE INSTALL --BINSTUBS
 
 
 
-				 October 2018		    BUNDLE-BINSTUBS(1)
+				 November 2018		    BUNDLE-BINSTUBS(1)

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" "October 2018" "" ""
+.TH "BUNDLE\-CHECK" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems

data/man/bundle-check.1.txt

@@ -30,4 +30,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CHECK(1)
+				 November 2018		       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" "October 2018" "" ""
+.TH "BUNDLE\-CLEAN" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory

data/man/bundle-clean.1.txt

@@ -23,4 +23,4 @@ OPTIONS
 
 
 
-				 October 2018		       BUNDLE-CLEAN(1)
+				 November 2018		       BUNDLE-CLEAN(1)

data/man/bundle-doctor.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-DOCTOR" "1" "October 2018" "" ""
+.TH "BUNDLE\-DOCTOR" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-doctor\fR \- Checks the bundle for common problems

data/man/bundle-doctor.1.txt

@@ -41,4 +41,4 @@ OPTIONS
 
 
 
-				 October 2018		      BUNDLE-DOCTOR(1)
+				 November 2018		      BUNDLE-DOCTOR(1)

data/man/bundle-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-EXEC" "1" "October 2018" "" ""
+.TH "BUNDLE\-EXEC" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-exec\fR \- Execute a command in the context of the bundle

data/man/bundle-exec.1.txt

@@ -175,4 +175,4 @@ RUBYGEMS PLUGINS
 
 
 
-				 October 2018			BUNDLE-EXEC(1)
+				 November 2018			BUNDLE-EXEC(1)

data/man/bundle-gem.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-GEM" "1" "October 2018" "" ""
+.TH "BUNDLE\-GEM" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem

data/man/bundle-gem.1.txt

@@ -88,4 +88,4 @@ SEE ALSO
 
 
 
-				 October 2018			 BUNDLE-GEM(1)
+				 November 2018			 BUNDLE-GEM(1)

data/man/bundle-info.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INFO" "1" "October 2018" "" ""
+.TH "BUNDLE\-INFO" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-info\fR \- Show information for the given gem in your bundle

data/man/bundle-info.1.txt

@@ -18,4 +18,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-INFO(1)
+				 November 2018			BUNDLE-INFO(1)

data/man/bundle-init.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INIT" "1" "October 2018" "" ""
+.TH "BUNDLE\-INIT" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-init\fR \- Generates a Gemfile into the current working directory

data/man/bundle-init.1.txt

@@ -31,4 +31,4 @@ SEE ALSO
 
 
 
-				 October 2018			BUNDLE-INIT(1)
+				 November 2018			BUNDLE-INIT(1)

data/man/bundle-inject.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-INJECT" "1" "October 2018" "" ""
+.TH "BUNDLE\-INJECT" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile

data/man/bundle-inject.1.txt

@@ -29,4 +29,4 @@ DESCRIPTION
 
 
 
-				 October 2018		      BUNDLE-INJECT(1)
+				 November 2018		      BUNDLE-INJECT(1)

data/man/bundle-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LIST" "1" "October 2018" "" ""
+.TH "BUNDLE\-LIST" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-list\fR \- List all the gems in the bundle

data/man/bundle-list.1.txt

@@ -40,4 +40,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-LIST(1)
+				 November 2018			BUNDLE-LIST(1)

data/man/bundle-lock.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-LOCK" "1" "October 2018" "" ""
+.TH "BUNDLE\-LOCK" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-lock\fR \- Creates / Updates a lockfile without installing

data/man/bundle-lock.1.txt

@@ -90,4 +90,4 @@ PATCH LEVEL OPTIONS
 
 
 
-				 October 2018			BUNDLE-LOCK(1)
+				 November 2018			BUNDLE-LOCK(1)

data/man/bundle-open.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OPEN" "1" "October 2018" "" ""
+.TH "BUNDLE\-OPEN" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-open\fR \- Opens the source directory for a gem in your bundle

data/man/bundle-open.1.txt

@@ -26,4 +26,4 @@ DESCRIPTION
 
 
 
-				 October 2018			BUNDLE-OPEN(1)
+				 November 2018			BUNDLE-OPEN(1)

data/man/bundle-outdated.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-OUTDATED" "1" "October 2018" "" ""
+.TH "BUNDLE\-OUTDATED" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-outdated\fR \- List installed gems with newer versions available

data/man/bundle-outdated.1.txt

@@ -128,4 +128,4 @@ FILTERING OUTPUT
 
 
 
-				 October 2018		    BUNDLE-OUTDATED(1)
+				 November 2018		    BUNDLE-OUTDATED(1)

data/man/bundle-package.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PACKAGE" "1" "October 2018" "" ""
+.TH "BUNDLE\-PACKAGE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-package\fR \- Package your needed \fB\.gem\fR files into your application

data/man/bundle-package.1.txt

@@ -76,4 +76,4 @@ REMOTE FETCHING
 
 
 
-				 October 2018		     BUNDLE-PACKAGE(1)
+				 November 2018		     BUNDLE-PACKAGE(1)

data/man/bundle-platform.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PLATFORM" "1" "October 2018" "" ""
+.TH "BUNDLE\-PLATFORM" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-platform\fR \- Displays platform compatibility information

data/man/bundle-platform.1.txt

@@ -54,4 +54,4 @@ OPTIONS
 
 
 
-				 October 2018		    BUNDLE-PLATFORM(1)
+				 November 2018		    BUNDLE-PLATFORM(1)

data/man/bundle-pristine.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-PRISTINE" "1" "October 2018" "" ""
+.TH "BUNDLE\-PRISTINE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-pristine\fR \- Restores installed gems to their pristine condition

data/man/bundle-pristine.1.txt

@@ -41,4 +41,4 @@ DESCRIPTION
 
 
 
-				 October 2018		    BUNDLE-PRISTINE(1)
+				 November 2018		    BUNDLE-PRISTINE(1)

data/man/bundle-remove.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-REMOVE" "1" "October 2018" "" ""
+.TH "BUNDLE\-REMOVE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-remove\fR \- Removes gems from the Gemfile

data/man/bundle-remove.1.txt

@@ -31,4 +31,4 @@ OPTIONS
 
 
 
-				 October 2018		      BUNDLE-REMOVE(1)
+				 November 2018		      BUNDLE-REMOVE(1)

data/man/bundle-show.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-SHOW" "1" "October 2018" "" ""
+.TH "BUNDLE\-SHOW" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem

data/man/bundle-show.1.txt

@@ -24,4 +24,4 @@ OPTIONS
 
 
 
-				 October 2018			BUNDLE-SHOW(1)
+				 November 2018			BUNDLE-SHOW(1)

data/man/bundle-viz.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE\-VIZ" "1" "October 2018" "" ""
+.TH "BUNDLE\-VIZ" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile

data/man/bundle-viz.1.txt

@@ -36,4 +36,4 @@ OPTIONS
 
 
 
-				 October 2018			 BUNDLE-VIZ(1)
+				 November 2018			 BUNDLE-VIZ(1)

data/man/bundle.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "BUNDLE" "1" "October 2018" "" ""
+.TH "BUNDLE" "1" "November 2018" "" ""
 .
 .SH "NAME"
 \fBbundle\fR \- Ruby Dependency Management

data/man/bundle.1.txt

@@ -110,4 +110,4 @@ OBSOLETE
 
 
 
-				 October 2018			     BUNDLE(1)
+				 November 2018			     BUNDLE(1)

data/man/gemfile.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GEMFILE" "5" "October 2018" "" ""
+.TH "GEMFILE" "5" "November 2018" "" ""
 .
 .SH "NAME"
 \fBGemfile\fR \- A format for describing gem dependencies for Ruby programs

data/man/gemfile.5.txt

@@ -650,4 +650,4 @@ SOURCE PRIORITY
 
 
 
-				 October 2018			    GEMFILE(5)
+				 November 2018			    GEMFILE(5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
+  version: 2.0.0.pre.2
 platform: ruby
 authors:
 - André Arko
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -442,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies