Merge remote-tracking branch 'origin/master' into segiddins/bundle-ge…

…m-rubocop-option

* origin/master: (770 commits)
  Fix typos
  Reuse `lockfile` spec helper
  Remove unused filter
  Reuse `gemfile` spec helper
  Cleanup constant only used once
  More specific assertion
  Remove redundant assertion
  Make spec easier to debug
  Don't persist the cache_all_platforms setting
  [Package] Ensure uninstallable gems are _never_ installed
  [Package] Dont always update on --all-platforms
  [Package] Always resolve remotely for --all-platforms
  Add missing mock
  Correct default cache path
  Improve spec to be more realistic
  Clearer MissingRevision git errors
  RUBY_ENGINE should always be defined after 1.8.7
  Not sure how much this buys us, remove it
  Bump rubygems in CI to 3.0.4 and 2.7.10
  Inline `expanded_deps`
  ...

.azure-pipelines/patch_readline.sh

@@ -0,0 +1,3 @@
+ruby_version=$(ruby -e 'puts RUBY_VERSION')
+
+git apply --ignore-space-change --ignore-whitespace '.azure-pipelines\rbreadline.diff' --directory="C:/hostedtoolcache/windows/Ruby/$ruby_version/x64/lib/ruby/site_ruby" --unsafe-paths

.azure-pipelines/rbreadline.diff

@@ -0,0 +1,41 @@
+diff --git a/rbreadline.rb b/rbreadline.rb
+index c710961..e35408c 100644
+--- a/rbreadline.rb
++++ b/rbreadline.rb
+@@ -16,6 +16,7 @@ end
+
+ module RbReadline
+   require 'etc'
++  require 'io/console'
+
+   RL_LIBRARY_VERSION = "5.2"
+   RL_READLINE_VERSION  = 0x0502
+@@ -1092,6 +1093,9 @@ module RbReadline
+   @current_readline_init_include_level = 0
+   @current_readline_init_lineno = 0
+
++  # Used in windows 
++  @is_pipe = false
++
+   ENV["HOME"] ||= "#{ENV["HOMEDRIVE"]}#{ENV["HOMEPATH"]}"
+   if !File.directory? ENV["HOME"]
+     raise RuntimeError.new("HOME environment variable (or HOMEDRIVE and HOMEPATH) must be set and point to a directory")
+@@ -4490,6 +4494,10 @@ module RbReadline
+     end
+
+     def rl_getc(stream)
++	  # below added as test for whether we're connected to a pipe or a keyboard.
++      # Pipe connection is probably running under a test suite.
++      return (stream.getc || EOF rescue EOF) if @is_pipe
++
+       while (@kbhit.Call == 0)
+         # If there is no input, yield the processor for other threads
+         sleep(@_keyboard_input_timeout)
+@@ -4740,6 +4748,7 @@ module RbReadline
+   def readline_internal_charloop()
+     lastc = -1
+     eof_found = false
++	@is_pipe = (!@rl_outstream.winsize rescue true)
+
+     while (!@rl_done)
+       lk = @_rl_last_command_was_kill

.azure-pipelines/steps.yml

@@ -0,0 +1,39 @@
+steps:
+
+- task: UseRubyVersion@0
+  inputs:
+    versionSpec: '= 2.4'
+
+- script: |
+    ruby -v
+    ridk version
+  displayName: 'ruby -v + ridk version'
+
+- script: |
+    mkdir tmp
+    cd tmp
+    mkdir home
+  displayName: 'work around readline crash (for https://github.com/bundler/bundler/issues/6902)'
+
+- script: |
+    bash .azure-pipelines\patch_readline.sh
+  displayName: 'patch local readline implementation (for https://github.com/bundler/bundler/issues/6907)'
+
+- script: |
+    ruby bin/rake spec:deps
+  displayName: 'ruby bin/rake spec:deps'
+
+- script: |
+    gem install --no-document --conservative rspec_junit_formatter
+  displayName: 'gem install rspec_junit_formatter'
+
+- script: |
+    ruby -r rspec_junit_formatter bin/rspec --format progress --format RspecJunitFormatter -o rspec/bundler-junit-results.xml || exit 0
+  displayName: 'ruby bin/rspec'
+
+- task: PublishTestResults@2
+  inputs:
+    testRunner: JUnit
+    testResultsFiles: rspec/bundler-junit-results.xml
+  displayName: Publish test results
+  condition: succeededOrFailed()

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://rubytogether.org

.github/bors.toml

@@ -2,7 +2,8 @@ status = [
   "continuous-integration/travis-ci/push"
 ]
 
-timeout-sec = 14400
+timeout_sec = 14400
+delete_merged_branches = true
 
 [committer]
 name = "Bundlerbot"

.github/config.yml

@@ -0,0 +1,9 @@
+newPRWelcomeComment: |
+  Thanks for opening a pull request and helping make Bundler better! Someone from the Bundler team will take a look at your pull request shortly and leave any feedback. Please make sure that your pull request has tests for any changes or added functionality.
+
+  We use Travis CI to test and make sure your change works functionally and uses acceptable conventions, you can review the current progress of Travis CI in the PR status window below.
+
+  If you have any questions or concerns that you wish to ask, feel free to leave a comment in this PR or join our #bundler channel on [Slack](http://slack.bundler.io/).
+
+  For more information about contributing to the Bundler project feel free to review our [CONTRIBUTING](https://github.com/bundler/bundler/blob/master/doc/contributing/README.md) guide
+

.rspec

@@ -2,3 +2,4 @@
 --color
 --warnings
 --require spec_helper
+--order random