From ca7f7c0f516512c7e5b19aa74e05939b27bb37e4 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 15 Dec 2023 17:40:34 +0800 Subject: [rubygems/rubygems] Refactor vendoring to allow validating vendoring is reproducible Helps ensure that unsuspecting diffs to the vendored code arent accidentally introduced https://github.com/rubygems/rubygems/commit/7c425d49dd --- lib/bundler/vendor/connection_pool/.document | 1 + lib/bundler/vendor/fileutils/.document | 1 + lib/bundler/vendor/net-http-persistent/.document | 1 + .../net-http-persistent/lib/net/http/persistent.rb | 2 +- lib/bundler/vendor/pub_grub/.document | 1 + lib/bundler/vendor/thor/.document | 1 + lib/bundler/vendor/uri/.document | 1 + lib/rubygems/net-http/.document | 1 + lib/rubygems/net-protocol/.document | 1 + lib/rubygems/resolv/.document | 1 + lib/rubygems/resolver/molinillo/.document | 1 + lib/rubygems/timeout/.document | 1 + tool/bundler/vendor_gems.rb | 15 +++++ tool/bundler/vendor_gems.rb.lock | 71 ++++++++++++++++++++++ 14 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 lib/bundler/vendor/connection_pool/.document create mode 100644 lib/bundler/vendor/fileutils/.document create mode 100644 lib/bundler/vendor/net-http-persistent/.document create mode 100644 lib/bundler/vendor/pub_grub/.document create mode 100644 lib/bundler/vendor/thor/.document create mode 100644 lib/bundler/vendor/uri/.document create mode 100644 lib/rubygems/net-http/.document create mode 100644 lib/rubygems/net-protocol/.document create mode 100644 lib/rubygems/resolv/.document create mode 100644 lib/rubygems/resolver/molinillo/.document create mode 100644 lib/rubygems/timeout/.document create mode 100644 tool/bundler/vendor_gems.rb create mode 100644 tool/bundler/vendor_gems.rb.lock diff --git a/lib/bundler/vendor/connection_pool/.document b/lib/bundler/vendor/connection_pool/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/connection_pool/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/bundler/vendor/fileutils/.document b/lib/bundler/vendor/fileutils/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/fileutils/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/bundler/vendor/net-http-persistent/.document b/lib/bundler/vendor/net-http-persistent/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/net-http-persistent/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb index 546409d03e..c702bebc39 100644 --- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb @@ -20,7 +20,7 @@ autoload :OpenSSL, 'openssl' # # Example: # -# require 'bundler/vendor/net-http/lib/net/http/persistent' +# require 'bundler/vendor/net-http-persistent/lib/net/http/persistent' # # uri = Bundler::URI 'http://example.com/awesome/web/service' # diff --git a/lib/bundler/vendor/pub_grub/.document b/lib/bundler/vendor/pub_grub/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/pub_grub/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/bundler/vendor/thor/.document b/lib/bundler/vendor/thor/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/thor/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/bundler/vendor/uri/.document b/lib/bundler/vendor/uri/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/bundler/vendor/uri/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/rubygems/net-http/.document b/lib/rubygems/net-http/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/rubygems/net-http/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/rubygems/net-protocol/.document b/lib/rubygems/net-protocol/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/rubygems/net-protocol/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/rubygems/resolv/.document b/lib/rubygems/resolv/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/rubygems/resolv/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/rubygems/resolver/molinillo/.document b/lib/rubygems/resolver/molinillo/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/rubygems/resolver/molinillo/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/lib/rubygems/timeout/.document b/lib/rubygems/timeout/.document new file mode 100644 index 0000000000..0c43bbd6b3 --- /dev/null +++ b/lib/rubygems/timeout/.document @@ -0,0 +1 @@ +# Vendored files do not need to be documented diff --git a/tool/bundler/vendor_gems.rb b/tool/bundler/vendor_gems.rb new file mode 100644 index 0000000000..2500e6c800 --- /dev/null +++ b/tool/bundler/vendor_gems.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "fileutils", "1.7.2" +gem "molinillo", github: "cocoapods/molinillo" +gem "net-http", "0.4.0" +gem "net-http-persistent", "4.0.2" +gem "net-protocol", "0.2.2" +gem "optparse", "0.4.0" +gem "pub_grub", github: "jhawthorn/pub_grub" +gem "resolv", "0.3.0" +gem "timeout", "0.4.1" +gem "thor", "1.3.0" +gem "tsort", "0.2.0" diff --git a/tool/bundler/vendor_gems.rb.lock b/tool/bundler/vendor_gems.rb.lock new file mode 100644 index 0000000000..ad3602c984 --- /dev/null +++ b/tool/bundler/vendor_gems.rb.lock @@ -0,0 +1,71 @@ +GIT + remote: https://github.com/cocoapods/molinillo.git + revision: 6bc3d6045edadf800ba1b634fef15d3574369e60 + specs: + molinillo (0.8.0) + +GIT + remote: https://github.com/jhawthorn/pub_grub.git + revision: 4250c533895080c356407d1f49619cb90fa2562d + specs: + pub_grub (0.5.0) + +GEM + remote: https://rubygems.org/ + specs: + connection_pool (2.4.1) + fileutils (1.7.2) + net-http (0.4.0) + uri + net-http-persistent (4.0.2) + connection_pool (~> 2.2) + net-protocol (0.2.2) + timeout + optparse (0.4.0) + resolv (0.3.0) + thor (1.3.0) + timeout (0.4.1) + tsort (0.2.0) + uri (0.13.0) + +PLATFORMS + java + ruby + universal-java-11 + universal-java-18 + universal-java-19 + x64-mingw-ucrt + x64-mingw32 + x86_64-darwin-20 + x86_64-linux + +DEPENDENCIES + fileutils (= 1.7.2) + molinillo! + net-http (= 0.4.0) + net-http-persistent (= 4.0.2) + net-protocol (= 0.2.2) + optparse (= 0.4.0) + pub_grub! + resolv (= 0.3.0) + thor (= 1.3.0) + timeout (= 0.4.1) + tsort (= 0.2.0) + +CHECKSUMS + connection_pool (2.4.1) sha256=0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4 + fileutils (1.7.2) sha256=36a0fb324218263e52b486ad7408e9a295378fe8edc9fd343709e523c0980631 + molinillo (0.8.0) + net-http (0.4.0) sha256=d87a6163ce3c64008bc8764e210d5f4ec9b87ca558a9052eb390b2c2c277f157 + net-http-persistent (4.0.2) sha256=03f827a33857b1d56b4e796957ad19bf5b58367d853fd0a224eb70fba8d02a44 + net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8 + optparse (0.4.0) sha256=f584afc034f610ea7b28a9b1a68b0917d34e0da73c40c2b29cd7151c5eb0bade + pub_grub (0.5.0) + resolv (0.3.0) sha256=14b917f1bb4f363c81601295b68097bf1ff8b3c4179972c2d174ffb7e997a406 + thor (1.3.0) sha256=1adc7f9e5b3655a68c71393fee8bd0ad088d14ee8e83a0b73726f23cbb3ca7c3 + timeout (0.4.1) sha256=6f1f4edd4bca28cffa59501733a94215407c6960bd2107331f0280d4abdebb9a + tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f + uri (0.13.0) sha256=26553c2a9399762e1e8bebd4444b4361c4b21298cf1c864b22eeabc9c4998f24 + +BUNDLED WITH + 2.5.0.dev -- cgit v1.2.3