Skip to content

Commit 533881f

Browse files
hsbtdeivid-rodriguez
authored andcommitted
Merge pull request #7433 from rubygems/reorganize-vendored-lib
Reorganize vendored libraries (cherry picked from commit 25fc469)
1 parent 06653e0 commit 533881f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+127
-125
lines changed

Manifest.txt

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -431,37 +431,9 @@ lib/rubygems/installer.rb
431431
lib/rubygems/installer_uninstaller_utils.rb
432432
lib/rubygems/local_remote_options.rb
433433
lib/rubygems/name_tuple.rb
434-
lib/rubygems/net-http/.document
435-
lib/rubygems/net-http/LICENSE.txt
436-
lib/rubygems/net-http/lib/net/http.rb
437-
lib/rubygems/net-http/lib/net/http/backward.rb
438-
lib/rubygems/net-http/lib/net/http/exceptions.rb
439-
lib/rubygems/net-http/lib/net/http/generic_request.rb
440-
lib/rubygems/net-http/lib/net/http/header.rb
441-
lib/rubygems/net-http/lib/net/http/proxy_delta.rb
442-
lib/rubygems/net-http/lib/net/http/request.rb
443-
lib/rubygems/net-http/lib/net/http/requests.rb
444-
lib/rubygems/net-http/lib/net/http/response.rb
445-
lib/rubygems/net-http/lib/net/http/responses.rb
446-
lib/rubygems/net-http/lib/net/http/status.rb
447-
lib/rubygems/net-http/lib/net/https.rb
448-
lib/rubygems/net-protocol/.document
449-
lib/rubygems/net-protocol/LICENSE.txt
450-
lib/rubygems/net-protocol/lib/net/protocol.rb
451434
lib/rubygems/net/http.rb
452435
lib/rubygems/openssl.rb
453436
lib/rubygems/optparse.rb
454-
lib/rubygems/optparse/.document
455-
lib/rubygems/optparse/COPYING
456-
lib/rubygems/optparse/lib/optionparser.rb
457-
lib/rubygems/optparse/lib/optparse.rb
458-
lib/rubygems/optparse/lib/optparse/ac.rb
459-
lib/rubygems/optparse/lib/optparse/date.rb
460-
lib/rubygems/optparse/lib/optparse/kwargs.rb
461-
lib/rubygems/optparse/lib/optparse/shellwords.rb
462-
lib/rubygems/optparse/lib/optparse/time.rb
463-
lib/rubygems/optparse/lib/optparse/uri.rb
464-
lib/rubygems/optparse/lib/optparse/version.rb
465437
lib/rubygems/package.rb
466438
lib/rubygems/package/digest_io.rb
467439
lib/rubygems/package/file_source.rb
@@ -489,9 +461,6 @@ lib/rubygems/request_set/lockfile.rb
489461
lib/rubygems/request_set/lockfile/parser.rb
490462
lib/rubygems/request_set/lockfile/tokenizer.rb
491463
lib/rubygems/requirement.rb
492-
lib/rubygems/resolv/.document
493-
lib/rubygems/resolv/LICENSE.txt
494-
lib/rubygems/resolv/lib/resolv.rb
495464
lib/rubygems/resolver.rb
496465
lib/rubygems/resolver/activation_request.rb
497466
lib/rubygems/resolver/api_set.rb
@@ -512,28 +481,6 @@ lib/rubygems/resolver/local_specification.rb
512481
lib/rubygems/resolver/lock_set.rb
513482
lib/rubygems/resolver/lock_specification.rb
514483
lib/rubygems/resolver/molinillo.rb
515-
lib/rubygems/resolver/molinillo/.document
516-
lib/rubygems/resolver/molinillo/LICENSE
517-
lib/rubygems/resolver/molinillo/lib/molinillo.rb
518-
lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
519-
lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
520-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
521-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
522-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
523-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
524-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
525-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
526-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
527-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
528-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
529-
lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
530-
lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb
531-
lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
532-
lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
533-
lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
534-
lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
535-
lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
536-
lib/rubygems/resolver/molinillo/lib/molinillo/state.rb
537484
lib/rubygems/resolver/requirement_list.rb
538485
lib/rubygems/resolver/set.rb
539486
lib/rubygems/resolver/source_set.rb
@@ -574,13 +521,7 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
574521
lib/rubygems/stub_specification.rb
575522
lib/rubygems/text.rb
576523
lib/rubygems/timeout.rb
577-
lib/rubygems/timeout/.document
578-
lib/rubygems/timeout/LICENSE.txt
579-
lib/rubygems/timeout/lib/timeout.rb
580524
lib/rubygems/tsort.rb
581-
lib/rubygems/tsort/.document
582-
lib/rubygems/tsort/LICENSE.txt
583-
lib/rubygems/tsort/lib/tsort.rb
584525
lib/rubygems/uninstaller.rb
585526
lib/rubygems/unknown_command_spell_checker.rb
586527
lib/rubygems/update_suggestion.rb
@@ -591,6 +532,65 @@ lib/rubygems/util.rb
591532
lib/rubygems/util/licenses.rb
592533
lib/rubygems/util/list.rb
593534
lib/rubygems/validator.rb
535+
lib/rubygems/vendor/molinillo/.document
536+
lib/rubygems/vendor/molinillo/LICENSE
537+
lib/rubygems/vendor/molinillo/lib/molinillo.rb
538+
lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
539+
lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
540+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
541+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
542+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
543+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
544+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
545+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
546+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
547+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
548+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
549+
lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
550+
lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb
551+
lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb
552+
lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
553+
lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb
554+
lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
555+
lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
556+
lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
557+
lib/rubygems/vendor/net-http/.document
558+
lib/rubygems/vendor/net-http/LICENSE.txt
559+
lib/rubygems/vendor/net-http/lib/net/http.rb
560+
lib/rubygems/vendor/net-http/lib/net/http/backward.rb
561+
lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
562+
lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
563+
lib/rubygems/vendor/net-http/lib/net/http/header.rb
564+
lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb
565+
lib/rubygems/vendor/net-http/lib/net/http/request.rb
566+
lib/rubygems/vendor/net-http/lib/net/http/requests.rb
567+
lib/rubygems/vendor/net-http/lib/net/http/response.rb
568+
lib/rubygems/vendor/net-http/lib/net/http/responses.rb
569+
lib/rubygems/vendor/net-http/lib/net/http/status.rb
570+
lib/rubygems/vendor/net-http/lib/net/https.rb
571+
lib/rubygems/vendor/net-protocol/.document
572+
lib/rubygems/vendor/net-protocol/LICENSE.txt
573+
lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
574+
lib/rubygems/vendor/optparse/.document
575+
lib/rubygems/vendor/optparse/COPYING
576+
lib/rubygems/vendor/optparse/lib/optionparser.rb
577+
lib/rubygems/vendor/optparse/lib/optparse.rb
578+
lib/rubygems/vendor/optparse/lib/optparse/ac.rb
579+
lib/rubygems/vendor/optparse/lib/optparse/date.rb
580+
lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
581+
lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
582+
lib/rubygems/vendor/optparse/lib/optparse/time.rb
583+
lib/rubygems/vendor/optparse/lib/optparse/uri.rb
584+
lib/rubygems/vendor/optparse/lib/optparse/version.rb
585+
lib/rubygems/vendor/resolv/.document
586+
lib/rubygems/vendor/resolv/LICENSE.txt
587+
lib/rubygems/vendor/resolv/lib/resolv.rb
588+
lib/rubygems/vendor/timeout/.document
589+
lib/rubygems/vendor/timeout/LICENSE.txt
590+
lib/rubygems/vendor/timeout/lib/timeout.rb
591+
lib/rubygems/vendor/tsort/.document
592+
lib/rubygems/vendor/tsort/LICENSE.txt
593+
lib/rubygems/vendor/tsort/lib/tsort.rb
594594
lib/rubygems/vendor/uri/.document
595595
lib/rubygems/vendor/uri/LICENSE.txt
596596
lib/rubygems/vendor/uri/lib/uri.rb

lib/rubygems/net/http.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
require_relative "../net-http/lib/net/http"
3+
require_relative "../vendor/net-http/lib/net/http"

lib/rubygems/optparse.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
require_relative "optparse/lib/optparse"
3+
require_relative "vendor/optparse/lib/optparse"

lib/rubygems/resolver/molinillo.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
require_relative "molinillo/lib/molinillo"
3+
require_relative "../vendor/molinillo/lib/molinillo"

lib/rubygems/timeout.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
require_relative "timeout/lib/timeout"
3+
require_relative "vendor/timeout/lib/timeout"

lib/rubygems/tsort.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# frozen_string_literal: true
22

3-
require_relative "tsort/lib/tsort"
3+
require_relative "vendor/tsort/lib/tsort"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)