bundler 1.17.2 → 2.2.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2095 -1251
- data/LICENSE.md +18 -19
- data/README.md +10 -11
- data/bundler.gemspec +10 -28
- data/exe/bundle +22 -3
- data/lib/bundler/build_metadata.rb +4 -12
- data/lib/bundler/capistrano.rb +4 -4
- data/lib/bundler/cli/add.rb +28 -16
- data/lib/bundler/cli/binstubs.rb +6 -2
- data/lib/bundler/cli/cache.rb +24 -17
- data/lib/bundler/cli/check.rb +4 -2
- data/lib/bundler/cli/clean.rb +1 -1
- data/lib/bundler/cli/common.rb +39 -13
- data/lib/bundler/cli/config.rb +161 -86
- data/lib/bundler/cli/console.rb +1 -1
- data/lib/bundler/cli/doctor.rb +20 -9
- data/lib/bundler/cli/exec.rb +8 -25
- data/lib/bundler/cli/fund.rb +36 -0
- data/lib/bundler/cli/gem.rb +213 -32
- data/lib/bundler/cli/info.rb +42 -7
- data/lib/bundler/cli/init.rb +2 -2
- data/lib/bundler/cli/inject.rb +1 -1
- data/lib/bundler/cli/install.rb +34 -44
- data/lib/bundler/cli/issue.rb +8 -7
- data/lib/bundler/cli/list.rb +19 -11
- data/lib/bundler/cli/lock.rb +5 -1
- data/lib/bundler/cli/open.rb +11 -8
- data/lib/bundler/cli/outdated.rb +142 -118
- data/lib/bundler/cli/plugin.rb +19 -2
- data/lib/bundler/cli/pristine.rb +6 -1
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli/show.rb +2 -2
- data/lib/bundler/cli/update.rb +43 -16
- data/lib/bundler/cli.rb +211 -150
- data/lib/bundler/compact_index_client/cache.rb +6 -14
- data/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/lib/bundler/compact_index_client/updater.rb +15 -28
- data/lib/bundler/compact_index_client.rb +28 -12
- data/lib/bundler/current_ruby.rb +14 -11
- data/lib/bundler/definition.rb +207 -368
- data/lib/bundler/dep_proxy.rb +16 -9
- data/lib/bundler/dependency.rb +19 -14
- data/lib/bundler/deployment.rb +1 -1
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/dsl.rb +81 -81
- data/lib/bundler/endpoint_specification.rb +1 -1
- data/lib/bundler/env.rb +9 -14
- data/lib/bundler/environment_preserver.rb +29 -3
- data/lib/bundler/errors.rb +20 -3
- data/lib/bundler/feature_flag.rb +14 -33
- data/lib/bundler/fetcher/base.rb +1 -1
- data/lib/bundler/fetcher/compact_index.rb +28 -14
- data/lib/bundler/fetcher/dependency.rb +1 -1
- data/lib/bundler/fetcher/downloader.rb +14 -8
- data/lib/bundler/fetcher/index.rb +8 -8
- data/lib/bundler/fetcher.rb +22 -17
- data/lib/bundler/friendly_errors.rb +29 -48
- data/lib/bundler/gem_helper.rb +79 -43
- data/lib/bundler/gem_helpers.rb +38 -29
- data/lib/bundler/gem_tasks.rb +1 -1
- data/lib/bundler/gem_version_promoter.rb +5 -5
- data/lib/bundler/graph.rb +3 -3
- data/lib/bundler/index.rb +9 -9
- data/lib/bundler/injector.rb +33 -13
- data/lib/bundler/inline.rb +41 -30
- data/lib/bundler/installer/gem_installer.rb +9 -18
- data/lib/bundler/installer/parallel_installer.rb +50 -33
- data/lib/bundler/installer/standalone.rb +30 -11
- data/lib/bundler/installer.rb +39 -66
- data/lib/bundler/lazy_specification.rb +63 -28
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/lockfile_parser.rb +19 -52
- data/lib/bundler/{ssl_certs → man}/.document +0 -0
- data/{man → lib/bundler/man}/bundle-add.1 +10 -2
- data/{man/bundle-add.ronn → lib/bundler/man/bundle-add.1.ronn} +7 -1
- data/{man → lib/bundler/man}/bundle-binstubs.1 +6 -4
- data/{man/bundle-binstubs.ronn → lib/bundler/man/bundle-binstubs.1.ronn} +3 -5
- data/lib/bundler/man/bundle-cache.1 +55 -0
- data/{man/bundle-package.ronn → lib/bundler/man/bundle-cache.1.ronn} +15 -15
- data/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/{man/bundle-check.ronn → lib/bundler/man/bundle-check.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/{man/bundle-clean.ronn → lib/bundler/man/bundle-clean.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-config.1 +59 -60
- data/{man/bundle-config.ronn → lib/bundler/man/bundle-config.1.ronn} +77 -78
- data/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/{man/bundle-doctor.ronn → lib/bundler/man/bundle-doctor.1.ronn} +0 -0
- 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/{man → lib/bundler/man}/bundle-gem.1 +38 -3
- data/{man/bundle-gem.ronn → lib/bundler/man/bundle-gem.1.ronn} +46 -7
- data/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/{man/bundle-info.ronn → lib/bundler/man/bundle-info.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-init.1 +2 -2
- data/{man/bundle-init.ronn → lib/bundler/man/bundle-init.1.ronn} +1 -1
- data/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/{man/bundle-inject.ronn → lib/bundler/man/bundle-inject.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-install.1 +37 -7
- data/{man/bundle-install.ronn → lib/bundler/man/bundle-install.1.ronn} +34 -7
- 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/bundle-lock.ronn → lib/bundler/man/bundle-lock.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/{man/bundle-open.ronn → lib/bundler/man/bundle-open.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/{man/bundle-outdated.ronn → lib/bundler/man/bundle-outdated.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/{man/bundle-platform.ronn → lib/bundler/man/bundle-platform.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/{man/bundle-pristine.ronn → lib/bundler/man/bundle-pristine.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/{man/bundle-remove.ronn → lib/bundler/man/bundle-remove.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/{man/bundle-show.ronn → lib/bundler/man/bundle-show.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle-update.1 +7 -7
- data/{man/bundle-update.ronn → lib/bundler/man/bundle-update.1.ronn} +6 -6
- data/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/{man/bundle-viz.ronn → lib/bundler/man/bundle-viz.1.ronn} +0 -0
- data/{man → lib/bundler/man}/bundle.1 +7 -3
- data/{man/bundle.ronn → lib/bundler/man/bundle.1.ronn} +5 -2
- data/{man → lib/bundler/man}/gemfile.5 +44 -21
- data/{man → lib/bundler/man}/gemfile.5.ronn +24 -20
- data/{man → lib/bundler/man}/index.txt +1 -1
- data/lib/bundler/match_platform.rb +1 -1
- data/lib/bundler/mirror.rb +5 -5
- data/lib/bundler/plugin/api/source.rb +27 -7
- data/lib/bundler/plugin/api.rb +1 -1
- data/lib/bundler/plugin/dsl.rb +1 -1
- data/lib/bundler/plugin/index.rb +27 -4
- data/lib/bundler/plugin/installer/rubygems.rb +1 -1
- data/lib/bundler/plugin/installer.rb +35 -22
- data/lib/bundler/plugin/source_list.rb +5 -1
- data/lib/bundler/plugin.rb +100 -42
- data/lib/bundler/psyched_yaml.rb +0 -15
- data/lib/bundler/remote_specification.rb +5 -4
- data/lib/bundler/resolver/spec_group.rb +57 -53
- data/lib/bundler/resolver.rb +127 -113
- data/lib/bundler/retry.rb +4 -4
- data/lib/bundler/ruby_version.rb +5 -20
- data/lib/bundler/rubygems_ext.rb +103 -79
- data/lib/bundler/rubygems_gem_installer.rb +69 -8
- data/lib/bundler/rubygems_integration.rb +181 -446
- data/lib/bundler/runtime.rb +24 -34
- data/lib/bundler/settings.rb +159 -110
- data/lib/bundler/setup.rb +11 -12
- data/lib/bundler/shared_helpers.rb +56 -90
- data/lib/bundler/similarity_detector.rb +3 -3
- data/lib/bundler/source/git/git_proxy.rb +106 -105
- data/lib/bundler/source/git.rb +66 -39
- data/lib/bundler/source/metadata.rb +9 -9
- data/lib/bundler/source/path/installer.rb +10 -10
- data/lib/bundler/source/path.rb +23 -12
- data/lib/bundler/source/rubygems/remote.rb +3 -4
- data/lib/bundler/source/rubygems.rb +136 -120
- data/lib/bundler/source/rubygems_aggregate.rb +68 -0
- data/lib/bundler/source.rb +27 -6
- data/lib/bundler/source_list.rb +101 -66
- data/lib/bundler/source_map.rb +58 -0
- data/lib/bundler/spec_set.rb +49 -53
- data/lib/bundler/stub_specification.rb +40 -34
- data/lib/bundler/templates/Executable.bundler +24 -15
- data/lib/bundler/templates/Gemfile +1 -1
- data/lib/bundler/templates/gems.rb +1 -1
- 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/Gemfile.tt +19 -2
- data/lib/bundler/templates/newgem/README.md.tt +7 -5
- data/lib/bundler/templates/newgem/Rakefile.tt +23 -5
- data/lib/bundler/templates/newgem/bin/console.tt +1 -0
- data/lib/bundler/templates/newgem/circleci/config.yml.tt +13 -0
- data/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt +2 -0
- data/lib/bundler/templates/newgem/github/workflows/main.yml.tt +27 -0
- data/lib/bundler/templates/newgem/gitlab-ci.yml.tt +9 -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 +29 -40
- 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 +2 -0
- data/lib/bundler/templates/newgem/test/{newgem_test.rb.tt → minitest/newgem_test.rb.tt} +2 -0
- data/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt +6 -0
- 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/templates/newgem/travis.yml.tt +0 -1
- data/lib/bundler/ui/rg_proxy.rb +1 -1
- data/lib/bundler/ui/shell.rb +7 -11
- data/lib/bundler/ui.rb +3 -3
- data/lib/bundler/uri_credentials_filter.rb +10 -4
- 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 +174 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +3 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +57 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +126 -0
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/fileutils/lib/fileutils.rb +273 -147
- data/lib/bundler/vendor/molinillo/LICENSE +9 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +7 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/log.rb +6 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb +3 -3
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb +39 -11
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +38 -6
- data/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +4 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +1 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +12 -1
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +53 -51
- data/lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb +2 -2
- data/lib/bundler/vendor/molinillo/lib/molinillo.rb +5 -6
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/connection.rb +40 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/pool.rb +53 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/timed_stack_multi.rb +79 -0
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +302 -462
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/thor/lib/thor/actions/create_file.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/actions/create_link.rb +3 -2
- data/lib/bundler/vendor/thor/lib/thor/actions/directory.rb +7 -17
- data/lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb +20 -9
- data/lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb +19 -8
- data/lib/bundler/vendor/thor/lib/thor/actions.rb +28 -13
- data/lib/bundler/vendor/thor/lib/thor/base.rb +63 -43
- data/lib/bundler/vendor/thor/lib/thor/command.rb +21 -14
- data/lib/bundler/vendor/thor/lib/thor/error.rb +78 -0
- data/lib/bundler/vendor/thor/lib/thor/group.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/invocation.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb +6 -6
- data/lib/bundler/vendor/thor/lib/thor/line_editor.rb +2 -2
- data/lib/bundler/vendor/thor/lib/thor/nested_context.rb +29 -0
- data/lib/bundler/vendor/thor/lib/thor/parser/arguments.rb +7 -3
- data/lib/bundler/vendor/thor/lib/thor/parser/option.rb +20 -7
- data/lib/bundler/vendor/thor/lib/thor/parser/options.rb +21 -5
- data/lib/bundler/vendor/thor/lib/thor/parser.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/rake_compat.rb +1 -0
- data/lib/bundler/vendor/thor/lib/thor/runner.rb +15 -14
- data/lib/bundler/vendor/thor/lib/thor/shell/basic.rb +65 -8
- data/lib/bundler/vendor/thor/lib/thor/shell/color.rb +10 -2
- data/lib/bundler/vendor/thor/lib/thor/shell/html.rb +3 -3
- data/lib/bundler/vendor/thor/lib/thor/shell.rb +4 -4
- data/lib/bundler/vendor/thor/lib/thor/util.rb +18 -2
- data/lib/bundler/vendor/thor/lib/thor/version.rb +1 -1
- data/lib/bundler/vendor/thor/lib/thor.rb +16 -9
- data/lib/bundler/vendor/tmpdir/lib/tmpdir.rb +154 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +453 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendor/uri/lib/uri/common.rb +744 -0
- data/lib/bundler/vendor/uri/lib/uri/file.rb +94 -0
- data/lib/bundler/vendor/uri/lib/uri/ftp.rb +267 -0
- data/lib/bundler/vendor/uri/lib/uri/generic.rb +1568 -0
- data/lib/bundler/vendor/uri/lib/uri/http.rb +88 -0
- data/lib/bundler/vendor/uri/lib/uri/https.rb +23 -0
- data/lib/bundler/vendor/uri/lib/uri/ldap.rb +261 -0
- data/lib/bundler/vendor/uri/lib/uri/ldaps.rb +21 -0
- data/lib/bundler/vendor/uri/lib/uri/mailto.rb +294 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb +546 -0
- data/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb +125 -0
- data/lib/bundler/vendor/uri/lib/uri/version.rb +6 -0
- data/lib/bundler/vendor/uri/lib/uri.rb +104 -0
- data/lib/bundler/vendored_fileutils.rb +1 -6
- data/lib/bundler/vendored_molinillo.rb +1 -1
- data/lib/bundler/vendored_persistent.rb +7 -12
- data/lib/bundler/vendored_thor.rb +2 -2
- data/lib/bundler/vendored_tmpdir.rb +4 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/vendored_uri.rb +4 -0
- data/lib/bundler/version.rb +1 -20
- data/lib/bundler/version_ranges.rb +51 -5
- data/lib/bundler/vlad.rb +2 -2
- data/lib/bundler/worker.rb +21 -8
- data/lib/bundler/yaml_serializer.rb +3 -4
- data/lib/bundler.rb +248 -118
- metadata +115 -190
- data/exe/bundle_ruby +0 -60
- data/lib/bundler/cli/package.rb +0 -49
- data/lib/bundler/compatibility_guard.rb +0 -14
- data/lib/bundler/gem_remote_fetcher.rb +0 -43
- data/lib/bundler/ssl_certs/certificate_manager.rb +0 -66
- data/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem +0 -21
- data/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem +0 -23
- data/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem +0 -25
- data/lib/bundler/templates/newgem/test/test_helper.rb.tt +0 -4
- data/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb +0 -26
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/faster.rb +0 -27
- data/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent/ssl_reuse.rb +0 -129
- data/lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb +0 -12
- data/lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb +0 -129
- data/man/bundle-add.1.txt +0 -52
- data/man/bundle-binstubs.1.txt +0 -48
- data/man/bundle-check.1.txt +0 -33
- data/man/bundle-clean.1.txt +0 -26
- data/man/bundle-config.1.txt +0 -529
- data/man/bundle-doctor.1.txt +0 -44
- data/man/bundle-exec.1.txt +0 -178
- data/man/bundle-gem.1.txt +0 -91
- 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 -396
- 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-package.1 +0 -55
- data/man/bundle-package.1.txt +0 -79
- 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 -391
- data/man/bundle-viz.1.txt +0 -39
- data/man/bundle.1.txt +0 -113
- data/man/gemfile.5.txt +0 -653
data/lib/bundler/gem_helper.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
require "
|
3
|
+
require_relative "../bundler"
|
4
|
+
require "shellwords"
|
5
5
|
|
6
6
|
module Bundler
|
7
7
|
class GemHelper
|
@@ -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,13 +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
|
-
|
29
|
-
|
30
|
-
gemspecs = name ? [File.join(base, "#{name}.gemspec")] : Dir[File.join(base, "{,*}.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)
|
31
36
|
raise "Unable to determine name from existing gemspec. Use :name => 'gemname' in #install_tasks to manually set it." unless gemspecs.size == 1
|
32
37
|
@spec_path = gemspecs.first
|
33
38
|
@gemspec = Bundler.load_gemspec(@spec_path)
|
39
|
+
@tag_prefix = ""
|
34
40
|
end
|
35
41
|
|
36
42
|
def install
|
@@ -41,6 +47,11 @@ module Bundler
|
|
41
47
|
built_gem_path = build_gem
|
42
48
|
end
|
43
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
|
+
|
44
55
|
desc "Build and install #{name}-#{version}.gem into system gems."
|
45
56
|
task "install" => "build" do
|
46
57
|
install_gem(built_gem_path)
|
@@ -65,7 +76,7 @@ module Bundler
|
|
65
76
|
tag_version { git_push(args[:remote]) } unless already_tagged?
|
66
77
|
end
|
67
78
|
|
68
|
-
task "release:rubygem_push" do
|
79
|
+
task "release:rubygem_push" => "build" do
|
69
80
|
rubygem_push(built_gem_path) if gem_push?
|
70
81
|
end
|
71
82
|
|
@@ -74,7 +85,7 @@ module Bundler
|
|
74
85
|
|
75
86
|
def build_gem
|
76
87
|
file_name = nil
|
77
|
-
sh("
|
88
|
+
sh([*gem_command, "build", "-V", spec_path]) do
|
78
89
|
file_name = File.basename(built_gem_path)
|
79
90
|
SharedHelpers.filesystem_access(File.join(base, "pkg")) {|p| FileUtils.mkdir_p(p) }
|
80
91
|
FileUtils.mv(built_gem_path, "pkg")
|
@@ -85,32 +96,54 @@ module Bundler
|
|
85
96
|
|
86
97
|
def install_gem(built_gem_path = nil, local = false)
|
87
98
|
built_gem_path ||= build_gem
|
88
|
-
|
89
|
-
|
99
|
+
cmd = [*gem_command, "install", built_gem_path.to_s]
|
100
|
+
cmd << "--local" if local
|
101
|
+
sh(cmd)
|
90
102
|
Bundler.ui.confirm "#{name} (#{version}) installed."
|
91
103
|
end
|
92
104
|
|
93
|
-
|
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.new.hexdigest(built_gem_path.to_s)
|
111
|
+
target = File.join(base, "checksums", file_name)
|
112
|
+
File.write(target, checksum)
|
113
|
+
Bundler.ui.confirm "#{name} #{version} checksum written to checksums/#{file_name}."
|
114
|
+
end
|
115
|
+
|
116
|
+
protected
|
94
117
|
|
95
118
|
def rubygem_push(path)
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
|
101
|
-
end
|
102
|
-
sh(gem_command)
|
119
|
+
cmd = [*gem_command, "push", path]
|
120
|
+
cmd << "--key" << gem_key if gem_key
|
121
|
+
cmd << "--host" << allowed_push_host if allowed_push_host
|
122
|
+
sh_with_input(cmd)
|
103
123
|
Bundler.ui.confirm "Pushed #{name} #{version} to #{gem_push_host}"
|
104
124
|
end
|
105
125
|
|
106
126
|
def built_gem_path
|
107
|
-
|
127
|
+
Gem::Util.glob_files_in_dir("#{name}-*.gem", base).sort_by {|f| File.mtime(f) }.last
|
108
128
|
end
|
109
129
|
|
110
|
-
def git_push(remote =
|
111
|
-
|
112
|
-
|
113
|
-
|
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
|
114
147
|
end
|
115
148
|
|
116
149
|
def allowed_push_host
|
@@ -125,14 +158,8 @@ module Bundler
|
|
125
158
|
allowed_push_host || env_rubygems_host || "rubygems.org"
|
126
159
|
end
|
127
160
|
|
128
|
-
def perform_git_push(options = "")
|
129
|
-
cmd = "git push #{options}"
|
130
|
-
out, code = sh_with_code(cmd)
|
131
|
-
raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0
|
132
|
-
end
|
133
|
-
|
134
161
|
def already_tagged?
|
135
|
-
return false unless sh(
|
162
|
+
return false unless sh(%w[git tag]).split(/\n/).include?(version_tag)
|
136
163
|
Bundler.ui.confirm "Tag #{version_tag} has already been created."
|
137
164
|
true
|
138
165
|
end
|
@@ -142,20 +169,20 @@ module Bundler
|
|
142
169
|
end
|
143
170
|
|
144
171
|
def clean?
|
145
|
-
|
172
|
+
sh_with_status(%w[git diff --exit-code])[1].success?
|
146
173
|
end
|
147
174
|
|
148
175
|
def committed?
|
149
|
-
|
176
|
+
sh_with_status(%w[git diff-index --quiet --cached HEAD])[1].success?
|
150
177
|
end
|
151
178
|
|
152
179
|
def tag_version
|
153
|
-
sh
|
180
|
+
sh %W[git tag -m Version\ #{version} #{version_tag}]
|
154
181
|
Bundler.ui.confirm "Tagged #{version_tag}."
|
155
182
|
yield if block_given?
|
156
183
|
rescue RuntimeError
|
157
184
|
Bundler.ui.error "Untagging #{version_tag} due to error."
|
158
|
-
|
185
|
+
sh_with_status %W[git tag -d #{version_tag}]
|
159
186
|
raise
|
160
187
|
end
|
161
188
|
|
@@ -164,29 +191,34 @@ module Bundler
|
|
164
191
|
end
|
165
192
|
|
166
193
|
def version_tag
|
167
|
-
"v#{version}"
|
194
|
+
"#{@tag_prefix}v#{version}"
|
168
195
|
end
|
169
196
|
|
170
197
|
def name
|
171
198
|
gemspec.name
|
172
199
|
end
|
173
200
|
|
201
|
+
def sh_with_input(cmd)
|
202
|
+
Bundler.ui.debug(cmd)
|
203
|
+
SharedHelpers.chdir(base) do
|
204
|
+
abort unless Kernel.system(*cmd)
|
205
|
+
end
|
206
|
+
end
|
207
|
+
|
174
208
|
def sh(cmd, &block)
|
175
|
-
out,
|
176
|
-
unless
|
177
|
-
raise(
|
209
|
+
out, status = sh_with_status(cmd, &block)
|
210
|
+
unless status.success?
|
211
|
+
raise("Running `#{cmd.shelljoin}` failed with the following output:\n\n#{out}\n")
|
178
212
|
end
|
179
213
|
out
|
180
214
|
end
|
181
215
|
|
182
|
-
def
|
183
|
-
cmd += " 2>&1"
|
184
|
-
outbuf = String.new
|
216
|
+
def sh_with_status(cmd, &block)
|
185
217
|
Bundler.ui.debug(cmd)
|
186
218
|
SharedHelpers.chdir(base) do
|
187
|
-
outbuf =
|
188
|
-
status =
|
189
|
-
block.call(outbuf) if status.
|
219
|
+
outbuf = IO.popen(cmd, :err => [:child, :out], &:read)
|
220
|
+
status = $?
|
221
|
+
block.call(outbuf) if status.success? && block
|
190
222
|
[outbuf, status]
|
191
223
|
end
|
192
224
|
end
|
@@ -198,5 +230,9 @@ module Bundler
|
|
198
230
|
def gem_push?
|
199
231
|
!%w[n no nil false off 0].include?(ENV["gem_push"].to_s.downcase)
|
200
232
|
end
|
233
|
+
|
234
|
+
def gem_command
|
235
|
+
ENV["GEM_COMMAND"]&.shellsplit || ["gem"]
|
236
|
+
end
|
201
237
|
end
|
202
238
|
end
|
data/lib/bundler/gem_helpers.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
module Bundler
|
4
4
|
module GemHelpers
|
5
|
-
GENERIC_CACHE = {} # rubocop:disable MutableConstant
|
5
|
+
GENERIC_CACHE = { Gem::Platform::RUBY => Gem::Platform::RUBY } # rubocop:disable Style/MutableConstant
|
6
6
|
GENERICS = [
|
7
7
|
[Gem::Platform.new("java"), Gem::Platform.new("java")],
|
8
8
|
[Gem::Platform.new("mswin32"), Gem::Platform.new("mswin32")],
|
@@ -10,12 +10,10 @@ 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("mingw32"), Gem::Platform.new("x86-mingw32")]
|
13
|
+
[Gem::Platform.new("mingw32"), Gem::Platform.new("x86-mingw32")],
|
14
14
|
].freeze
|
15
15
|
|
16
16
|
def generic(p)
|
17
|
-
return p if p == Gem::Platform::RUBY
|
18
|
-
|
19
17
|
GENERIC_CACHE[p] ||= begin
|
20
18
|
_, found = GENERICS.find do |match, _generic|
|
21
19
|
p.os == match.os && (!match.cpu || p.cpu == match.cpu)
|
@@ -26,47 +24,44 @@ module Bundler
|
|
26
24
|
module_function :generic
|
27
25
|
|
28
26
|
def generic_local_platform
|
29
|
-
generic(
|
27
|
+
generic(local_platform)
|
30
28
|
end
|
31
29
|
module_function :generic_local_platform
|
32
30
|
|
31
|
+
def local_platform
|
32
|
+
Bundler.local_platform
|
33
|
+
end
|
34
|
+
module_function :local_platform
|
35
|
+
|
33
36
|
def platform_specificity_match(spec_platform, user_platform)
|
34
37
|
spec_platform = Gem::Platform.new(spec_platform)
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
PlatformMatch.new(
|
39
|
-
PlatformMatch.os_match(spec_platform, user_platform),
|
40
|
-
PlatformMatch.cpu_match(spec_platform, user_platform),
|
41
|
-
PlatformMatch.platform_version_match(spec_platform, user_platform)
|
42
|
-
)
|
38
|
+
|
39
|
+
PlatformMatch.specificity_score(spec_platform, user_platform)
|
43
40
|
end
|
44
41
|
module_function :platform_specificity_match
|
45
42
|
|
46
43
|
def select_best_platform_match(specs, platform)
|
47
|
-
specs.select {|spec| spec.match_platform(platform) }
|
48
|
-
|
44
|
+
matching = specs.select {|spec| spec.match_platform(platform) }
|
45
|
+
exact = matching.select {|spec| spec.platform == platform }
|
46
|
+
return exact if exact.any?
|
47
|
+
|
48
|
+
sorted_matching = matching.sort_by {|spec| platform_specificity_match(spec.platform, platform) }
|
49
|
+
exemplary_spec = sorted_matching.first
|
50
|
+
|
51
|
+
sorted_matching.take_while{|spec| same_specificity(platform, spec, exemplary_spec) && same_deps(spec, exemplary_spec) }
|
49
52
|
end
|
50
53
|
module_function :select_best_platform_match
|
51
54
|
|
52
|
-
PlatformMatch = Struct.new(:os_match, :cpu_match, :platform_version_match)
|
53
55
|
class PlatformMatch
|
54
|
-
def
|
55
|
-
return
|
56
|
-
|
57
|
-
m = os_match <=> other.os_match
|
58
|
-
return m unless m.zero?
|
56
|
+
def self.specificity_score(spec_platform, user_platform)
|
57
|
+
return -1 if spec_platform == user_platform
|
58
|
+
return 1_000_000 if spec_platform.nil? || spec_platform == Gem::Platform::RUBY || user_platform == Gem::Platform::RUBY
|
59
59
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
m = platform_version_match <=> other.platform_version_match
|
64
|
-
m
|
60
|
+
os_match(spec_platform, user_platform) +
|
61
|
+
cpu_match(spec_platform, user_platform) * 10 +
|
62
|
+
platform_version_match(spec_platform, user_platform) * 100
|
65
63
|
end
|
66
64
|
|
67
|
-
EXACT_MATCH = new(-1, -1, -1).freeze
|
68
|
-
WORST_MATCH = new(1_000_000, 1_000_000, 1_000_000).freeze
|
69
|
-
|
70
65
|
def self.os_match(spec_platform, user_platform)
|
71
66
|
if spec_platform.os == user_platform.os
|
72
67
|
0
|
@@ -97,5 +92,19 @@ module Bundler
|
|
97
92
|
end
|
98
93
|
end
|
99
94
|
end
|
95
|
+
|
96
|
+
def same_specificity(platform, spec, exemplary_spec)
|
97
|
+
platform_specificity_match(spec.platform, platform) == platform_specificity_match(exemplary_spec.platform, platform)
|
98
|
+
end
|
99
|
+
module_function :same_specificity
|
100
|
+
|
101
|
+
def same_deps(spec, exemplary_spec)
|
102
|
+
same_runtime_deps = spec.dependencies.sort == exemplary_spec.dependencies.sort
|
103
|
+
return same_runtime_deps unless spec.is_a?(Gem::Specification) && exemplary_spec.is_a?(Gem::Specification)
|
104
|
+
|
105
|
+
same_metadata_deps = spec.required_ruby_version == exemplary_spec.required_ruby_version && spec.required_rubygems_version == exemplary_spec.required_rubygems_version
|
106
|
+
same_runtime_deps && same_metadata_deps
|
107
|
+
end
|
108
|
+
module_function :same_deps
|
100
109
|
end
|
101
110
|
end
|
data/lib/bundler/gem_tasks.rb
CHANGED
@@ -7,7 +7,7 @@ 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
|
-
DEBUG = ENV["DEBUG_RESOLVER"]
|
10
|
+
DEBUG = ENV["BUNDLER_DEBUG_RESOLVER"] || ENV["DEBUG_RESOLVER"]
|
11
11
|
|
12
12
|
attr_reader :level, :locked_specs, :unlock_gems
|
13
13
|
|
@@ -81,8 +81,8 @@ module Bundler
|
|
81
81
|
sort_dep_specs(spec_groups, locked_spec)
|
82
82
|
end.tap do |specs|
|
83
83
|
if DEBUG
|
84
|
-
|
85
|
-
|
84
|
+
puts before_result
|
85
|
+
puts " after sort_versions: #{debug_format_result(dep, specs).inspect}"
|
86
86
|
end
|
87
87
|
end
|
88
88
|
end
|
@@ -98,7 +98,7 @@ module Bundler
|
|
98
98
|
level == :minor
|
99
99
|
end
|
100
100
|
|
101
|
-
|
101
|
+
private
|
102
102
|
|
103
103
|
def filter_dep_specs(spec_groups, locked_spec)
|
104
104
|
res = spec_groups.select do |spec_group|
|
@@ -109,7 +109,7 @@ module Bundler
|
|
109
109
|
must_match = minor? ? [0] : [0, 1]
|
110
110
|
|
111
111
|
matches = must_match.map {|idx| gsv.segments[idx] == lsv.segments[idx] }
|
112
|
-
|
112
|
+
matches.uniq == [true] ? (gsv >= lsv) : false
|
113
113
|
else
|
114
114
|
true
|
115
115
|
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
|
@@ -117,7 +117,7 @@ module Bundler
|
|
117
117
|
:style => "filled",
|
118
118
|
:fillcolor => "#B9B9D5",
|
119
119
|
:shape => "box3d",
|
120
|
-
:fontsize => 16
|
120
|
+
:fontsize => 16,
|
121
121
|
}.merge(@node_options[group])
|
122
122
|
)
|
123
123
|
end
|
@@ -142,7 +142,7 @@ module Bundler
|
|
142
142
|
g.output @output_format.to_sym => "#{@output_file}.#{@output_format}"
|
143
143
|
Bundler.ui.info "#{@output_file}.#{@output_format}"
|
144
144
|
rescue ArgumentError => e
|
145
|
-
|
145
|
+
warn "Unsupported output format. See Ruby-Graphviz/lib/graphviz/constants.rb"
|
146
146
|
raise e
|
147
147
|
end
|
148
148
|
end
|
data/lib/bundler/index.rb
CHANGED
@@ -1,7 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "set"
|
4
|
-
|
5
3
|
module Bundler
|
6
4
|
class Index
|
7
5
|
include Enumerable
|
@@ -65,11 +63,14 @@ module Bundler
|
|
65
63
|
def unsorted_search(query, base)
|
66
64
|
results = local_search(query, base)
|
67
65
|
|
68
|
-
seen = results.map(&:full_name).
|
66
|
+
seen = results.map(&:full_name).uniq unless @sources.empty?
|
69
67
|
|
70
68
|
@sources.each do |source|
|
71
69
|
source.unsorted_search(query, base).each do |spec|
|
72
|
-
|
70
|
+
next if seen.include?(spec.full_name)
|
71
|
+
|
72
|
+
seen << spec.full_name
|
73
|
+
results << spec
|
73
74
|
end
|
74
75
|
end
|
75
76
|
|
@@ -121,10 +122,9 @@ module Bundler
|
|
121
122
|
names
|
122
123
|
end
|
123
124
|
|
124
|
-
# returns a list of the dependencies
|
125
125
|
def unmet_dependency_names
|
126
126
|
dependency_names.select do |name|
|
127
|
-
|
127
|
+
search(name).empty?
|
128
128
|
end
|
129
129
|
end
|
130
130
|
|
@@ -170,7 +170,7 @@ module Bundler
|
|
170
170
|
def dependencies_eql?(spec, other_spec)
|
171
171
|
deps = spec.dependencies.select {|d| d.type != :development }
|
172
172
|
other_deps = other_spec.dependencies.select {|d| d.type != :development }
|
173
|
-
|
173
|
+
deps.sort == other_deps.sort
|
174
174
|
end
|
175
175
|
|
176
176
|
def add_source(index)
|
@@ -179,7 +179,7 @@ module Bundler
|
|
179
179
|
@sources.uniq! # need to use uniq! here instead of checking for the item before adding
|
180
180
|
end
|
181
181
|
|
182
|
-
|
182
|
+
private
|
183
183
|
|
184
184
|
def specs_by_name(name)
|
185
185
|
@specs[name].values
|
@@ -195,7 +195,7 @@ module Bundler
|
|
195
195
|
if base # allow all platforms when searching from a lockfile
|
196
196
|
dependency.matches_spec?(spec)
|
197
197
|
else
|
198
|
-
dependency.matches_spec?(spec) && Gem::Platform.
|
198
|
+
dependency.matches_spec?(spec) && Gem::Platform.match_spec?(spec)
|
199
199
|
end
|
200
200
|
end
|
201
201
|
|
data/lib/bundler/injector.rb
CHANGED
@@ -74,7 +74,7 @@ module Bundler
|
|
74
74
|
end
|
75
75
|
end
|
76
76
|
|
77
|
-
|
77
|
+
private
|
78
78
|
|
79
79
|
def conservative_version(spec)
|
80
80
|
version = spec.version
|
@@ -111,8 +111,10 @@ module Bundler
|
|
111
111
|
end
|
112
112
|
|
113
113
|
source = ", :source => \"#{d.source}\"" unless d.source.nil?
|
114
|
+
git = ", :git => \"#{d.git}\"" unless d.git.nil?
|
115
|
+
branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
|
114
116
|
|
115
|
-
%(gem #{name}#{requirement}#{group}#{source})
|
117
|
+
%(gem #{name}#{requirement}#{group}#{source}#{git}#{branch})
|
116
118
|
end.join("\n")
|
117
119
|
end
|
118
120
|
|
@@ -123,10 +125,10 @@ module Bundler
|
|
123
125
|
end
|
124
126
|
end
|
125
127
|
|
126
|
-
#
|
128
|
+
# evaluates a gemfile to remove the specified gem
|
127
129
|
# from it.
|
128
130
|
def remove_deps(gemfile_path)
|
129
|
-
initial_gemfile =
|
131
|
+
initial_gemfile = File.readlines(gemfile_path)
|
130
132
|
|
131
133
|
Bundler.ui.info "Removing gems from #{gemfile_path}"
|
132
134
|
|
@@ -136,8 +138,8 @@ module Bundler
|
|
136
138
|
|
137
139
|
removed_deps = remove_gems_from_dependencies(builder, @deps, gemfile_path)
|
138
140
|
|
139
|
-
# abort the
|
140
|
-
# no need to operate on gemfile
|
141
|
+
# abort the operation if no gems were removed
|
142
|
+
# no need to operate on gemfile further
|
141
143
|
return [] if removed_deps.empty?
|
142
144
|
|
143
145
|
cleaned_gemfile = remove_gems_from_gemfile(@deps, gemfile_path)
|
@@ -153,8 +155,8 @@ module Bundler
|
|
153
155
|
|
154
156
|
# @param [Dsl] builder Dsl object of current Gemfile.
|
155
157
|
# @param [Array] gems Array of names of gems to be removed.
|
156
|
-
# @param [Pathname]
|
157
|
-
# @return [Array]
|
158
|
+
# @param [Pathname] gemfile_path Path of the Gemfile.
|
159
|
+
# @return [Array] Array of removed dependencies.
|
158
160
|
def remove_gems_from_dependencies(builder, gems, gemfile_path)
|
159
161
|
removed_deps = []
|
160
162
|
|
@@ -177,11 +179,22 @@ module Bundler
|
|
177
179
|
# @param [Pathname] gemfile_path The Gemfile from which to remove dependencies.
|
178
180
|
def remove_gems_from_gemfile(gems, gemfile_path)
|
179
181
|
patterns = /gem\s+(['"])#{Regexp.union(gems)}\1|gem\s*\((['"])#{Regexp.union(gems)}\2\)/
|
182
|
+
new_gemfile = []
|
183
|
+
multiline_removal = false
|
184
|
+
File.readlines(gemfile_path).each do |line|
|
185
|
+
match_data = line.match(patterns)
|
186
|
+
if match_data && is_not_within_comment?(line, match_data)
|
187
|
+
multiline_removal = line.rstrip.end_with?(",")
|
188
|
+
# skip lines which match the regex
|
189
|
+
next
|
190
|
+
end
|
180
191
|
|
181
|
-
|
182
|
-
|
192
|
+
# skip followup lines until line does not end with ','
|
193
|
+
new_gemfile << line unless multiline_removal
|
194
|
+
multiline_removal = line.rstrip.end_with?(",") if multiline_removal
|
195
|
+
end
|
183
196
|
|
184
|
-
# remove
|
197
|
+
# remove line \n and append them with other strings
|
185
198
|
new_gemfile.each_with_index do |_line, index|
|
186
199
|
if new_gemfile[index + 1] == "\n"
|
187
200
|
new_gemfile[index] += new_gemfile[index + 1]
|
@@ -194,6 +207,13 @@ module Bundler
|
|
194
207
|
new_gemfile.join.chomp
|
195
208
|
end
|
196
209
|
|
210
|
+
# @param [String] line Individual line of gemfile content.
|
211
|
+
# @param [MatchData] match_data Data about Regex match.
|
212
|
+
def is_not_within_comment?(line, match_data)
|
213
|
+
match_start_index = match_data.offset(0).first
|
214
|
+
!line[0..match_start_index].include?("#")
|
215
|
+
end
|
216
|
+
|
197
217
|
# @param [Array] gemfile Array of gemfile contents.
|
198
218
|
# @param [String] block_name Name of block name to look for.
|
199
219
|
def remove_nested_blocks(gemfile, block_name)
|
@@ -206,7 +226,7 @@ module Bundler
|
|
206
226
|
nested_blocks -= 1
|
207
227
|
|
208
228
|
gemfile.each_with_index do |line, index|
|
209
|
-
next unless !line.nil? && line.
|
229
|
+
next unless !line.nil? && line.strip.start_with?(block_name)
|
210
230
|
if gemfile[index + 1] =~ /^\s*end\s*$/
|
211
231
|
gemfile[index] = nil
|
212
232
|
gemfile[index + 1] = nil
|
@@ -222,7 +242,7 @@ module Bundler
|
|
222
242
|
# @param [Array] removed_deps Array of removed dependencies.
|
223
243
|
# @param [Array] initial_gemfile Contents of original Gemfile before any operation.
|
224
244
|
def cross_check_for_errors(gemfile_path, original_deps, removed_deps, initial_gemfile)
|
225
|
-
#
|
245
|
+
# evaluate the new gemfile to look for any failure cases
|
226
246
|
builder = Dsl.new
|
227
247
|
builder.eval_gemfile(gemfile_path)
|
228
248
|
|