bundler 2.1.4 → 2.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2468 -1430
- data/README.md +8 -10
- data/bundler.gemspec +10 -13
- data/exe/bundle +7 -8
- data/exe/bundler +1 -1
- data/lib/bundler/.document +1 -0
- data/lib/bundler/build_metadata.rb +3 -11
- data/lib/bundler/cli/add.rb +2 -2
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +3 -8
- data/lib/bundler/cli/check.rb +5 -3
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +32 -3
- data/lib/bundler/cli/config.rb +10 -1
- data/lib/bundler/cli/console.rb +3 -3
- data/lib/bundler/cli/doctor.rb +23 -6
- data/lib/bundler/cli/exec.rb +5 -10
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +258 -45
- data/lib/bundler/cli/info.rb +38 -6
- data/lib/bundler/cli/init.rb +7 -3
- data/lib/bundler/cli/inject.rb +1 -1
- data/lib/bundler/cli/install.rb +27 -57
- data/lib/bundler/cli/issue.rb +5 -4
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +11 -4
- data/lib/bundler/cli/open.rb +1 -2
- data/lib/bundler/cli/outdated.rb +106 -79
- data/lib/bundler/cli/platform.rb +2 -2
- data/lib/bundler/cli/plugin.rb +10 -0
- data/lib/bundler/cli/pristine.rb +5 -0
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +2 -2
- data/lib/bundler/cli/update.rb +20 -9
- data/lib/bundler/cli/viz.rb +1 -1
- data/lib/bundler/cli.rb +149 -85
- data/lib/bundler/compact_index_client/cache.rb +7 -24
- data/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/lib/bundler/compact_index_client/updater.rb +56 -51
- data/lib/bundler/compact_index_client.rb +3 -9
- data/lib/bundler/constants.rb +1 -1
- data/lib/bundler/current_ruby.rb +17 -6
- data/lib/bundler/definition.rb +343 -440
- data/lib/bundler/dependency.rb +23 -77
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +77 -85
- data/lib/bundler/endpoint_specification.rb +20 -14
- data/lib/bundler/env.rb +3 -3
- data/lib/bundler/environment_preserver.rb +30 -2
- data/lib/bundler/errors.rb +31 -14
- data/lib/bundler/feature_flag.rb +0 -9
- data/lib/bundler/fetcher/base.rb +7 -9
- data/lib/bundler/fetcher/compact_index.rb +20 -27
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +11 -11
- data/lib/bundler/fetcher/index.rb +2 -30
- data/lib/bundler/fetcher.rb +24 -29
- data/lib/bundler/force_platform.rb +18 -0
- data/lib/bundler/friendly_errors.rb +45 -49
- data/lib/bundler/gem_helper.rb +53 -31
- data/lib/bundler/gem_helpers.rb +42 -24
- data/lib/bundler/gem_version_promoter.rb +54 -99
- data/lib/bundler/graph.rb +4 -4
- data/lib/bundler/index.rb +14 -52
- data/lib/bundler/injector.rb +40 -8
- data/lib/bundler/inline.rb +6 -15
- data/lib/bundler/installer/gem_installer.rb +19 -24
- data/lib/bundler/installer/parallel_installer.rb +32 -42
- data/lib/bundler/installer/standalone.rb +58 -11
- data/lib/bundler/installer.rb +47 -87
- data/lib/bundler/lazy_specification.rb +76 -35
- data/lib/bundler/lockfile_generator.rb +3 -3
- data/lib/bundler/lockfile_parser.rb +24 -49
- data/lib/bundler/man/.document +1 -0
- data/{man → lib/bundler/man}/bundle-add.1 +21 -5
- data/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +16 -4
- data/{man → lib/bundler/man}/bundle-binstubs.1 +5 -3
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +2 -4
- data/{man → lib/bundler/man}/bundle-cache.1 +7 -1
- data/{man/bundle-cache.ronn → lib/bundler/man/bundle-cache.1.ronn} +7 -0
- data/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/{man → lib/bundler/man}/bundle-clean.1 +2 -2
- data/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-config.1 +65 -47
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +74 -65
- data/lib/bundler/man/bundle-console.1 +53 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/{man → lib/bundler/man}/bundle-exec.1 +2 -2
- data/{man/bundle-exec.ronn → lib/bundler/man/bundle-exec.1.ronn} +1 -1
- data/lib/bundler/man/bundle-gem.1 +105 -0
- data/lib/bundler/man/bundle-gem.1.ronn +117 -0
- data/lib/bundler/man/bundle-help.1 +13 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/{man → lib/bundler/man}/bundle-init.1 +1 -1
- data/{man → lib/bundler/man}/bundle-inject.1 +5 -2
- data/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +3 -1
- data/{man → lib/bundler/man}/bundle-install.1 +35 -33
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +33 -34
- data/{man → lib/bundler/man}/bundle-list.1 +7 -7
- data/{man/bundle-list.ronn → lib/bundler/man/bundle-list.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/{man → lib/bundler/man}/bundle-outdated.1 +3 -10
- data/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +1 -10
- data/{man → lib/bundler/man}/bundle-platform.1 +16 -6
- data/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +14 -7
- data/lib/bundler/man/bundle-plugin.1 +81 -0
- data/lib/bundler/man/bundle-plugin.1.ronn +59 -0
- data/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/{man → lib/bundler/man}/bundle-update.1 +5 -5
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +5 -4
- data/lib/bundler/man/bundle-version.1 +35 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/{man → lib/bundler/man}/bundle-viz.1 +4 -1
- data/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +2 -0
- data/{man → lib/bundler/man}/bundle.1 +15 -10
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +12 -7
- data/{man → lib/bundler/man}/gemfile.5 +120 -83
- data/{man → lib/bundler/man}/gemfile.5.ronn +109 -88
- data/{man → lib/bundler/man}/index.txt +4 -0
- data/lib/bundler/match_metadata.rb +13 -0
- data/lib/bundler/match_platform.rb +0 -1
- data/lib/bundler/match_remote_metadata.rb +29 -0
- data/lib/bundler/mirror.rb +7 -9
- data/lib/bundler/plugin/api/source.rb +25 -9
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/index.rb +17 -5
- data/lib/bundler/plugin/installer/git.rb +0 -4
- data/lib/bundler/plugin/installer/rubygems.rb +1 -9
- data/lib/bundler/plugin/installer.rb +11 -11
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +58 -11
- data/lib/bundler/process_lock.rb +1 -1
- data/lib/bundler/remote_specification.rb +15 -6
- data/lib/bundler/resolver/base.rb +46 -0
- data/lib/bundler/resolver/candidate.rb +92 -0
- data/lib/bundler/resolver/incompatibility.rb +15 -0
- data/lib/bundler/resolver/package.rb +63 -0
- data/lib/bundler/resolver/root.rb +25 -0
- data/lib/bundler/resolver/spec_group.rb +49 -74
- data/lib/bundler/resolver.rb +320 -344
- data/lib/bundler/retry.rb +2 -2
- data/lib/bundler/ruby_dsl.rb +1 -1
- data/lib/bundler/ruby_version.rb +6 -19
- data/lib/bundler/rubygems_ext.rb +231 -32
- data/lib/bundler/rubygems_gem_installer.rb +89 -16
- data/lib/bundler/rubygems_integration.rb +72 -162
- data/lib/bundler/runtime.rb +23 -31
- data/lib/bundler/self_manager.rb +168 -0
- data/lib/bundler/settings.rb +145 -72
- data/lib/bundler/setup.rb +2 -2
- data/lib/bundler/shared_helpers.rb +19 -34
- data/lib/bundler/similarity_detector.rb +1 -1
- data/lib/bundler/source/git/git_proxy.rb +244 -114
- data/lib/bundler/source/git.rb +62 -46
- data/lib/bundler/source/metadata.rb +3 -8
- data/lib/bundler/source/path/installer.rb +11 -32
- data/lib/bundler/source/path.rb +15 -9
- data/lib/bundler/source/rubygems/remote.rb +1 -1
- data/lib/bundler/source/rubygems.rb +167 -199
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +25 -5
- data/lib/bundler/source_list.rb +112 -64
- data/lib/bundler/source_map.rb +71 -0
- data/lib/bundler/spec_set.rb +64 -61
- data/lib/bundler/stub_specification.rb +30 -10
- data/lib/bundler/templates/Executable +3 -5
- data/lib/bundler/templates/Executable.bundler +10 -15
- data/lib/bundler/templates/Executable.standalone +4 -4
- data/lib/bundler/templates/Gemfile +0 -2
- data/lib/bundler/templates/gems.rb +0 -3
- data/lib/bundler/templates/newgem/CHANGELOG.md.tt +5 -0
- data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt +57 -47
- data/lib/bundler/templates/newgem/Cargo.toml.tt +7 -0
- data/lib/bundler/templates/newgem/Gemfile.tt +15 -1
- data/lib/bundler/templates/newgem/README.md.tt +13 -16
- data/lib/bundler/templates/newgem/Rakefile.tt +33 -5
- data/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +25 -0
- data/lib/bundler/templates/newgem/ext/newgem/Cargo.toml.tt +15 -0
- data/lib/bundler/templates/newgem/ext/newgem/{extconf.rb.tt → extconf-c.rb.tt} +2 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf-rust.rb.tt +6 -0
- data/lib/bundler/templates/newgem/ext/newgem/src/lib.rs.tt +12 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +37 -0
- data/lib/bundler/templates/newgem/gitignore.tt +3 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +18 -0
- data/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +2 -0
- data/lib/bundler/templates/newgem/lib/newgem.rb.tt +4 -2
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +34 -18
- data/lib/bundler/templates/newgem/rubocop.yml.tt +13 -0
- data/lib/bundler/templates/newgem/sig/newgem.rbs.tt +8 -0
- data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -0
- data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +2 -1
- data/lib/bundler/templates/newgem/standard.yml.tt +3 -0
- data/lib/bundler/templates/newgem/test/{test_helper.rb.tt → minitest/test_helper.rb.tt} +2 -0
- data/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/test_newgem.rb.tt} +3 -1
- data/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt +15 -0
- data/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt +6 -0
- data/lib/bundler/ui/shell.rb +37 -14
- data/lib/bundler/ui/silent.rb +21 -5
- data/lib/bundler/uri_credentials_filter.rb +3 -1
- data/lib/bundler/vendor/.document +1 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +56 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +41 -74
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +1350 -408
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +82 -189
- data/lib/bundler/vendor/pub_grub/LICENSE.txt +21 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/assignment.rb +20 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/basic_package_source.rb +189 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/failure_writer.rb +182 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/incompatibility.rb +151 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/package.rb +43 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/partial_solution.rb +121 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/rubygems.rb +45 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/solve_failure.rb +19 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/static_package_source.rb +53 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/term.rb +105 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version.rb +3 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_constraint.rb +124 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_range.rb +409 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_solver.rb +240 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub/version_union.rb +178 -0
- data/lib/bundler/vendor/pub_grub/lib/pub_grub.rb +31 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +9 -7
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +1 -2
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +7 -3
- data/lib/bundler/vendor/thor/lib/thor/base.rb +9 -0
- data/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +6 -0
- data/lib/bundler/vendor/thor/lib/thor/error.rb +10 -5
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +5 -1
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +28 -9
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +28 -7
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +5 -1
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/util.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +5 -13
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +452 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +76 -91
- data/lib/bundler/vendor/uri/lib/uri/file.rb +7 -1
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +32 -13
- data/lib/bundler/vendor/uri/lib/uri/http.rb +40 -3
- data/lib/bundler/vendor/uri/lib/uri/https.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +2 -2
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +2 -1
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +2 -3
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +14 -21
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +11 -17
- data/lib/bundler/vendor/uri/lib/uri/version.rb +1 -1
- data/lib/bundler/vendor/uri/lib/uri/ws.rb +83 -0
- data/lib/bundler/vendor/uri/lib/uri/wss.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +3 -3
- data/lib/bundler/vendored_persistent.rb +1 -40
- data/lib/bundler/{vendored_molinillo.rb → vendored_pub_grub.rb} +1 -1
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/version.rb +5 -1
- data/lib/bundler/worker.rb +25 -12
- data/lib/bundler/yaml_serializer.rb +1 -1
- data/lib/bundler.rb +95 -108
- metadata +132 -118
- data/lib/bundler/dep_proxy.rb +0 -48
- data/lib/bundler/gemdeps.rb +0 -29
- data/lib/bundler/psyched_yaml.rb +0 -37
- data/lib/bundler/templates/newgem/travis.yml.tt +0 -6
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +0 -57
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +0 -81
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +0 -66
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +0 -62
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +0 -63
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +0 -61
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +0 -126
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +0 -36
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +0 -158
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +0 -223
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +0 -143
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +0 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +0 -101
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +0 -67
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +0 -837
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +0 -46
- data/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +0 -58
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +0 -12
- data/lib/bundler/version_ranges.rb +0 -122
- data/man/bundle-add.1.txt +0 -58
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-cache.1.txt +0 -78
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -528
- data/man/bundle-doctor.1.txt +0 -44
- data/man/bundle-exec.1.txt +0 -178
- data/man/bundle-gem.1 +0 -80
- data/man/bundle-gem.1.txt +0 -91
- data/man/bundle-gem.ronn +0 -78
- data/man/bundle-info.1.txt +0 -21
- data/man/bundle-init.1.txt +0 -34
- data/man/bundle-inject.1.txt +0 -32
- data/man/bundle-install.1.txt +0 -401
- data/man/bundle-list.1.txt +0 -43
- data/man/bundle-lock.1.txt +0 -93
- data/man/bundle-open.1.txt +0 -29
- data/man/bundle-outdated.1.txt +0 -131
- data/man/bundle-platform.1.txt +0 -57
- data/man/bundle-pristine.1.txt +0 -44
- data/man/bundle-remove.1.txt +0 -34
- data/man/bundle-show.1.txt +0 -27
- data/man/bundle-update.1.txt +0 -390
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -116
- data/man/gemfile.5.txt +0 -649
- /data/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- /data/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- /data/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- /data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +0 -0
- /data/{man/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- /data/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- /data/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- /data/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- /data/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
@@ -4,7 +4,19 @@ require_relative "vendored_thor"
|
|
4
4
|
|
5
5
|
module Bundler
|
6
6
|
module FriendlyErrors
|
7
|
-
|
7
|
+
module_function
|
8
|
+
|
9
|
+
def enable!
|
10
|
+
@disabled = false
|
11
|
+
end
|
12
|
+
|
13
|
+
def disabled?
|
14
|
+
@disabled
|
15
|
+
end
|
16
|
+
|
17
|
+
def disable!
|
18
|
+
@disabled = true
|
19
|
+
end
|
8
20
|
|
9
21
|
def log_error(error)
|
10
22
|
case error
|
@@ -17,19 +29,13 @@ module Bundler
|
|
17
29
|
Bundler.ui.error error.message
|
18
30
|
Bundler.ui.trace error.orig_exception
|
19
31
|
when BundlerError
|
20
|
-
Bundler.ui.
|
21
|
-
|
32
|
+
if Bundler.ui.debug?
|
33
|
+
Bundler.ui.trace error
|
34
|
+
else
|
35
|
+
Bundler.ui.error error.message, :wrap => true
|
36
|
+
end
|
22
37
|
when Thor::Error
|
23
38
|
Bundler.ui.error error.message
|
24
|
-
when LoadError
|
25
|
-
raise error unless error.message =~ /cannot load such file -- openssl|openssl.so|libcrypto.so/
|
26
|
-
Bundler.ui.error "\nCould not load OpenSSL."
|
27
|
-
Bundler.ui.warn <<-WARN, :wrap => true
|
28
|
-
You must recompile Ruby with OpenSSL support or change the sources in your \
|
29
|
-
Gemfile from 'https' to 'http'. Instructions for compiling with OpenSSL \
|
30
|
-
using RVM are available at https://rvm.io/packages/openssl.
|
31
|
-
WARN
|
32
|
-
Bundler.ui.trace error
|
33
39
|
when Interrupt
|
34
40
|
Bundler.ui.error "\nQuitting..."
|
35
41
|
Bundler.ui.trace error
|
@@ -43,8 +49,6 @@ module Bundler
|
|
43
49
|
"Alternatively, you can increase the amount of memory the JVM is able to use by running Bundler with jruby -J-Xmx1024m -S bundle (JRuby defaults to 500MB)."
|
44
50
|
else request_issue_report_for(error)
|
45
51
|
end
|
46
|
-
rescue StandardError
|
47
|
-
raise error
|
48
52
|
end
|
49
53
|
|
50
54
|
def exit_status(error)
|
@@ -57,40 +61,11 @@ module Bundler
|
|
57
61
|
end
|
58
62
|
|
59
63
|
def request_issue_report_for(e)
|
60
|
-
Bundler.ui.
|
64
|
+
Bundler.ui.error <<-EOS.gsub(/^ {8}/, ""), nil, nil
|
61
65
|
--- ERROR REPORT TEMPLATE -------------------------------------------------------
|
62
|
-
# Error Report
|
63
|
-
|
64
|
-
## Questions
|
65
|
-
|
66
|
-
Please fill out answers to these questions, it'll help us figure out
|
67
|
-
why things are going wrong.
|
68
|
-
|
69
|
-
- **What did you do?**
|
70
|
-
|
71
|
-
I ran the command `#{$PROGRAM_NAME} #{ARGV.join(" ")}`
|
72
|
-
|
73
|
-
- **What did you expect to happen?**
|
74
|
-
|
75
|
-
I expected Bundler to...
|
76
|
-
|
77
|
-
- **What happened instead?**
|
78
|
-
|
79
|
-
Instead, what happened was...
|
80
|
-
|
81
|
-
- **Have you tried any solutions posted on similar issues in our issue tracker, stack overflow, or google?**
|
82
|
-
|
83
|
-
I tried...
|
84
|
-
|
85
|
-
- **Have you read our issues document, https://github.com/bundler/bundler/blob/master/doc/contributing/ISSUES.md?**
|
86
|
-
|
87
|
-
...
|
88
|
-
|
89
|
-
## Backtrace
|
90
66
|
|
91
67
|
```
|
92
|
-
#{e
|
93
|
-
#{e.backtrace && e.backtrace.join("\n ").chomp}
|
68
|
+
#{exception_message(e)}
|
94
69
|
```
|
95
70
|
|
96
71
|
#{Bundler::Env.report}
|
@@ -100,13 +75,27 @@ module Bundler
|
|
100
75
|
|
101
76
|
Bundler.ui.error "Unfortunately, an unexpected error occurred, and Bundler cannot continue."
|
102
77
|
|
103
|
-
Bundler.ui.
|
78
|
+
Bundler.ui.error <<-EOS.gsub(/^ {8}/, ""), nil, :yellow
|
104
79
|
|
105
80
|
First, try this link to see if there are any existing issue reports for this error:
|
106
81
|
#{issues_url(e)}
|
107
82
|
|
108
|
-
If there aren't any reports for this error yet, please
|
109
|
-
|
83
|
+
If there aren't any reports for this error yet, please fill in the new issue form located at #{new_issue_url}, and copy and paste the report template above in there.
|
84
|
+
EOS
|
85
|
+
end
|
86
|
+
|
87
|
+
def exception_message(error)
|
88
|
+
message = serialized_exception_for(error)
|
89
|
+
cause = error.cause
|
90
|
+
return message unless cause
|
91
|
+
|
92
|
+
message + serialized_exception_for(cause)
|
93
|
+
end
|
94
|
+
|
95
|
+
def serialized_exception_for(e)
|
96
|
+
<<-EOS.gsub(/^ {8}/, "")
|
97
|
+
#{e.class}: #{e.message}
|
98
|
+
#{e.backtrace && e.backtrace.join("\n ").chomp}
|
110
99
|
EOS
|
111
100
|
end
|
112
101
|
|
@@ -114,16 +103,23 @@ module Bundler
|
|
114
103
|
message = exception.message.lines.first.tr(":", " ").chomp
|
115
104
|
message = message.split("-").first if exception.is_a?(Errno)
|
116
105
|
require "cgi"
|
117
|
-
"https://github.com/
|
106
|
+
"https://github.com/rubygems/rubygems/search?q=" \
|
118
107
|
"#{CGI.escape(message)}&type=Issues"
|
119
108
|
end
|
109
|
+
|
110
|
+
def new_issue_url
|
111
|
+
"https://github.com/rubygems/rubygems/issues/new?labels=Bundler&template=bundler-related-issue.md"
|
112
|
+
end
|
120
113
|
end
|
121
114
|
|
122
115
|
def self.with_friendly_errors
|
116
|
+
FriendlyErrors.enable!
|
123
117
|
yield
|
124
118
|
rescue SignalException
|
125
119
|
raise
|
126
120
|
rescue Exception => e # rubocop:disable Lint/RescueException
|
121
|
+
raise if FriendlyErrors.disabled?
|
122
|
+
|
127
123
|
FriendlyErrors.log_error(e)
|
128
124
|
exit FriendlyErrors.exit_status(e)
|
129
125
|
end
|
data/lib/bundler/gem_helper.rb
CHANGED
@@ -15,6 +15,10 @@ module Bundler
|
|
15
15
|
new(opts[:dir], opts[:name]).install
|
16
16
|
end
|
17
17
|
|
18
|
+
def tag_prefix=(prefix)
|
19
|
+
instance.tag_prefix = prefix
|
20
|
+
end
|
21
|
+
|
18
22
|
def gemspec(&block)
|
19
23
|
gemspec = instance.gemspec
|
20
24
|
block.call(gemspec) if block
|
@@ -24,12 +28,15 @@ module Bundler
|
|
24
28
|
|
25
29
|
attr_reader :spec_path, :base, :gemspec
|
26
30
|
|
31
|
+
attr_writer :tag_prefix
|
32
|
+
|
27
33
|
def initialize(base = nil, name = nil)
|
28
|
-
@base = (base
|
29
|
-
gemspecs = name ? [File.join(base, "#{name}.gemspec")] :
|
34
|
+
@base = File.expand_path(base || SharedHelpers.pwd)
|
35
|
+
gemspecs = name ? [File.join(@base, "#{name}.gemspec")] : Gem::Util.glob_files_in_dir("{,*}.gemspec", @base)
|
30
36
|
raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
|
31
37
|
@spec_path = gemspecs.first
|
32
38
|
@gemspec = Bundler.load_gemspec(@spec_path)
|
39
|
+
@tag_prefix = ""
|
33
40
|
end
|
34
41
|
|
35
42
|
def install
|
@@ -40,6 +47,11 @@ module Bundler
|
|
40
47
|
built_gem_path = build_gem
|
41
48
|
end
|
42
49
|
|
50
|
+
desc "Generate SHA512 checksum if #{name}-#{version}.gem into the checksums directory."
|
51
|
+
task "build:checksum" => "build" do
|
52
|
+
build_checksum(built_gem_path)
|
53
|
+
end
|
54
|
+
|
43
55
|
desc "Build and install #{name}-#{version}.gem into system gems."
|
44
56
|
task "install" => "build" do
|
45
57
|
install_gem(built_gem_path)
|
@@ -64,7 +76,7 @@ module Bundler
|
|
64
76
|
tag_version { git_push(args[:remote]) } unless already_tagged?
|
65
77
|
end
|
66
78
|
|
67
|
-
task "release:rubygem_push" do
|
79
|
+
task "release:rubygem_push" => "build" do
|
68
80
|
rubygem_push(built_gem_path) if gem_push?
|
69
81
|
end
|
70
82
|
|
@@ -73,7 +85,7 @@ module Bundler
|
|
73
85
|
|
74
86
|
def build_gem
|
75
87
|
file_name = nil
|
76
|
-
sh(
|
88
|
+
sh([*gem_command, "build", "-V", spec_path]) do
|
77
89
|
file_name = File.basename(built_gem_path)
|
78
90
|
SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
|
79
91
|
FileUtils.mv(built_gem_path, "pkg")
|
@@ -84,36 +96,54 @@ module Bundler
|
|
84
96
|
|
85
97
|
def install_gem(built_gem_path = nil, local = false)
|
86
98
|
built_gem_path ||= build_gem
|
87
|
-
cmd =
|
88
|
-
cmd
|
89
|
-
|
90
|
-
unless status.success?
|
91
|
-
raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output"
|
92
|
-
end
|
99
|
+
cmd = [*gem_command, "install", built_gem_path.to_s]
|
100
|
+
cmd << "--local" if local
|
101
|
+
sh(cmd)
|
93
102
|
Bundler.ui.confirm "#{name} (#{version}) installed."
|
94
103
|
end
|
95
104
|
|
96
|
-
|
105
|
+
def build_checksum(built_gem_path = nil)
|
106
|
+
built_gem_path ||= build_gem
|
107
|
+
SharedHelpers.filesystem_access(File.join(base, "checksums")) {|p| FileUtils.mkdir_p(p) }
|
108
|
+
file_name = "#{File.basename(built_gem_path)}.sha512"
|
109
|
+
require "digest/sha2"
|
110
|
+
checksum = ::Digest::SHA512.file(built_gem_path).hexdigest
|
111
|
+
target = File.join(base, "checksums", file_name)
|
112
|
+
File.write(target, checksum + "\n")
|
113
|
+
Bundler.ui.confirm "#{name} #{version} checksum written to checksums/#{file_name}."
|
114
|
+
end
|
115
|
+
|
116
|
+
protected
|
97
117
|
|
98
118
|
def rubygem_push(path)
|
99
|
-
cmd =
|
119
|
+
cmd = [*gem_command, "push", path]
|
100
120
|
cmd << "--key" << gem_key if gem_key
|
101
121
|
cmd << "--host" << allowed_push_host if allowed_push_host
|
102
|
-
unless allowed_push_host || Bundler.user_home.join(".gem/credentials").file?
|
103
|
-
raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
|
104
|
-
end
|
105
122
|
sh_with_input(cmd)
|
106
123
|
Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
|
107
124
|
end
|
108
125
|
|
109
126
|
def built_gem_path
|
110
|
-
|
127
|
+
Gem::Util.glob_files_in_dir("#{name}-*.gem", base).sort_by {|f| File.mtime(f) }.last
|
111
128
|
end
|
112
129
|
|
113
|
-
def git_push(remote =
|
114
|
-
|
115
|
-
|
116
|
-
|
130
|
+
def git_push(remote = nil)
|
131
|
+
remote ||= default_remote
|
132
|
+
sh("git push #{remote} refs/heads/#{current_branch}".shellsplit)
|
133
|
+
sh("git push #{remote} refs/tags/#{version_tag}".shellsplit)
|
134
|
+
Bundler.ui.confirm "Pushed git commits and release tag."
|
135
|
+
end
|
136
|
+
|
137
|
+
def default_remote
|
138
|
+
remote_for_branch, status = sh_with_status(%W[git config --get branch.#{current_branch}.remote])
|
139
|
+
return "origin" unless status.success?
|
140
|
+
|
141
|
+
remote_for_branch.strip
|
142
|
+
end
|
143
|
+
|
144
|
+
def current_branch
|
145
|
+
# We can replace this with `git branch --show-current` once we drop support for git < 2.22.0
|
146
|
+
sh(%w[git rev-parse --abbrev-ref HEAD]).gsub(%r{\Aheads/}, "").strip
|
117
147
|
end
|
118
148
|
|
119
149
|
def allowed_push_host
|
@@ -128,13 +158,6 @@ module Bundler
|
|
128
158
|
allowed_push_host || env_rubygems_host || "rubygems.org"
|
129
159
|
end
|
130
160
|
|
131
|
-
def perform_git_push(options = "")
|
132
|
-
cmd = "git push #{options}"
|
133
|
-
out, status = sh_with_status(cmd.shellsplit)
|
134
|
-
return if status.success?
|
135
|
-
raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n"
|
136
|
-
end
|
137
|
-
|
138
161
|
def already_tagged?
|
139
162
|
return false unless sh(%w[git tag]).split(/\n/).include?(version_tag)
|
140
163
|
Bundler.ui.confirm "Tag #{version_tag} has already been created."
|
@@ -168,7 +191,7 @@ module Bundler
|
|
168
191
|
end
|
169
192
|
|
170
193
|
def version_tag
|
171
|
-
"v#{version}"
|
194
|
+
"#{@tag_prefix}v#{version}"
|
172
195
|
end
|
173
196
|
|
174
197
|
def name
|
@@ -185,8 +208,7 @@ module Bundler
|
|
185
208
|
def sh(cmd, &block)
|
186
209
|
out, status = sh_with_status(cmd, &block)
|
187
210
|
unless status.success?
|
188
|
-
|
189
|
-
raise(out.empty? ? "Running `#{cmd}` failed. Run this command directly for more detailed output." : out)
|
211
|
+
raise("Running `#{cmd.shelljoin}` failed with the following output:\n\n#{out}\n")
|
190
212
|
end
|
191
213
|
out
|
192
214
|
end
|
@@ -210,7 +232,7 @@ module Bundler
|
|
210
232
|
end
|
211
233
|
|
212
234
|
def gem_command
|
213
|
-
ENV["GEM_COMMAND"]
|
235
|
+
ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
|
214
236
|
end
|
215
237
|
end
|
216
238
|
end
|
data/lib/bundler/gem_helpers.rb
CHANGED
@@ -10,6 +10,7 @@ module Bundler
|
|
10
10
|
[Gem::Platform.new("universal-mingw32"), Gem::Platform.new("universal-mingw32")],
|
11
11
|
[Gem::Platform.new("x64-mingw32"), Gem::Platform.new("x64-mingw32")],
|
12
12
|
[Gem::Platform.new("x86_64-mingw32"), Gem::Platform.new("x64-mingw32")],
|
13
|
+
[Gem::Platform.new("x64-mingw-ucrt"), Gem::Platform.new("x64-mingw-ucrt")],
|
13
14
|
[Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")],
|
14
15
|
].freeze
|
15
16
|
|
@@ -24,46 +25,49 @@ module Bundler
|
|
24
25
|
module_function :generic
|
25
26
|
|
26
27
|
def generic_local_platform
|
27
|
-
generic(
|
28
|
+
generic(local_platform)
|
28
29
|
end
|
29
30
|
module_function :generic_local_platform
|
30
31
|
|
32
|
+
def local_platform
|
33
|
+
Bundler.local_platform
|
34
|
+
end
|
35
|
+
module_function :local_platform
|
36
|
+
|
31
37
|
def platform_specificity_match(spec_platform, user_platform)
|
32
38
|
spec_platform = Gem::Platform.new(spec_platform)
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
PlatformMatch.new(
|
37
|
-
PlatformMatch.os_match(spec_platform, user_platform),
|
38
|
-
PlatformMatch.cpu_match(spec_platform, user_platform),
|
39
|
-
PlatformMatch.platform_version_match(spec_platform, user_platform)
|
40
|
-
)
|
39
|
+
|
40
|
+
PlatformMatch.specificity_score(spec_platform, user_platform)
|
41
41
|
end
|
42
42
|
module_function :platform_specificity_match
|
43
43
|
|
44
44
|
def select_best_platform_match(specs, platform)
|
45
|
-
specs.select {|spec| spec.match_platform(platform) }
|
46
|
-
|
45
|
+
matching = specs.select {|spec| spec.match_platform(platform) }
|
46
|
+
|
47
|
+
sort_best_platform_match(matching, platform)
|
47
48
|
end
|
48
49
|
module_function :select_best_platform_match
|
49
50
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
return nil unless other.is_a?(PlatformMatch)
|
51
|
+
def sort_best_platform_match(matching, platform)
|
52
|
+
exact = matching.select {|spec| spec.platform == platform }
|
53
|
+
return exact if exact.any?
|
54
54
|
|
55
|
-
|
56
|
-
|
55
|
+
sorted_matching = matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
|
56
|
+
exemplary_spec = sorted_matching.first
|
57
57
|
|
58
|
-
|
59
|
-
|
58
|
+
sorted_matching.take_while {|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
|
59
|
+
end
|
60
|
+
module_function :sort_best_platform_match
|
60
61
|
|
61
|
-
|
62
|
-
|
63
|
-
|
62
|
+
class PlatformMatch
|
63
|
+
def self.specificity_score(spec_platform, user_platform)
|
64
|
+
return -1 if spec_platform == user_platform
|
65
|
+
return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
|
64
66
|
|
65
|
-
|
66
|
-
|
67
|
+
os_match(spec_platform, user_platform) +
|
68
|
+
cpu_match(spec_platform, user_platform) * 10 +
|
69
|
+
platform_version_match(spec_platform, user_platform) * 100
|
70
|
+
end
|
67
71
|
|
68
72
|
def self.os_match(spec_platform, user_platform)
|
69
73
|
if spec_platform.os == user_platform.os
|
@@ -95,5 +99,19 @@ module Bundler
|
|
95
99
|
end
|
96
100
|
end
|
97
101
|
end
|
102
|
+
|
103
|
+
def same_specificity(platform, spec, exemplary_spec)
|
104
|
+
platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
|
105
|
+
end
|
106
|
+
module_function :same_specificity
|
107
|
+
|
108
|
+
def same_deps(spec, exemplary_spec)
|
109
|
+
same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
|
110
|
+
return same_runtime_deps unless spec.is_a?(Gem::Specification) && exemplary_spec.is_a?(Gem::Specification)
|
111
|
+
|
112
|
+
same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
|
113
|
+
same_runtime_deps && same_metadata_deps
|
114
|
+
end
|
115
|
+
module_function :same_deps
|
98
116
|
end
|
99
117
|
end
|
@@ -7,14 +7,13 @@ module Bundler
|
|
7
7
|
# available dependency versions as found in its index, before returning it to
|
8
8
|
# to the resolution engine to select the best version.
|
9
9
|
class GemVersionPromoter
|
10
|
-
|
11
|
-
|
12
|
-
attr_reader :level, :locked_specs, :unlock_gems
|
10
|
+
attr_reader :level
|
11
|
+
attr_accessor :pre
|
13
12
|
|
14
13
|
# By default, strict is false, meaning every available version of a gem
|
15
14
|
# is returned from sort_versions. The order gives preference to the
|
16
15
|
# requested level (:patch, :minor, :major) but in complicated requirement
|
17
|
-
# cases some gems will by necessity
|
16
|
+
# cases some gems will by necessity be promoted past the requested level,
|
18
17
|
# or even reverted to older versions.
|
19
18
|
#
|
20
19
|
# If strict is set to true, the results from sort_versions will be
|
@@ -24,24 +23,13 @@ module Bundler
|
|
24
23
|
# existing in the referenced source.
|
25
24
|
attr_accessor :strict
|
26
25
|
|
27
|
-
|
28
|
-
|
29
|
-
# Given a list of locked_specs and a list of gems to unlock creates a
|
30
|
-
# GemVersionPromoter instance.
|
26
|
+
# Creates a GemVersionPromoter instance.
|
31
27
|
#
|
32
|
-
# @param locked_specs [SpecSet] All current locked specs. Unlike Definition
|
33
|
-
# where this list is empty if all gems are being updated, this should
|
34
|
-
# always be populated for all gems so this class can properly function.
|
35
|
-
# @param unlock_gems [String] List of gem names being unlocked. If empty,
|
36
|
-
# all gems will be considered unlocked.
|
37
28
|
# @return [GemVersionPromoter]
|
38
|
-
def initialize
|
29
|
+
def initialize
|
39
30
|
@level = :major
|
40
31
|
@strict = false
|
41
|
-
@
|
42
|
-
@unlock_gems = unlock_gems
|
43
|
-
@sort_versions = {}
|
44
|
-
@prerelease_specified = {}
|
32
|
+
@pre = false
|
45
33
|
end
|
46
34
|
|
47
35
|
# @param value [Symbol] One of three Symbols: :major, :minor or :patch.
|
@@ -55,37 +43,19 @@ module Bundler
|
|
55
43
|
@level = v
|
56
44
|
end
|
57
45
|
|
58
|
-
# Given a
|
59
|
-
# gem, this method will return the Array of
|
60
|
-
# truncated if strict is true) in an order to give
|
61
|
-
# level (:major, :minor or :patch) when resolution
|
62
|
-
# best resolve all dependencies in the bundle.
|
63
|
-
# @param
|
64
|
-
# @param
|
65
|
-
#
|
66
|
-
# @return [SpecGroup] A new instance of the SpecGroup Array sorted and
|
46
|
+
# Given a Resolver::Package and an Array of Specifications of available
|
47
|
+
# versions for a gem, this method will return the Array of Specifications
|
48
|
+
# sorted (and possibly truncated if strict is true) in an order to give
|
49
|
+
# preference to the current level (:major, :minor or :patch) when resolution
|
50
|
+
# is deciding what versions best resolve all dependencies in the bundle.
|
51
|
+
# @param package [Resolver::Package] The package being resolved.
|
52
|
+
# @param specs [Specification] An array of Specifications for the package.
|
53
|
+
# @return [Specification] A new instance of the Specification Array sorted and
|
67
54
|
# possibly filtered.
|
68
|
-
def sort_versions(
|
69
|
-
|
70
|
-
|
71
|
-
@sort_versions[dep] ||= begin
|
72
|
-
gem_name = dep.name
|
55
|
+
def sort_versions(package, specs)
|
56
|
+
specs = filter_dep_specs(specs, package) if strict
|
73
57
|
|
74
|
-
|
75
|
-
# We only need the version here so it's ok to hard code this to the first instance.
|
76
|
-
locked_spec = locked_specs[gem_name].first
|
77
|
-
|
78
|
-
if strict
|
79
|
-
filter_dep_specs(spec_groups, locked_spec)
|
80
|
-
else
|
81
|
-
sort_dep_specs(spec_groups, locked_spec)
|
82
|
-
end.tap do |specs|
|
83
|
-
if DEBUG
|
84
|
-
warn before_result
|
85
|
-
warn " after sort_versions: #{debug_format_result(dep, specs).inspect}"
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
58
|
+
sort_dep_specs(specs, package)
|
89
59
|
end
|
90
60
|
|
91
61
|
# @return [bool] Convenience method for testing value of level variable.
|
@@ -98,80 +68,72 @@ module Bundler
|
|
98
68
|
level == :minor
|
99
69
|
end
|
100
70
|
|
101
|
-
|
71
|
+
# @return [bool] Convenience method for testing value of pre variable.
|
72
|
+
def pre?
|
73
|
+
pre == true
|
74
|
+
end
|
102
75
|
|
103
|
-
|
104
|
-
res = spec_groups.select do |spec_group|
|
105
|
-
if locked_spec && !major?
|
106
|
-
gsv = spec_group.version
|
107
|
-
lsv = locked_spec.version
|
76
|
+
private
|
108
77
|
|
109
|
-
|
78
|
+
def filter_dep_specs(specs, package)
|
79
|
+
locked_version = package.locked_version
|
80
|
+
return specs if locked_version.nil? || major?
|
110
81
|
|
111
|
-
|
112
|
-
|
113
|
-
else
|
114
|
-
true
|
115
|
-
end
|
116
|
-
end
|
82
|
+
specs.select do |spec|
|
83
|
+
gsv = spec.version
|
117
84
|
|
118
|
-
|
119
|
-
end
|
85
|
+
must_match = minor? ? [0] : [0, 1]
|
120
86
|
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
87
|
+
all_match = must_match.all? {|idx| gsv.segments[idx] == locked_version.segments[idx] }
|
88
|
+
all_match && gsv >= locked_version
|
89
|
+
end
|
90
|
+
end
|
125
91
|
|
126
|
-
|
127
|
-
|
128
|
-
@b_ver = b.version
|
92
|
+
def sort_dep_specs(specs, package)
|
93
|
+
locked_version = package.locked_version
|
129
94
|
|
130
|
-
|
131
|
-
|
132
|
-
|
95
|
+
result = specs.sort do |a, b|
|
96
|
+
unless locked_version && (package.prerelease_specified? || pre?)
|
97
|
+
a_pre = a.prerelease?
|
98
|
+
b_pre = b.prerelease?
|
133
99
|
|
134
100
|
next -1 if a_pre && !b_pre
|
135
101
|
next 1 if b_pre && !a_pre
|
136
102
|
end
|
137
103
|
|
138
104
|
if major?
|
139
|
-
|
140
|
-
elsif either_version_older_than_locked
|
141
|
-
|
142
|
-
elsif segments_do_not_match(:major)
|
143
|
-
|
144
|
-
elsif !minor? && segments_do_not_match(:minor)
|
145
|
-
|
105
|
+
a <=> b
|
106
|
+
elsif either_version_older_than_locked?(a, b, locked_version)
|
107
|
+
a <=> b
|
108
|
+
elsif segments_do_not_match?(a, b, :major)
|
109
|
+
b <=> a
|
110
|
+
elsif !minor? && segments_do_not_match?(a, b, :minor)
|
111
|
+
b <=> a
|
146
112
|
else
|
147
|
-
|
113
|
+
a <=> b
|
148
114
|
end
|
149
115
|
end
|
150
|
-
post_sort(result)
|
116
|
+
post_sort(result, package.unlock?, locked_version)
|
151
117
|
end
|
152
118
|
|
153
|
-
def either_version_older_than_locked
|
154
|
-
|
119
|
+
def either_version_older_than_locked?(a, b, locked_version)
|
120
|
+
locked_version && (a.version < locked_version || b.version < locked_version)
|
155
121
|
end
|
156
122
|
|
157
|
-
def segments_do_not_match(level)
|
123
|
+
def segments_do_not_match?(a, b, level)
|
158
124
|
index = [:major, :minor].index(level)
|
159
|
-
|
160
|
-
end
|
161
|
-
|
162
|
-
def unlocking_gem?
|
163
|
-
unlock_gems.empty? || unlock_gems.include?(@gem_name)
|
125
|
+
a.segments[index] != b.segments[index]
|
164
126
|
end
|
165
127
|
|
166
128
|
# Specific version moves can't always reliably be done during sorting
|
167
129
|
# as not all elements are compared against each other.
|
168
|
-
def post_sort(result)
|
130
|
+
def post_sort(result, unlock, locked_version)
|
169
131
|
# default :major behavior in Bundler does not do this
|
170
132
|
return result if major?
|
171
|
-
if
|
133
|
+
if unlock || locked_version.nil?
|
172
134
|
result
|
173
135
|
else
|
174
|
-
move_version_to_end(result,
|
136
|
+
move_version_to_end(result, locked_version)
|
175
137
|
end
|
176
138
|
end
|
177
139
|
|
@@ -179,12 +141,5 @@ module Bundler
|
|
179
141
|
move, keep = result.partition {|s| s.version.to_s == version.to_s }
|
180
142
|
keep.concat(move)
|
181
143
|
end
|
182
|
-
|
183
|
-
def debug_format_result(dep, spec_groups)
|
184
|
-
a = [dep.to_s,
|
185
|
-
spec_groups.map {|sg| [sg.version, sg.dependencies_for_activated_platforms.map {|dp| [dp.name, dp.requirement.to_s] }] }]
|
186
|
-
last_map = a.last.map {|sg_data| [sg_data.first.version, sg_data.last.map {|aa| aa.join(" ") }] }
|
187
|
-
[a.first, last_map, level, strict ? :strict : :not_strict]
|
188
|
-
end
|
189
144
|
end
|
190
145
|
end
|
data/lib/bundler/graph.rb
CHANGED
@@ -27,7 +27,7 @@ module Bundler
|
|
27
27
|
GraphVizClient.new(self).run
|
28
28
|
end
|
29
29
|
|
30
|
-
|
30
|
+
private
|
31
31
|
|
32
32
|
def _populate_relations
|
33
33
|
parent_dependencies = _groups.values.to_set.flatten
|
@@ -114,10 +114,10 @@ module Bundler
|
|
114
114
|
@groups.each do |group|
|
115
115
|
g.add_nodes(
|
116
116
|
group, {
|
117
|
-
:style
|
117
|
+
:style => "filled",
|
118
118
|
:fillcolor => "#B9B9D5",
|
119
|
-
:shape
|
120
|
-
:fontsize
|
119
|
+
:shape => "box3d",
|
120
|
+
:fontsize => 16,
|
121
121
|
}.merge(@node_options[group])
|
122
122
|
)
|
123
123
|
end
|