rubygems-update 2.6.14 → 2.7.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rubygems-update might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.travis.yml +10 -7
- data/CONTRIBUTING.rdoc +53 -54
- data/History.txt +173 -9
- data/Manifest.txt +39 -11
- data/POLICIES.rdoc +3 -3
- data/README.md +72 -0
- data/Rakefile +30 -5
- data/appveyor.yml +29 -1
- data/bin/gem +1 -1
- data/bin/update_rubygems +2 -2
- data/bundler/CHANGELOG.md +269 -9
- data/bundler/CODE_OF_CONDUCT.md +1 -1
- data/bundler/CONTRIBUTING.md +10 -29
- data/bundler/README.md +22 -10
- data/bundler/exe/bundle +5 -7
- data/bundler/exe/bundle_ruby +4 -3
- data/bundler/lib/bundler.rb +94 -74
- data/bundler/lib/bundler/build_metadata.rb +36 -0
- data/bundler/lib/bundler/capistrano.rb +5 -0
- data/bundler/lib/bundler/cli.rb +229 -66
- data/bundler/lib/bundler/cli/add.rb +25 -0
- data/bundler/lib/bundler/cli/binstubs.rb +9 -7
- data/bundler/lib/bundler/cli/cache.rb +5 -4
- data/bundler/lib/bundler/cli/check.rb +3 -5
- data/bundler/lib/bundler/cli/clean.rb +5 -6
- data/bundler/lib/bundler/cli/common.rb +18 -2
- data/bundler/lib/bundler/cli/config.rb +26 -7
- data/bundler/lib/bundler/cli/console.rb +2 -1
- data/bundler/lib/bundler/cli/doctor.rb +1 -0
- data/bundler/lib/bundler/cli/exec.rb +3 -2
- data/bundler/lib/bundler/cli/gem.rb +36 -15
- data/bundler/lib/bundler/cli/info.rb +50 -0
- data/bundler/lib/bundler/cli/init.rb +20 -7
- data/bundler/lib/bundler/cli/inject.rb +13 -4
- data/bundler/lib/bundler/cli/install.rb +61 -77
- data/bundler/lib/bundler/cli/issue.rb +40 -0
- data/bundler/lib/bundler/cli/list.rb +22 -0
- data/bundler/lib/bundler/cli/lock.rb +4 -2
- data/bundler/lib/bundler/cli/open.rb +2 -2
- data/bundler/lib/bundler/cli/outdated.rb +30 -28
- data/bundler/lib/bundler/cli/package.rb +9 -6
- data/bundler/lib/bundler/cli/platform.rb +1 -0
- data/bundler/lib/bundler/cli/plugin.rb +1 -0
- data/bundler/lib/bundler/cli/pristine.rb +43 -0
- data/bundler/lib/bundler/cli/show.rb +1 -1
- data/bundler/lib/bundler/cli/update.rb +32 -11
- data/bundler/lib/bundler/cli/viz.rb +5 -1
- data/bundler/lib/bundler/compact_index_client.rb +1 -0
- data/bundler/lib/bundler/compact_index_client/cache.rb +1 -2
- data/bundler/lib/bundler/compact_index_client/updater.rb +26 -7
- data/bundler/lib/bundler/compatibility_guard.rb +14 -0
- data/bundler/lib/bundler/constants.rb +1 -0
- data/bundler/lib/bundler/current_ruby.rb +8 -7
- data/bundler/lib/bundler/definition.rb +231 -159
- data/bundler/lib/bundler/dep_proxy.rb +2 -0
- data/bundler/lib/bundler/dependency.rb +6 -7
- data/bundler/lib/bundler/deployment.rb +1 -1
- data/bundler/lib/bundler/deprecate.rb +14 -3
- data/bundler/lib/bundler/dsl.rb +103 -62
- data/bundler/lib/bundler/endpoint_specification.rb +12 -2
- data/bundler/lib/bundler/env.rb +97 -36
- data/bundler/lib/bundler/environment_preserver.rb +27 -6
- data/bundler/lib/bundler/errors.rb +3 -1
- data/bundler/lib/bundler/feature_flag.rb +39 -4
- data/bundler/lib/bundler/fetcher.rb +15 -8
- data/bundler/lib/bundler/fetcher/base.rb +1 -0
- data/bundler/lib/bundler/fetcher/compact_index.rb +2 -12
- data/bundler/lib/bundler/fetcher/dependency.rb +2 -1
- data/bundler/lib/bundler/fetcher/downloader.rb +4 -2
- data/bundler/lib/bundler/fetcher/index.rb +1 -0
- data/bundler/lib/bundler/friendly_errors.rb +5 -2
- data/bundler/lib/bundler/gem_helper.rb +23 -9
- data/bundler/lib/bundler/gem_helpers.rb +1 -0
- data/bundler/lib/bundler/gem_remote_fetcher.rb +1 -0
- data/bundler/lib/bundler/gem_tasks.rb +1 -0
- data/bundler/lib/bundler/gem_version_promoter.rb +1 -0
- data/bundler/lib/bundler/gemdeps.rb +1 -0
- data/bundler/lib/bundler/graph.rb +1 -0
- data/bundler/lib/bundler/index.rb +19 -11
- data/bundler/lib/bundler/injector.rb +51 -27
- data/bundler/lib/bundler/inline.rb +10 -10
- data/bundler/lib/bundler/installer.rb +104 -50
- data/bundler/lib/bundler/installer/gem_installer.rb +5 -2
- data/bundler/lib/bundler/installer/parallel_installer.rb +91 -42
- data/bundler/lib/bundler/installer/standalone.rb +1 -0
- data/bundler/lib/bundler/lazy_specification.rb +17 -4
- data/bundler/lib/bundler/lockfile_generator.rb +95 -0
- data/bundler/lib/bundler/lockfile_parser.rb +49 -35
- data/bundler/lib/bundler/match_platform.rb +1 -0
- data/bundler/lib/bundler/mirror.rb +8 -3
- data/bundler/lib/bundler/plugin.rb +6 -1
- data/bundler/lib/bundler/plugin/api/source.rb +16 -3
- data/bundler/lib/bundler/plugin/index.rb +2 -0
- data/bundler/lib/bundler/plugin/installer.rb +7 -6
- data/bundler/lib/bundler/plugin/source_list.rb +7 -8
- data/bundler/lib/bundler/process_lock.rb +24 -0
- data/bundler/lib/bundler/psyched_yaml.rb +10 -0
- data/bundler/lib/bundler/remote_specification.rb +25 -1
- data/bundler/lib/bundler/resolver.rb +171 -192
- data/bundler/lib/bundler/resolver/spec_group.rb +111 -0
- data/bundler/lib/bundler/retry.rb +1 -0
- data/bundler/lib/bundler/ruby_dsl.rb +1 -0
- data/bundler/lib/bundler/ruby_version.rb +6 -1
- data/bundler/lib/bundler/rubygems_ext.rb +18 -8
- data/bundler/lib/bundler/rubygems_gem_installer.rb +25 -2
- data/bundler/lib/bundler/rubygems_integration.rb +157 -66
- data/bundler/lib/bundler/runtime.rb +28 -18
- data/bundler/lib/bundler/settings.rb +202 -87
- data/bundler/lib/bundler/settings/validator.rb +79 -0
- data/bundler/lib/bundler/setup.rb +4 -7
- data/bundler/lib/bundler/shared_helpers.rb +129 -25
- data/bundler/lib/bundler/similarity_detector.rb +1 -0
- data/bundler/lib/bundler/source.rb +53 -1
- data/bundler/lib/bundler/source/gemspec.rb +1 -0
- data/bundler/lib/bundler/source/git.rb +49 -21
- data/bundler/lib/bundler/source/git/git_proxy.rb +17 -12
- data/bundler/lib/bundler/source/metadata.rb +63 -0
- data/bundler/lib/bundler/source/path.rb +38 -17
- data/bundler/lib/bundler/source/path/installer.rb +4 -2
- data/bundler/lib/bundler/source/rubygems.rb +154 -82
- data/bundler/lib/bundler/source/rubygems/remote.rb +8 -1
- data/bundler/lib/bundler/source_list.rb +75 -15
- data/bundler/lib/bundler/spec_set.rb +34 -21
- data/bundler/lib/bundler/ssl_certs/certificate_manager.rb +2 -1
- data/bundler/lib/bundler/stub_specification.rb +86 -2
- data/bundler/lib/bundler/templates/Executable +5 -1
- data/bundler/lib/bundler/templates/Executable.bundler +105 -0
- data/bundler/lib/bundler/templates/Executable.standalone +5 -5
- data/bundler/lib/bundler/templates/Gemfile +3 -0
- data/bundler/lib/bundler/templates/gems.rb +8 -0
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +4 -2
- data/bundler/lib/bundler/templates/newgem/LICENSE.txt.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/README.md.tt +14 -8
- data/bundler/lib/bundler/templates/newgem/Rakefile.tt +5 -5
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt +3 -3
- data/bundler/lib/bundler/templates/newgem/gitignore.tt +0 -1
- data/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt +6 -6
- data/bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt +4 -4
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +13 -10
- data/bundler/lib/bundler/templates/newgem/rspec.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +0 -2
- data/bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt +3 -0
- data/bundler/lib/bundler/templates/newgem/test/newgem_test.rb.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/test/test_helper.rb.tt +3 -3
- data/bundler/lib/bundler/ui.rb +1 -0
- data/bundler/lib/bundler/ui/rg_proxy.rb +1 -0
- data/bundler/lib/bundler/ui/shell.rb +24 -10
- data/bundler/lib/bundler/ui/silent.rb +12 -1
- data/bundler/lib/bundler/uri_credentials_filter.rb +1 -0
- data/bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb +1638 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb +2 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +26 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb +7 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +16 -5
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/action.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +10 -2
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +5 -4
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +69 -6
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +2 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb +3 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +501 -138
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +1 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/state.rb +8 -4
- data/bundler/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +3 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor.rb +46 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions.rb +24 -22
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +2 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +2 -2
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb +16 -8
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +66 -18
- data/bundler/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +17 -15
- data/bundler/lib/bundler/vendor/thor/lib/thor/base.rb +55 -32
- data/bundler/lib/bundler/vendor/thor/lib/thor/command.rb +13 -11
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb +21 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +7 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +94 -63
- data/bundler/lib/bundler/vendor/thor/lib/thor/error.rb +3 -3
- data/bundler/lib/bundler/vendor/thor/lib/thor/group.rb +13 -13
- data/bundler/lib/bundler/vendor/thor/lib/thor/invocation.rb +4 -5
- data/bundler/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +2 -0
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/argument.rb +4 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +16 -16
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb +42 -21
- data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb +13 -10
- data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb +31 -29
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +49 -33
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb +1 -1
- data/bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb +4 -4
- data/bundler/lib/bundler/vendor/thor/lib/thor/util.rb +8 -7
- data/bundler/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/bundler/lib/bundler/vendored_fileutils.rb +9 -0
- data/bundler/lib/bundler/vendored_molinillo.rb +1 -0
- data/bundler/lib/bundler/vendored_persistent.rb +35 -0
- data/bundler/lib/bundler/vendored_thor.rb +6 -2
- data/bundler/lib/bundler/version.rb +19 -2
- data/bundler/lib/bundler/version_ranges.rb +76 -0
- data/bundler/lib/bundler/vlad.rb +5 -0
- data/bundler/lib/bundler/worker.rb +3 -1
- data/bundler/lib/bundler/yaml_serializer.rb +3 -3
- data/bundler/man/bundle-add.ronn +29 -0
- data/bundler/man/bundle-binstubs.ronn +14 -0
- data/bundler/man/bundle-check.ronn +26 -0
- data/bundler/man/bundle-clean.ronn +18 -0
- data/bundler/man/bundle-config.ronn +180 -60
- data/bundler/man/bundle-exec.ronn +7 -0
- data/bundler/man/bundle-gem.ronn +3 -2
- data/bundler/man/bundle-info.ronn +17 -0
- data/bundler/man/bundle-init.ronn +18 -0
- data/bundler/man/bundle-inject.ronn +22 -0
- data/bundler/man/bundle-install.ronn +32 -32
- data/bundler/man/bundle-list.ronn +15 -0
- data/bundler/man/bundle-open.ronn +19 -0
- data/bundler/man/bundle-outdated.ronn +1 -1
- data/bundler/man/bundle-package.ronn +5 -0
- data/bundler/man/bundle-pristine.ronn +34 -0
- data/bundler/man/bundle-show.ronn +20 -0
- data/bundler/man/bundle-update.ronn +6 -3
- data/bundler/man/bundle-viz.ronn +30 -0
- data/bundler/man/bundle.ronn +11 -20
- data/bundler/man/gemfile.5.ronn +55 -64
- data/lib/rubygems.rb +79 -36
- data/lib/rubygems/basic_specification.rb +8 -4
- data/lib/rubygems/bundler_version_finder.rb +112 -0
- data/lib/rubygems/command.rb +1 -1
- data/lib/rubygems/command_manager.rb +3 -1
- data/lib/rubygems/commands/cert_command.rb +31 -6
- data/lib/rubygems/commands/cleanup_command.rb +1 -1
- data/lib/rubygems/commands/help_command.rb +1 -1
- data/lib/rubygems/commands/owner_command.rb +3 -1
- data/lib/rubygems/commands/pristine_command.rb +11 -8
- data/lib/rubygems/commands/push_command.rb +2 -1
- data/lib/rubygems/commands/query_command.rb +13 -14
- data/lib/rubygems/commands/setup_command.rb +124 -69
- data/lib/rubygems/commands/signin_command.rb +33 -0
- data/lib/rubygems/commands/signout_command.rb +33 -0
- data/lib/rubygems/commands/uninstall_command.rb +4 -3
- data/lib/rubygems/commands/unpack_command.rb +16 -4
- data/lib/rubygems/commands/update_command.rb +1 -1
- data/lib/rubygems/commands/which_command.rb +1 -1
- data/lib/rubygems/commands/yank_command.rb +4 -11
- data/lib/rubygems/config_file.rb +13 -24
- data/lib/rubygems/core_ext/kernel_require.rb +10 -9
- data/lib/rubygems/dependency.rb +2 -0
- data/lib/rubygems/dependency_installer.rb +4 -0
- data/lib/rubygems/errors.rb +3 -0
- data/lib/rubygems/exceptions.rb +6 -0
- data/lib/rubygems/ext/builder.rb +1 -1
- data/lib/rubygems/ext/ext_conf_builder.rb +2 -4
- data/lib/rubygems/ext/rake_builder.rb +1 -1
- data/lib/rubygems/gem_runner.rb +5 -1
- data/lib/rubygems/install_update_options.rb +5 -28
- data/lib/rubygems/installer.rb +12 -7
- data/lib/rubygems/installer_test_case.rb +6 -3
- data/lib/rubygems/package/old.rb +1 -1
- data/lib/rubygems/request.rb +1 -1
- data/lib/rubygems/request_set.rb +20 -3
- data/lib/rubygems/request_set/gem_dependency_api.rb +3 -3
- data/lib/rubygems/requirement.rb +5 -1
- data/lib/rubygems/resolver.rb +24 -3
- data/lib/rubygems/resolver/installer_set.rb +4 -6
- data/lib/rubygems/safe_yaml.rb +4 -1
- data/lib/rubygems/security.rb +10 -3
- data/lib/rubygems/security_option.rb +43 -0
- data/lib/rubygems/server.rb +4 -12
- data/lib/rubygems/source.rb +7 -4
- data/lib/rubygems/source/git.rb +2 -1
- data/lib/rubygems/source/local.rb +38 -35
- data/lib/rubygems/source/lock.rb +4 -1
- data/lib/rubygems/source_local.rb +3 -1
- data/lib/rubygems/source_specific_file.rb +3 -2
- data/lib/rubygems/spec_fetcher.rb +7 -3
- data/lib/rubygems/specification.rb +281 -231
- data/lib/rubygems/stub_specification.rb +2 -3
- data/lib/rubygems/test_case.rb +14 -1
- data/lib/rubygems/user_interaction.rb +15 -13
- data/lib/rubygems/util.rb +6 -17
- data/lib/rubygems/version.rb +17 -3
- data/lib/rubygems/version_option.rb +6 -1
- data/setup.rb +1 -1
- data/test/rubygems/private3072_key.pem +40 -0
- data/test/rubygems/public3072_cert.pem +25 -0
- data/test/rubygems/test_config.rb +1 -1
- data/test/rubygems/test_gem.rb +72 -14
- data/test/rubygems/test_gem_bundler_version_finder.rb +125 -0
- data/test/rubygems/test_gem_command.rb +1 -1
- data/test/rubygems/test_gem_commands_build_command.rb +27 -1
- data/test/rubygems/test_gem_commands_cert_command.rb +64 -0
- data/test/rubygems/test_gem_commands_install_command.rb +35 -2
- data/test/rubygems/test_gem_commands_pristine_command.rb +1 -1
- data/test/rubygems/test_gem_commands_query_command.rb +19 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +17 -0
- data/test/rubygems/test_gem_commands_signin_command.rb +95 -0
- data/test/rubygems/test_gem_commands_signout_command.rb +37 -0
- data/test/rubygems/test_gem_commands_sources_command.rb +1 -1
- data/test/rubygems/test_gem_commands_uninstall_command.rb +12 -0
- data/test/rubygems/test_gem_commands_update_command.rb +1 -1
- data/test/rubygems/test_gem_commands_which_command.rb +3 -3
- data/test/rubygems/test_gem_dependency.rb +28 -0
- data/test/rubygems/test_gem_ext_builder.rb +2 -2
- data/test/rubygems/test_gem_ext_rake_builder.rb +2 -2
- data/test/rubygems/test_gem_install_update_options.rb +2 -1
- data/test/rubygems/test_gem_installer.rb +29 -27
- data/test/rubygems/test_gem_package.rb +5 -5
- data/test/rubygems/test_gem_remote_fetcher.rb +2 -2
- data/test/rubygems/test_gem_request_set_gem_dependency_api.rb +3 -3
- data/test/rubygems/test_gem_requirement.rb +6 -0
- data/test/rubygems/test_gem_resolver.rb +26 -0
- data/test/rubygems/test_gem_resolver_conflict.rb +1 -1
- data/test/rubygems/test_gem_security.rb +5 -0
- data/test/rubygems/test_gem_security_policy.rb +24 -24
- data/test/rubygems/test_gem_security_signer.rb +6 -6
- data/test/rubygems/test_gem_security_trust_dir.rb +2 -2
- data/test/rubygems/test_gem_server.rb +18 -1
- data/test/rubygems/test_gem_source.rb +9 -0
- data/test/rubygems/test_gem_spec_fetcher.rb +20 -0
- data/test/rubygems/test_gem_specification.rb +85 -10
- data/test/rubygems/test_gem_stream_ui.rb +6 -6
- data/test/rubygems/test_gem_stub_specification.rb +19 -1
- data/test/rubygems/test_gem_util.rb +1 -0
- data/test/rubygems/test_gem_version.rb +28 -7
- data/test/rubygems/test_gem_version_option.rb +15 -0
- data/test/rubygems/test_kernel.rb +30 -0
- data/test/rubygems/test_require.rb +44 -0
- metadata +47 -46
- data/README.rdoc +0 -54
- data/bundler/DEVELOPMENT.md +0 -150
- data/bundler/ISSUES.md +0 -117
- data/bundler/lib/bundler/postit_trampoline.rb +0 -73
- data/bundler/lib/bundler/vendor/postit/lib/postit.rb +0 -15
- data/bundler/lib/bundler/vendor/postit/lib/postit/environment.rb +0 -44
- data/bundler/lib/bundler/vendor/postit/lib/postit/installer.rb +0 -28
- data/bundler/lib/bundler/vendor/postit/lib/postit/parser.rb +0 -21
- data/bundler/lib/bundler/vendor/postit/lib/postit/setup.rb +0 -12
- data/bundler/lib/bundler/vendor/postit/lib/postit/version.rb +0 -3
- data/bundler/man/index.txt +0 -8
@@ -1,5 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require "digest/sha1"
|
3
2
|
|
4
3
|
module Bundler
|
5
4
|
class Runtime
|
@@ -11,6 +10,8 @@ module Bundler
|
|
11
10
|
end
|
12
11
|
|
13
12
|
def setup(*groups)
|
13
|
+
@definition.ensure_equivalent_gemfile_and_lockfile if Bundler.frozen?
|
14
|
+
|
14
15
|
groups.map!(&:to_sym)
|
15
16
|
|
16
17
|
# Has to happen first
|
@@ -24,21 +25,10 @@ module Bundler
|
|
24
25
|
# Activate the specs
|
25
26
|
load_paths = specs.map do |spec|
|
26
27
|
unless spec.loaded_from
|
27
|
-
raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it."
|
28
|
+
raise GemNotFound, "#{spec.full_name} is missing. Run `bundle install` to get it."
|
28
29
|
end
|
29
30
|
|
30
|
-
|
31
|
-
e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
|
32
|
-
"but your Gemfile requires #{spec.name} #{spec.version}. Prepending " \
|
33
|
-
"`bundle exec` to your command may solve this."
|
34
|
-
e.name = spec.name
|
35
|
-
if e.respond_to?(:requirement=)
|
36
|
-
e.requirement = Gem::Requirement.new(spec.version.to_s)
|
37
|
-
else
|
38
|
-
e.version_requirement = Gem::Requirement.new(spec.version.to_s)
|
39
|
-
end
|
40
|
-
raise e
|
41
|
-
end
|
31
|
+
check_for_activated_spec!(spec)
|
42
32
|
|
43
33
|
Bundler.rubygems.mark_loaded(spec)
|
44
34
|
spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
|
@@ -127,6 +117,7 @@ module Bundler
|
|
127
117
|
definition_method :requires
|
128
118
|
|
129
119
|
def lock(opts = {})
|
120
|
+
return if @definition.nothing_changed? && !@definition.unlocking?
|
130
121
|
@definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
|
131
122
|
end
|
132
123
|
|
@@ -270,9 +261,6 @@ module Bundler
|
|
270
261
|
end
|
271
262
|
|
272
263
|
def setup_manpath
|
273
|
-
# Store original MANPATH for restoration later in with_clean_env()
|
274
|
-
ENV["BUNDLER_ORIG_MANPATH"] = ENV["MANPATH"]
|
275
|
-
|
276
264
|
# Add man/ subdirectories from activated bundles to MANPATH for man(1)
|
277
265
|
manuals = $LOAD_PATH.map do |path|
|
278
266
|
man_subdir = path.sub(/lib$/, "man")
|
@@ -280,7 +268,7 @@ module Bundler
|
|
280
268
|
end.compact
|
281
269
|
|
282
270
|
return if manuals.empty?
|
283
|
-
|
271
|
+
Bundler::SharedHelpers.set_env "MANPATH", manuals.concat(
|
284
272
|
ENV["MANPATH"].to_s.split(File::PATH_SEPARATOR)
|
285
273
|
).uniq.join(File::PATH_SEPARATOR)
|
286
274
|
end
|
@@ -302,5 +290,27 @@ module Bundler
|
|
302
290
|
|
303
291
|
output
|
304
292
|
end
|
293
|
+
|
294
|
+
def check_for_activated_spec!(spec)
|
295
|
+
return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name)
|
296
|
+
return if activated_spec.version == spec.version
|
297
|
+
|
298
|
+
suggestion = if Bundler.rubygems.spec_default_gem?(activated_spec)
|
299
|
+
"Since #{spec.name} is a default gem, you can either remove your dependency on it" \
|
300
|
+
" or try updating to a newer version of bundler that supports #{spec.name} as a default gem."
|
301
|
+
else
|
302
|
+
"Prepending `bundle exec` to your command may solve this."
|
303
|
+
end
|
304
|
+
|
305
|
+
e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
|
306
|
+
"but your Gemfile requires #{spec.name} #{spec.version}. #{suggestion}"
|
307
|
+
e.name = spec.name
|
308
|
+
if e.respond_to?(:requirement=)
|
309
|
+
e.requirement = Gem::Requirement.new(spec.version.to_s)
|
310
|
+
else
|
311
|
+
e.version_requirement = Gem::Requirement.new(spec.version.to_s)
|
312
|
+
end
|
313
|
+
raise e
|
314
|
+
end
|
305
315
|
end
|
306
316
|
end
|
@@ -1,55 +1,89 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
+
|
2
3
|
require "uri"
|
3
4
|
|
4
5
|
module Bundler
|
5
6
|
class Settings
|
6
|
-
|
7
|
+
autoload :Mirror, "bundler/mirror"
|
8
|
+
autoload :Mirrors, "bundler/mirror"
|
9
|
+
autoload :Validator, "bundler/settings/validator"
|
10
|
+
|
11
|
+
BOOL_KEYS = %w[
|
12
|
+
allow_bundler_dependency_conflicts
|
13
|
+
allow_deployment_source_credential_changes
|
7
14
|
allow_offline_install
|
15
|
+
auto_clean_without_path
|
8
16
|
auto_install
|
9
17
|
cache_all
|
18
|
+
cache_all_platforms
|
19
|
+
cache_command_is_package
|
20
|
+
console_command
|
21
|
+
default_install_uses_path
|
22
|
+
deployment
|
23
|
+
deployment_means_frozen
|
10
24
|
disable_checksum_validation
|
11
25
|
disable_exec_load
|
12
26
|
disable_local_branch_check
|
27
|
+
disable_multisource
|
13
28
|
disable_shared_gems
|
29
|
+
disable_version_check
|
30
|
+
error_on_stderr
|
31
|
+
force_ruby_platform
|
32
|
+
forget_cli_options
|
14
33
|
frozen
|
15
34
|
gem.coc
|
16
35
|
gem.mit
|
36
|
+
global_gem_cache
|
17
37
|
ignore_messages
|
38
|
+
init_gems_rb
|
39
|
+
list_command
|
40
|
+
lockfile_uses_separate_rubygems_sources
|
18
41
|
major_deprecations
|
19
42
|
no_install
|
20
43
|
no_prune
|
21
|
-
force_ruby_platform
|
22
44
|
only_update_to_newer_versions
|
45
|
+
path.system
|
23
46
|
plugins
|
47
|
+
prefer_gems_rb
|
48
|
+
print_only_version_number
|
49
|
+
setup_makes_kernel_gem_public
|
24
50
|
silence_root_warning
|
25
|
-
|
26
|
-
|
27
|
-
|
51
|
+
skip_default_git_sources
|
52
|
+
specific_platform
|
53
|
+
suppress_install_using_messages
|
54
|
+
unlock_source_unlocks_spec
|
55
|
+
update_requires_all_flag
|
56
|
+
].freeze
|
57
|
+
|
58
|
+
NUMBER_KEYS = %w[
|
28
59
|
redirect
|
29
60
|
retry
|
30
61
|
ssl_verify_mode
|
31
62
|
timeout
|
32
|
-
|
63
|
+
].freeze
|
64
|
+
|
65
|
+
ARRAY_KEYS = %w[
|
66
|
+
with
|
67
|
+
without
|
68
|
+
].freeze
|
33
69
|
|
34
70
|
DEFAULT_CONFIG = {
|
71
|
+
:disable_version_check => true,
|
35
72
|
:redirect => 5,
|
36
73
|
:retry => 3,
|
37
74
|
:timeout => 10,
|
38
75
|
}.freeze
|
39
76
|
|
40
|
-
attr_accessor :cli_flags_given
|
41
|
-
|
42
77
|
def initialize(root = nil)
|
43
78
|
@root = root
|
44
79
|
@local_config = load_config(local_config_file)
|
45
80
|
@global_config = load_config(global_config_file)
|
46
|
-
@cli_flags_given = false
|
47
81
|
@temporary = {}
|
48
82
|
end
|
49
83
|
|
50
84
|
def [](name)
|
51
85
|
key = key_for(name)
|
52
|
-
value = @temporary.fetch(
|
86
|
+
value = @temporary.fetch(key) do
|
53
87
|
@local_config.fetch(key) do
|
54
88
|
ENV.fetch(key) do
|
55
89
|
@global_config.fetch(key) do
|
@@ -57,59 +91,62 @@ module Bundler
|
|
57
91
|
nil
|
58
92
|
end end end end end
|
59
93
|
|
60
|
-
|
61
|
-
nil
|
62
|
-
elsif is_bool(name) || value == "false"
|
63
|
-
to_bool(value)
|
64
|
-
elsif is_num(name)
|
65
|
-
value.to_i
|
66
|
-
else
|
67
|
-
value
|
68
|
-
end
|
94
|
+
converted_value(value, name)
|
69
95
|
end
|
70
96
|
|
71
|
-
def
|
72
|
-
if
|
97
|
+
def set_command_option(key, value)
|
98
|
+
if Bundler.feature_flag.forget_cli_options?
|
99
|
+
temporary(key => value)
|
100
|
+
value
|
101
|
+
else
|
73
102
|
command = if value.nil?
|
74
103
|
"bundle config --delete #{key}"
|
75
104
|
else
|
76
105
|
"bundle config #{key} #{Array(value).join(":")}"
|
77
106
|
end
|
78
107
|
|
79
|
-
Bundler::SharedHelpers.major_deprecation
|
108
|
+
Bundler::SharedHelpers.major_deprecation 2,\
|
80
109
|
"flags passed to commands " \
|
81
110
|
"will no longer be automatically remembered. Instead please set flags " \
|
82
111
|
"you want remembered between commands using `bundle config " \
|
83
112
|
"<setting name> <setting value>`, i.e. `#{command}`"
|
113
|
+
|
114
|
+
set_local(key, value)
|
84
115
|
end
|
116
|
+
end
|
117
|
+
|
118
|
+
def set_command_option_if_given(key, value)
|
119
|
+
return if value.nil?
|
120
|
+
set_command_option(key, value)
|
121
|
+
end
|
122
|
+
|
123
|
+
def set_local(key, value)
|
85
124
|
local_config_file || raise(GemfileNotFound, "Could not locate Gemfile")
|
125
|
+
|
86
126
|
set_key(key, value, @local_config, local_config_file)
|
87
127
|
end
|
88
|
-
alias_method :set_local, :[]=
|
89
128
|
|
90
129
|
def temporary(update)
|
91
|
-
existing = Hash[update.map {|k, _| [k, @temporary[k]] }]
|
92
|
-
|
130
|
+
existing = Hash[update.map {|k, _| [k, @temporary[key_for(k)]] }]
|
131
|
+
update.each do |k, v|
|
132
|
+
set_key(k, v, @temporary, nil)
|
133
|
+
end
|
93
134
|
return unless block_given?
|
94
135
|
begin
|
95
136
|
yield
|
96
137
|
ensure
|
97
|
-
existing.each {|k, v|
|
138
|
+
existing.each {|k, v| set_key(k, v, @temporary, nil) }
|
98
139
|
end
|
99
140
|
end
|
100
141
|
|
101
|
-
def delete(key)
|
102
|
-
@local_config.delete(key_for(key))
|
103
|
-
end
|
104
|
-
|
105
142
|
def set_global(key, value)
|
106
143
|
set_key(key, value, @global_config, global_config_file)
|
107
144
|
end
|
108
145
|
|
109
146
|
def all
|
110
|
-
env_keys = ENV.keys.
|
147
|
+
env_keys = ENV.keys.grep(/\ABUNDLE_.+/)
|
111
148
|
|
112
|
-
keys = @global_config.keys | @local_config.keys | env_keys
|
149
|
+
keys = @temporary.keys | @global_config.keys | @local_config.keys | env_keys
|
113
150
|
|
114
151
|
keys.map do |key|
|
115
152
|
key.sub(/^BUNDLE_/, "").gsub(/__/, ".").downcase
|
@@ -135,7 +172,7 @@ module Bundler
|
|
135
172
|
|
136
173
|
def gem_mirrors
|
137
174
|
all.inject(Mirrors.new) do |mirrors, k|
|
138
|
-
mirrors.parse(k, self[k]) if k
|
175
|
+
mirrors.parse(k, self[k]) if k.start_with?("mirror.")
|
139
176
|
mirrors
|
140
177
|
end
|
141
178
|
end
|
@@ -143,6 +180,7 @@ module Bundler
|
|
143
180
|
def locations(key)
|
144
181
|
key = key_for(key)
|
145
182
|
locations = {}
|
183
|
+
locations[:temporary] = @temporary[key] if @temporary.key?(key)
|
146
184
|
locations[:local] = @local_config[key] if @local_config.key?(key)
|
147
185
|
locations[:env] = ENV[key] if ENV[key]
|
148
186
|
locations[:global] = @global_config[key] if @global_config.key?(key)
|
@@ -154,53 +192,77 @@ module Bundler
|
|
154
192
|
key = key_for(exposed_key)
|
155
193
|
|
156
194
|
locations = []
|
195
|
+
|
196
|
+
if @temporary.key?(key)
|
197
|
+
locations << "Set for the current command: #{converted_value(@temporary[key], exposed_key).inspect}"
|
198
|
+
end
|
199
|
+
|
157
200
|
if @local_config.key?(key)
|
158
|
-
locations << "Set for your local app (#{local_config_file}): #{@local_config[key].inspect}"
|
201
|
+
locations << "Set for your local app (#{local_config_file}): #{converted_value(@local_config[key], exposed_key).inspect}"
|
159
202
|
end
|
160
203
|
|
161
204
|
if value = ENV[key]
|
162
|
-
locations << "Set via #{key}: #{value.inspect}"
|
205
|
+
locations << "Set via #{key}: #{converted_value(value, exposed_key).inspect}"
|
163
206
|
end
|
164
207
|
|
165
208
|
if @global_config.key?(key)
|
166
|
-
locations << "Set for the current user (#{global_config_file}): #{@global_config[key].inspect}"
|
209
|
+
locations << "Set for the current user (#{global_config_file}): #{converted_value(@global_config[key], exposed_key).inspect}"
|
167
210
|
end
|
168
211
|
|
169
212
|
return ["You have not configured a value for `#{exposed_key}`"] if locations.empty?
|
170
213
|
locations
|
171
214
|
end
|
172
215
|
|
173
|
-
|
174
|
-
|
175
|
-
|
216
|
+
# for legacy reasons, the ruby scope isnt appended when the setting comes from ENV or the global config,
|
217
|
+
# nor do we respect :disable_shared_gems
|
218
|
+
def path
|
219
|
+
key = key_for(:path)
|
220
|
+
path = ENV[key] || @global_config[key]
|
221
|
+
if path && !@temporary.key?(key) && !@local_config.key?(key)
|
222
|
+
return Path.new(path, false, false, false)
|
223
|
+
end
|
176
224
|
|
177
|
-
|
178
|
-
|
225
|
+
system_path = self["path.system"] || (self[:disable_shared_gems] == false)
|
226
|
+
Path.new(self[:path], true, system_path, Bundler.feature_flag.default_install_uses_path?)
|
179
227
|
end
|
180
228
|
|
181
|
-
|
182
|
-
|
183
|
-
|
229
|
+
Path = Struct.new(:explicit_path, :append_ruby_scope, :system_path, :default_install_uses_path) do
|
230
|
+
def path
|
231
|
+
path = base_path
|
232
|
+
path = File.join(path, Bundler.ruby_scope) if append_ruby_scope && !use_system_gems?
|
233
|
+
path
|
234
|
+
end
|
184
235
|
|
185
|
-
|
186
|
-
|
187
|
-
|
236
|
+
def use_system_gems?
|
237
|
+
return true if system_path
|
238
|
+
return false if explicit_path
|
239
|
+
!default_install_uses_path
|
240
|
+
end
|
188
241
|
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
242
|
+
def base_path
|
243
|
+
path = explicit_path
|
244
|
+
path ||= ".bundle" unless use_system_gems?
|
245
|
+
path ||= Bundler.rubygems.gem_dir
|
246
|
+
path
|
247
|
+
end
|
194
248
|
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
249
|
+
def validate!
|
250
|
+
return unless explicit_path && system_path
|
251
|
+
path = Bundler.settings.pretty_values_for(:path)
|
252
|
+
path.unshift(nil, "path:") unless path.empty?
|
253
|
+
system_path = Bundler.settings.pretty_values_for("path.system")
|
254
|
+
system_path.unshift(nil, "path.system:") unless system_path.empty?
|
255
|
+
disable_shared_gems = Bundler.settings.pretty_values_for(:disable_shared_gems)
|
256
|
+
disable_shared_gems.unshift(nil, "disable_shared_gems:") unless disable_shared_gems.empty?
|
257
|
+
raise InvalidOption,
|
258
|
+
"Using a custom path while using system gems is unsupported.\n#{path.join("\n")}\n#{system_path.join("\n")}\n#{disable_shared_gems.join("\n")}"
|
199
259
|
end
|
200
260
|
end
|
201
261
|
|
202
262
|
def allow_sudo?
|
203
|
-
|
263
|
+
key = key_for(:path)
|
264
|
+
path_configured = @temporary.key?(key) || @local_config.key?(key)
|
265
|
+
!path_configured
|
204
266
|
end
|
205
267
|
|
206
268
|
def ignore_config?
|
@@ -208,14 +270,17 @@ module Bundler
|
|
208
270
|
end
|
209
271
|
|
210
272
|
def app_cache_path
|
211
|
-
@app_cache_path ||=
|
212
|
-
path = self[:cache_path] || "vendor/cache"
|
213
|
-
raise InvalidOption, "Cache path must be relative to the bundle path" if path.start_with?("/")
|
214
|
-
path
|
215
|
-
end
|
273
|
+
@app_cache_path ||= self[:cache_path] || "vendor/cache"
|
216
274
|
end
|
217
275
|
|
218
|
-
|
276
|
+
def validate!
|
277
|
+
all.each do |raw_key|
|
278
|
+
[@local_config, ENV, @global_config].each do |settings|
|
279
|
+
value = converted_value(settings[key_for(raw_key)], raw_key)
|
280
|
+
Validator.validate!(raw_key, value, settings.to_hash.dup)
|
281
|
+
end
|
282
|
+
end
|
283
|
+
end
|
219
284
|
|
220
285
|
def key_for(key)
|
221
286
|
key = Settings.normalize_uri(key).to_s if key.is_a?(String) && /https?:/ =~ key
|
@@ -223,15 +288,17 @@ module Bundler
|
|
223
288
|
"BUNDLE_#{key}"
|
224
289
|
end
|
225
290
|
|
291
|
+
private
|
292
|
+
|
226
293
|
def parent_setting_for(name)
|
227
|
-
|
294
|
+
split_specific_setting_for(name)[0]
|
228
295
|
end
|
229
296
|
|
230
|
-
def
|
231
|
-
|
297
|
+
def specific_gem_for(name)
|
298
|
+
split_specific_setting_for(name)[1]
|
232
299
|
end
|
233
300
|
|
234
|
-
def
|
301
|
+
def split_specific_setting_for(name)
|
235
302
|
name.split(".")
|
236
303
|
end
|
237
304
|
|
@@ -248,39 +315,69 @@ module Bundler
|
|
248
315
|
end
|
249
316
|
end
|
250
317
|
|
251
|
-
def is_num(
|
252
|
-
NUMBER_KEYS.include?(
|
318
|
+
def is_num(key)
|
319
|
+
NUMBER_KEYS.include?(key.to_s)
|
253
320
|
end
|
254
321
|
|
255
|
-
def
|
256
|
-
|
322
|
+
def is_array(key)
|
323
|
+
ARRAY_KEYS.include?(key.to_s)
|
257
324
|
end
|
258
325
|
|
259
|
-
def
|
260
|
-
|
326
|
+
def to_array(value)
|
327
|
+
return [] unless value
|
328
|
+
value.split(":").map(&:to_sym)
|
261
329
|
end
|
262
330
|
|
263
|
-
def
|
264
|
-
|
331
|
+
def array_to_s(array)
|
332
|
+
array = Array(array)
|
333
|
+
return nil if array.empty?
|
334
|
+
array.join(":").tr(" ", ":")
|
335
|
+
end
|
265
336
|
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
337
|
+
def set_key(raw_key, value, hash, file)
|
338
|
+
raw_key = raw_key.to_s
|
339
|
+
value = array_to_s(value) if is_array(raw_key)
|
340
|
+
|
341
|
+
key = key_for(raw_key)
|
342
|
+
|
343
|
+
return if hash[key] == value
|
344
|
+
|
345
|
+
hash[key] = value
|
346
|
+
hash.delete(key) if value.nil?
|
347
|
+
|
348
|
+
Validator.validate!(raw_key, converted_value(value, raw_key), hash)
|
349
|
+
|
350
|
+
return unless file
|
351
|
+
SharedHelpers.filesystem_access(file) do |p|
|
352
|
+
FileUtils.mkdir_p(p.dirname)
|
353
|
+
require "bundler/yaml_serializer"
|
354
|
+
p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
|
274
355
|
end
|
356
|
+
end
|
275
357
|
|
276
|
-
|
358
|
+
def converted_value(value, key)
|
359
|
+
if is_array(key)
|
360
|
+
to_array(value)
|
361
|
+
elsif value.nil?
|
362
|
+
nil
|
363
|
+
elsif is_bool(key) || value == "false"
|
364
|
+
to_bool(value)
|
365
|
+
elsif is_num(key)
|
366
|
+
value.to_i
|
367
|
+
else
|
368
|
+
value.to_s
|
369
|
+
end
|
277
370
|
end
|
278
371
|
|
279
372
|
def global_config_file
|
280
373
|
if ENV["BUNDLE_CONFIG"] && !ENV["BUNDLE_CONFIG"].empty?
|
281
374
|
Pathname.new(ENV["BUNDLE_CONFIG"])
|
282
375
|
else
|
283
|
-
|
376
|
+
begin
|
377
|
+
Bundler.user_bundle_path.join("config")
|
378
|
+
rescue PermissionError, GenericSystemCallError
|
379
|
+
nil
|
380
|
+
end
|
284
381
|
end
|
285
382
|
end
|
286
383
|
|
@@ -312,16 +409,34 @@ module Bundler
|
|
312
409
|
end
|
313
410
|
end
|
314
411
|
|
412
|
+
PER_URI_OPTIONS = %w[
|
413
|
+
fallback_timeout
|
414
|
+
].freeze
|
415
|
+
|
416
|
+
NORMALIZE_URI_OPTIONS_PATTERN =
|
417
|
+
/
|
418
|
+
\A
|
419
|
+
(\w+\.)? # optional prefix key
|
420
|
+
(https?.*?) # URI
|
421
|
+
(\.#{Regexp.union(PER_URI_OPTIONS)})? # optional suffix key
|
422
|
+
\z
|
423
|
+
/ix
|
424
|
+
|
315
425
|
# TODO: duplicates Rubygems#normalize_uri
|
316
426
|
# TODO: is this the correct place to validate mirror URIs?
|
317
427
|
def self.normalize_uri(uri)
|
318
428
|
uri = uri.to_s
|
319
|
-
|
429
|
+
if uri =~ NORMALIZE_URI_OPTIONS_PATTERN
|
430
|
+
prefix = $1
|
431
|
+
uri = $2
|
432
|
+
suffix = $3
|
433
|
+
end
|
434
|
+
uri = "#{uri}/" unless uri.end_with?("/")
|
320
435
|
uri = URI(uri)
|
321
436
|
unless uri.absolute?
|
322
437
|
raise ArgumentError, format("Gem sources must be absolute. You provided '%s'.", uri)
|
323
438
|
end
|
324
|
-
uri
|
439
|
+
"#{prefix}#{uri}#{suffix}"
|
325
440
|
end
|
326
441
|
end
|
327
442
|
end
|