bundler 2.3.21 → 2.3.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +22 -0
- data/bundler.gemspec +6 -8
- data/lib/bundler/build_metadata.rb +2 -2
- data/lib/bundler/cli.rb +2 -1
- data/lib/bundler/current_ruby.rb +14 -5
- data/lib/bundler/definition.rb +5 -8
- data/lib/bundler/dependency.rb +18 -85
- data/lib/bundler/endpoint_specification.rb +1 -1
- data/lib/bundler/feature_flag.rb +0 -1
- data/lib/bundler/gem_version_promoter.rb +4 -18
- data/lib/bundler/injector.rb +2 -1
- data/lib/bundler/lockfile_generator.rb +1 -1
- data/lib/bundler/man/bundle-add.1 +6 -2
- data/lib/bundler/man/bundle-add.1.ronn +4 -1
- data/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/lib/bundler/man/bundle-cache.1 +1 -1
- data/lib/bundler/man/bundle-check.1 +1 -1
- data/lib/bundler/man/bundle-clean.1 +1 -1
- data/lib/bundler/man/bundle-config.1 +1 -1
- data/lib/bundler/man/bundle-console.1 +53 -0
- data/lib/bundler/man/bundle-console.1.ronn +44 -0
- data/lib/bundler/man/bundle-doctor.1 +1 -1
- data/lib/bundler/man/bundle-exec.1 +1 -1
- data/lib/bundler/man/bundle-gem.1 +1 -1
- data/lib/bundler/man/bundle-help.1 +13 -0
- data/lib/bundler/man/bundle-help.1.ronn +12 -0
- data/lib/bundler/man/bundle-info.1 +1 -1
- data/lib/bundler/man/bundle-init.1 +1 -1
- data/lib/bundler/man/bundle-inject.1 +1 -1
- data/lib/bundler/man/bundle-install.1 +1 -1
- data/lib/bundler/man/bundle-list.1 +1 -1
- data/lib/bundler/man/bundle-lock.1 +1 -1
- data/lib/bundler/man/bundle-open.1 +1 -1
- data/lib/bundler/man/bundle-outdated.1 +1 -1
- data/lib/bundler/man/bundle-platform.1 +1 -1
- data/lib/bundler/man/bundle-plugin.1 +1 -1
- data/lib/bundler/man/bundle-pristine.1 +1 -1
- data/lib/bundler/man/bundle-remove.1 +1 -1
- data/lib/bundler/man/bundle-show.1 +1 -1
- data/lib/bundler/man/bundle-update.1 +1 -1
- data/lib/bundler/man/bundle-version.1 +35 -0
- data/lib/bundler/man/bundle-version.1.ronn +24 -0
- data/lib/bundler/man/bundle-viz.1 +1 -1
- data/lib/bundler/man/bundle.1 +6 -2
- data/lib/bundler/man/bundle.1.ronn +4 -1
- data/lib/bundler/man/gemfile.5 +8 -38
- data/lib/bundler/man/gemfile.5.ronn +9 -27
- data/lib/bundler/man/index.txt +3 -0
- data/lib/bundler/match_remote_metadata.rb +4 -1
- data/lib/bundler/resolver/base.rb +50 -0
- data/lib/bundler/resolver.rb +67 -84
- data/lib/bundler/rubygems_ext.rb +13 -3
- data/lib/bundler/settings.rb +0 -1
- data/lib/bundler/spec_set.rb +10 -0
- data/lib/bundler/version.rb +1 -1
- metadata +11 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 57a888ea873d637d14016b9e9ba7aab35e1421c3f24b9c1b024ccab52c8137eb
|
4
|
+
data.tar.gz: 767816ae891334d340fadfcce3984622b7b80706b6a46a9e389ac1998a53e825
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f70a84e9f3fa6d2e0b88a18b1c66907817e9806e40fc28cb96838e5f07d83176333ce66ba3a03d3a0e5516e03e256fcf520de33a89dceb99080e521cecb853f2
|
7
|
+
data.tar.gz: 014bf59ac564877632a885c2c6c197bb71d16fdff3e1c5f81c8e3716b940b11def6b77de85b2acde7174425fd6439ddfefab73c661f7d8ff8398bbe483fd6b7a
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,25 @@
|
|
1
|
+
# 2.3.22 (September 7, 2022)
|
2
|
+
|
3
|
+
## Enhancements:
|
4
|
+
|
5
|
+
- Use a more accurate source code uri in gemspec [#5896](https://github.com/rubygems/rubygems/pull/5896)
|
6
|
+
- Support `--path` option in `bundle add` [#5897](https://github.com/rubygems/rubygems/pull/5897)
|
7
|
+
- Improve lockfile dependency unlocking [#5881](https://github.com/rubygems/rubygems/pull/5881)
|
8
|
+
- Add platform alias `:windows` to Gemfile DSL [#5650](https://github.com/rubygems/rubygems/pull/5650)
|
9
|
+
- Make `#to_lock` consistent between `Gem::Dependency` and `Bundler::Dependency` [#5872](https://github.com/rubygems/rubygems/pull/5872)
|
10
|
+
- Support marshaled index specifications with `nil` required ruby version [#5824](https://github.com/rubygems/rubygems/pull/5824)
|
11
|
+
|
12
|
+
## Bug fixes:
|
13
|
+
|
14
|
+
- Fix resolution hanging on musl platforms [#5875](https://github.com/rubygems/rubygems/pull/5875)
|
15
|
+
- Fix another regression affecting the sorbet family of gems [#5874](https://github.com/rubygems/rubygems/pull/5874)
|
16
|
+
|
17
|
+
## Documentation:
|
18
|
+
|
19
|
+
- Introduce bundle-console(1) man [#5901](https://github.com/rubygems/rubygems/pull/5901)
|
20
|
+
- Introduce bundle-version(1) man [#5895](https://github.com/rubygems/rubygems/pull/5895)
|
21
|
+
- Introduce bundle-help(1) man [#5886](https://github.com/rubygems/rubygems/pull/5886)
|
22
|
+
|
1
23
|
# 2.3.21 (August 24, 2022)
|
2
24
|
|
3
25
|
## Enhancements:
|
data/bundler.gemspec
CHANGED
@@ -22,14 +22,12 @@ Gem::Specification.new do |s|
|
|
22
22
|
s.summary = "The best way to manage your application's dependencies"
|
23
23
|
s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
}
|
32
|
-
end
|
25
|
+
s.metadata = {
|
26
|
+
"bug_tracker_uri" => "https://github.com/rubygems/rubygems/issues?q=is%3Aopen+is%3Aissue+label%3ABundler",
|
27
|
+
"changelog_uri" => "https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md",
|
28
|
+
"homepage_uri" => "https://bundler.io/",
|
29
|
+
"source_code_uri" => "https://github.com/rubygems/rubygems/tree/master/bundler",
|
30
|
+
}
|
33
31
|
|
34
32
|
s.required_ruby_version = ">= 2.3.0"
|
35
33
|
s.required_rubygems_version = ">= 2.5.2"
|
@@ -4,8 +4,8 @@ module Bundler
|
|
4
4
|
# Represents metadata from when the Bundler gem was built.
|
5
5
|
module BuildMetadata
|
6
6
|
# begin ivars
|
7
|
-
@built_at = "2022-
|
8
|
-
@git_commit_sha = "
|
7
|
+
@built_at = "2022-09-07".freeze
|
8
|
+
@git_commit_sha = "44fb4c9ef5".freeze
|
9
9
|
@release = true
|
10
10
|
# end ivars
|
11
11
|
|
data/lib/bundler/cli.rb
CHANGED
@@ -372,6 +372,7 @@ module Bundler
|
|
372
372
|
method_option "group", :aliases => "-g", :type => :string
|
373
373
|
method_option "source", :aliases => "-s", :type => :string
|
374
374
|
method_option "require", :aliases => "-r", :type => :string, :banner => "Adds require path to gem. Provide false, or a path as a string."
|
375
|
+
method_option "path", :type => :string
|
375
376
|
method_option "git", :type => :string
|
376
377
|
method_option "github", :type => :string
|
377
378
|
method_option "branch", :type => :string
|
@@ -516,7 +517,7 @@ module Bundler
|
|
516
517
|
end
|
517
518
|
end
|
518
519
|
|
519
|
-
desc "version", "Prints
|
520
|
+
desc "version", "Prints Bundler version information"
|
520
521
|
def version
|
521
522
|
cli_help = current_command.name == "cli_help"
|
522
523
|
if cli_help || ARGV.include?("version")
|
data/lib/bundler/current_ruby.rb
CHANGED
@@ -36,17 +36,18 @@ module Bundler
|
|
36
36
|
rbx
|
37
37
|
ruby
|
38
38
|
truffleruby
|
39
|
+
windows
|
39
40
|
x64_mingw
|
40
41
|
].freeze
|
41
42
|
|
42
43
|
def ruby?
|
43
44
|
return true if Bundler::GemHelpers.generic_local_platform == Gem::Platform::RUBY
|
44
45
|
|
45
|
-
!
|
46
|
+
!windows? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
|
46
47
|
end
|
47
48
|
|
48
49
|
def mri?
|
49
|
-
!
|
50
|
+
!windows? && RUBY_ENGINE == "ruby"
|
50
51
|
end
|
51
52
|
|
52
53
|
def rbx?
|
@@ -65,16 +66,24 @@ module Bundler
|
|
65
66
|
RUBY_ENGINE == "truffleruby"
|
66
67
|
end
|
67
68
|
|
68
|
-
def
|
69
|
+
def windows?
|
69
70
|
Gem.win_platform?
|
70
71
|
end
|
71
72
|
|
73
|
+
def mswin?
|
74
|
+
# For backwards compatibility
|
75
|
+
windows?
|
76
|
+
|
77
|
+
# TODO: This should correctly be:
|
78
|
+
# windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin32" && Bundler.local_platform.cpu == "x86"
|
79
|
+
end
|
80
|
+
|
72
81
|
def mswin64?
|
73
|
-
|
82
|
+
windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64"
|
74
83
|
end
|
75
84
|
|
76
85
|
def mingw?
|
77
|
-
|
86
|
+
windows? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64"
|
78
87
|
end
|
79
88
|
|
80
89
|
def x64_mingw?
|
data/lib/bundler/definition.rb
CHANGED
@@ -484,15 +484,13 @@ module Bundler
|
|
484
484
|
def resolver
|
485
485
|
@resolver ||= begin
|
486
486
|
last_resolve = converge_locked_specs
|
487
|
-
|
487
|
+
remove_ruby_from_platforms_if_necessary!(dependencies)
|
488
|
+
Resolver.new(source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve(last_resolve), platforms)
|
488
489
|
end
|
489
490
|
end
|
490
491
|
|
491
492
|
def expanded_dependencies
|
492
|
-
@expanded_dependencies ||=
|
493
|
-
remove_ruby_from_platforms_if_necessary!(dependencies)
|
494
|
-
expand_dependencies(dependencies + metadata_dependencies, true)
|
495
|
-
end
|
493
|
+
@expanded_dependencies ||= expand_dependencies(dependencies + metadata_dependencies, true)
|
496
494
|
end
|
497
495
|
|
498
496
|
def filter_specs(specs, deps)
|
@@ -880,9 +878,9 @@ module Bundler
|
|
880
878
|
end
|
881
879
|
end
|
882
880
|
|
883
|
-
def additional_base_requirements_for_resolve
|
881
|
+
def additional_base_requirements_for_resolve(last_resolve)
|
884
882
|
return [] unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources)
|
885
|
-
converge_specs(@originally_locked_specs).map do |locked_spec|
|
883
|
+
converge_specs(@originally_locked_specs - last_resolve).map do |locked_spec|
|
886
884
|
Dependency.new(locked_spec.name, ">= #{locked_spec.version}")
|
887
885
|
end.uniq
|
888
886
|
end
|
@@ -896,7 +894,6 @@ module Bundler
|
|
896
894
|
|
897
895
|
remove_platform(Gem::Platform::RUBY)
|
898
896
|
add_current_platform
|
899
|
-
resolver.platforms = @platforms
|
900
897
|
end
|
901
898
|
|
902
899
|
def source_map
|
data/lib/bundler/dependency.rb
CHANGED
@@ -7,92 +7,24 @@ require_relative "rubygems_ext"
|
|
7
7
|
module Bundler
|
8
8
|
class Dependency < Gem::Dependency
|
9
9
|
attr_reader :autorequire
|
10
|
-
attr_reader :groups, :platforms, :gemfile, :git, :github, :branch, :ref, :force_ruby_platform
|
10
|
+
attr_reader :groups, :platforms, :gemfile, :path, :git, :github, :branch, :ref, :force_ruby_platform
|
11
11
|
|
12
|
-
|
12
|
+
ALL_RUBY_VERSIONS = ((18..27).to_a + (30..31).to_a).freeze
|
13
13
|
PLATFORM_MAP = {
|
14
|
-
:ruby
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
18
|
-
:
|
19
|
-
:
|
20
|
-
:
|
21
|
-
:
|
22
|
-
:
|
23
|
-
:
|
24
|
-
|
25
|
-
|
26
|
-
:
|
27
|
-
|
28
|
-
:mri_18 => Gem::Platform::RUBY,
|
29
|
-
:mri_19 => Gem::Platform::RUBY,
|
30
|
-
:mri_20 => Gem::Platform::RUBY,
|
31
|
-
:mri_21 => Gem::Platform::RUBY,
|
32
|
-
:mri_22 => Gem::Platform::RUBY,
|
33
|
-
:mri_23 => Gem::Platform::RUBY,
|
34
|
-
:mri_24 => Gem::Platform::RUBY,
|
35
|
-
:mri_25 => Gem::Platform::RUBY,
|
36
|
-
:mri_26 => Gem::Platform::RUBY,
|
37
|
-
:mri_27 => Gem::Platform::RUBY,
|
38
|
-
:mri_30 => Gem::Platform::RUBY,
|
39
|
-
:mri_31 => Gem::Platform::RUBY,
|
40
|
-
:rbx => Gem::Platform::RUBY,
|
41
|
-
:truffleruby => Gem::Platform::RUBY,
|
42
|
-
:jruby => Gem::Platform::JAVA,
|
43
|
-
:jruby_18 => Gem::Platform::JAVA,
|
44
|
-
:jruby_19 => Gem::Platform::JAVA,
|
45
|
-
:mswin => Gem::Platform::MSWIN,
|
46
|
-
:mswin_18 => Gem::Platform::MSWIN,
|
47
|
-
:mswin_19 => Gem::Platform::MSWIN,
|
48
|
-
:mswin_20 => Gem::Platform::MSWIN,
|
49
|
-
:mswin_21 => Gem::Platform::MSWIN,
|
50
|
-
:mswin_22 => Gem::Platform::MSWIN,
|
51
|
-
:mswin_23 => Gem::Platform::MSWIN,
|
52
|
-
:mswin_24 => Gem::Platform::MSWIN,
|
53
|
-
:mswin_25 => Gem::Platform::MSWIN,
|
54
|
-
:mswin_26 => Gem::Platform::MSWIN,
|
55
|
-
:mswin_27 => Gem::Platform::MSWIN,
|
56
|
-
:mswin_30 => Gem::Platform::MSWIN,
|
57
|
-
:mswin_31 => Gem::Platform::MSWIN,
|
58
|
-
:mswin64 => Gem::Platform::MSWIN64,
|
59
|
-
:mswin64_19 => Gem::Platform::MSWIN64,
|
60
|
-
:mswin64_20 => Gem::Platform::MSWIN64,
|
61
|
-
:mswin64_21 => Gem::Platform::MSWIN64,
|
62
|
-
:mswin64_22 => Gem::Platform::MSWIN64,
|
63
|
-
:mswin64_23 => Gem::Platform::MSWIN64,
|
64
|
-
:mswin64_24 => Gem::Platform::MSWIN64,
|
65
|
-
:mswin64_25 => Gem::Platform::MSWIN64,
|
66
|
-
:mswin64_26 => Gem::Platform::MSWIN64,
|
67
|
-
:mswin64_27 => Gem::Platform::MSWIN64,
|
68
|
-
:mswin64_30 => Gem::Platform::MSWIN64,
|
69
|
-
:mswin64_31 => Gem::Platform::MSWIN64,
|
70
|
-
:mingw => Gem::Platform::MINGW,
|
71
|
-
:mingw_18 => Gem::Platform::MINGW,
|
72
|
-
:mingw_19 => Gem::Platform::MINGW,
|
73
|
-
:mingw_20 => Gem::Platform::MINGW,
|
74
|
-
:mingw_21 => Gem::Platform::MINGW,
|
75
|
-
:mingw_22 => Gem::Platform::MINGW,
|
76
|
-
:mingw_23 => Gem::Platform::MINGW,
|
77
|
-
:mingw_24 => Gem::Platform::MINGW,
|
78
|
-
:mingw_25 => Gem::Platform::MINGW,
|
79
|
-
:mingw_26 => Gem::Platform::MINGW,
|
80
|
-
:mingw_27 => Gem::Platform::MINGW,
|
81
|
-
:mingw_30 => Gem::Platform::MINGW,
|
82
|
-
:mingw_31 => Gem::Platform::MINGW,
|
83
|
-
:x64_mingw => Gem::Platform::X64_MINGW,
|
84
|
-
:x64_mingw_20 => Gem::Platform::X64_MINGW,
|
85
|
-
:x64_mingw_21 => Gem::Platform::X64_MINGW,
|
86
|
-
:x64_mingw_22 => Gem::Platform::X64_MINGW,
|
87
|
-
:x64_mingw_23 => Gem::Platform::X64_MINGW,
|
88
|
-
:x64_mingw_24 => Gem::Platform::X64_MINGW,
|
89
|
-
:x64_mingw_25 => Gem::Platform::X64_MINGW,
|
90
|
-
:x64_mingw_26 => Gem::Platform::X64_MINGW,
|
91
|
-
:x64_mingw_27 => Gem::Platform::X64_MINGW,
|
92
|
-
:x64_mingw_30 => Gem::Platform::X64_MINGW,
|
93
|
-
:x64_mingw_31 => Gem::Platform::X64_MINGW,
|
94
|
-
}.freeze
|
95
|
-
# rubocop:enable Naming/VariableNumber
|
14
|
+
:ruby => [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
|
15
|
+
:mri => [Gem::Platform::RUBY, ALL_RUBY_VERSIONS],
|
16
|
+
:rbx => [Gem::Platform::RUBY],
|
17
|
+
:truffleruby => [Gem::Platform::RUBY],
|
18
|
+
:jruby => [Gem::Platform::JAVA, [18, 19]],
|
19
|
+
:windows => [Gem::Platform::WINDOWS, ALL_RUBY_VERSIONS],
|
20
|
+
:mswin => [Gem::Platform::MSWIN, ALL_RUBY_VERSIONS],
|
21
|
+
:mswin64 => [Gem::Platform::MSWIN64, ALL_RUBY_VERSIONS - [18]],
|
22
|
+
:mingw => [Gem::Platform::MINGW, ALL_RUBY_VERSIONS],
|
23
|
+
:x64_mingw => [Gem::Platform::X64_MINGW, ALL_RUBY_VERSIONS - [18, 19]],
|
24
|
+
}.each_with_object({}) do |(platform, spec), hash|
|
25
|
+
hash[platform] = spec[0]
|
26
|
+
spec[1]&.each {|version| hash[:"#{platform}_#{version}"] = spec[0] }
|
27
|
+
end.freeze
|
96
28
|
|
97
29
|
def initialize(name, version, options = {}, &blk)
|
98
30
|
type = options["type"] || :runtime
|
@@ -101,6 +33,7 @@ module Bundler
|
|
101
33
|
@autorequire = nil
|
102
34
|
@groups = Array(options["group"] || :default).map(&:to_sym)
|
103
35
|
@source = options["source"]
|
36
|
+
@path = options["path"]
|
104
37
|
@git = options["git"]
|
105
38
|
@github = options["github"]
|
106
39
|
@branch = options["branch"]
|
@@ -151,7 +84,7 @@ module Bundler
|
|
151
84
|
def to_lock
|
152
85
|
out = super
|
153
86
|
out << "!" if source
|
154
|
-
out
|
87
|
+
out
|
155
88
|
end
|
156
89
|
|
157
90
|
def specific?
|
@@ -12,7 +12,7 @@ module Bundler
|
|
12
12
|
super()
|
13
13
|
@name = name
|
14
14
|
@version = Gem::Version.create version
|
15
|
-
@platform = platform
|
15
|
+
@platform = Gem::Platform.new(platform)
|
16
16
|
@spec_fetcher = spec_fetcher
|
17
17
|
@dependencies = dependencies.map {|dep, reqs| build_dependency(dep, reqs) }
|
18
18
|
|
data/lib/bundler/feature_flag.rb
CHANGED
@@ -39,7 +39,6 @@ module Bundler
|
|
39
39
|
settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? }
|
40
40
|
settings_flag(:suppress_install_using_messages) { bundler_3_mode? }
|
41
41
|
settings_flag(:update_requires_all_flag) { bundler_4_mode? }
|
42
|
-
settings_flag(:use_gem_version_promoter_for_major_updates) { bundler_3_mode? }
|
43
42
|
|
44
43
|
settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install }
|
45
44
|
|
@@ -55,19 +55,17 @@ module Bundler
|
|
55
55
|
@level = v
|
56
56
|
end
|
57
57
|
|
58
|
-
# Given a Dependency and an Array of
|
59
|
-
# gem, this method will return the Array of
|
58
|
+
# Given a Dependency and an Array of Specifications of available versions for a
|
59
|
+
# gem, this method will return the Array of Specifications sorted (and possibly
|
60
60
|
# truncated if strict is true) in an order to give preference to the current
|
61
61
|
# level (:major, :minor or :patch) when resolution is deciding what versions
|
62
62
|
# best resolve all dependencies in the bundle.
|
63
63
|
# @param dep [Dependency] The Dependency of the gem.
|
64
|
-
# @param spec_groups [
|
64
|
+
# @param spec_groups [Specification] An array of Specifications for the same gem
|
65
65
|
# named in the @dep param.
|
66
|
-
# @return [
|
66
|
+
# @return [Specification] A new instance of the Specification Array sorted and
|
67
67
|
# possibly filtered.
|
68
68
|
def sort_versions(dep, spec_groups)
|
69
|
-
before_result = "before sort_versions: #{debug_format_result(dep, spec_groups).inspect}" if DEBUG
|
70
|
-
|
71
69
|
@sort_versions[dep] ||= begin
|
72
70
|
gem_name = dep.name
|
73
71
|
|
@@ -79,11 +77,6 @@ module Bundler
|
|
79
77
|
filter_dep_specs(spec_groups, locked_spec)
|
80
78
|
else
|
81
79
|
sort_dep_specs(spec_groups, locked_spec)
|
82
|
-
end.tap do |specs|
|
83
|
-
if DEBUG
|
84
|
-
puts before_result
|
85
|
-
puts " after sort_versions: #{debug_format_result(dep, specs).inspect}"
|
86
|
-
end
|
87
80
|
end
|
88
81
|
end
|
89
82
|
end
|
@@ -183,12 +176,5 @@ module Bundler
|
|
183
176
|
move, keep = result.partition {|s| s.version.to_s == version.to_s }
|
184
177
|
keep.concat(move)
|
185
178
|
end
|
186
|
-
|
187
|
-
def debug_format_result(dep, spec_groups)
|
188
|
-
a = [dep.to_s,
|
189
|
-
spec_groups.map {|sg| [sg.version, sg.dependencies_for_activated_platforms.map {|dp| [dp.name, dp.requirement.to_s] }] }]
|
190
|
-
last_map = a.last.map {|sg_data| [sg_data.first.version, sg_data.last.map {|aa| aa.join(" ") }] }
|
191
|
-
[a.first, last_map, level, strict ? :strict : :not_strict]
|
192
|
-
end
|
193
179
|
end
|
194
180
|
end
|
data/lib/bundler/injector.rb
CHANGED
@@ -115,13 +115,14 @@ module Bundler
|
|
115
115
|
end
|
116
116
|
|
117
117
|
source = ", :source => \"#{d.source}\"" unless d.source.nil?
|
118
|
+
path = ", :path => \"#{d.path}\"" unless d.path.nil?
|
118
119
|
git = ", :git => \"#{d.git}\"" unless d.git.nil?
|
119
120
|
github = ", :github => \"#{d.github}\"" unless d.github.nil?
|
120
121
|
branch = ", :branch => \"#{d.branch}\"" unless d.branch.nil?
|
121
122
|
ref = ", :ref => \"#{d.ref}\"" unless d.ref.nil?
|
122
123
|
require_path = ", :require => #{convert_autorequire(d.autorequire)}" unless d.autorequire.nil?
|
123
124
|
|
124
|
-
%(gem #{name}#{requirement}#{group}#{source}#{git}#{github}#{branch}#{ref}#{require_path})
|
125
|
+
%(gem #{name}#{requirement}#{group}#{source}#{path}#{git}#{github}#{branch}#{ref}#{require_path})
|
125
126
|
end.join("\n")
|
126
127
|
end
|
127
128
|
|
@@ -1,13 +1,13 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-ADD" "1" "
|
4
|
+
.TH "BUNDLE\-ADD" "1" "September 2022" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-add\fR \- Add gem to the Gemfile and run bundle install
|
8
8
|
.
|
9
9
|
.SH "SYNOPSIS"
|
10
|
-
\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-git=GIT] [\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
|
10
|
+
\fBbundle add\fR \fIGEM_NAME\fR [\-\-group=GROUP] [\-\-version=VERSION] [\-\-source=SOURCE] [\-\-path=PATH] [\-\-git=GIT] [\-\-github=GITHUB] [\-\-branch=BRANCH] [\-\-ref=REF] [\-\-skip\-install] [\-\-strict] [\-\-optimistic]
|
11
11
|
.
|
12
12
|
.SH "DESCRIPTION"
|
13
13
|
Adds the named gem to the Gemfile and run \fBbundle install\fR\. \fBbundle install\fR can be avoided by using the flag \fB\-\-skip\-install\fR\.
|
@@ -49,6 +49,10 @@ Specify the source for the added gem\.
|
|
49
49
|
Adds require path to gem\. Provide false, or a path as a string\.
|
50
50
|
.
|
51
51
|
.TP
|
52
|
+
\fB\-\-path\fR
|
53
|
+
Specify the file system path for the added gem\.
|
54
|
+
.
|
55
|
+
.TP
|
52
56
|
\fB\-\-git\fR
|
53
57
|
Specify the git source for the added gem\.
|
54
58
|
.
|
@@ -3,7 +3,7 @@ bundle-add(1) -- Add gem to the Gemfile and run bundle install
|
|
3
3
|
|
4
4
|
## SYNOPSIS
|
5
5
|
|
6
|
-
`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--git=GIT] [--github=GITHUB] [--branch=BRANCH] [--ref=REF] [--skip-install] [--strict] [--optimistic]
|
6
|
+
`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE] [--path=PATH] [--git=GIT] [--github=GITHUB] [--branch=BRANCH] [--ref=REF] [--skip-install] [--strict] [--optimistic]
|
7
7
|
|
8
8
|
## DESCRIPTION
|
9
9
|
Adds the named gem to the Gemfile and run `bundle install`. `bundle install` can be avoided by using the flag `--skip-install`.
|
@@ -33,6 +33,9 @@ bundle add rails --group "development, test"
|
|
33
33
|
* `--require`, `-r`:
|
34
34
|
Adds require path to gem. Provide false, or a path as a string.
|
35
35
|
|
36
|
+
* `--path`:
|
37
|
+
Specify the file system path for the added gem.
|
38
|
+
|
36
39
|
* `--git`:
|
37
40
|
Specify the git source for the added gem.
|
38
41
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-BINSTUBS" "1" "
|
4
|
+
.TH "BUNDLE\-BINSTUBS" "1" "September 2022" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-binstubs\fR \- Install the binstubs of the listed gems
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-CACHE" "1" "
|
4
|
+
.TH "BUNDLE\-CACHE" "1" "September 2022" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-cache\fR \- Package your needed \fB\.gem\fR files into your application
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-CHECK" "1" "
|
4
|
+
.TH "BUNDLE\-CHECK" "1" "September 2022" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-check\fR \- Verifies if dependencies are satisfied by installed gems
|
@@ -1,7 +1,7 @@
|
|
1
1
|
.\" generated with Ronn/v0.7.3
|
2
2
|
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
3
|
.
|
4
|
-
.TH "BUNDLE\-CLEAN" "1" "
|
4
|
+
.TH "BUNDLE\-CLEAN" "1" "September 2022" "" ""
|
5
5
|
.
|
6
6
|
.SH "NAME"
|
7
7
|
\fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
|
@@ -0,0 +1,53 @@
|
|
1
|
+
.\" generated with Ronn/v0.7.3
|
2
|
+
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
|
+
.
|
4
|
+
.TH "BUNDLE\-CONSOLE" "1" "September 2022" "" ""
|
5
|
+
.
|
6
|
+
.SH "NAME"
|
7
|
+
\fBbundle\-console\fR \- Deprecated way to open an IRB session with the bundle pre\-loaded
|
8
|
+
.
|
9
|
+
.SH "SYNOPSIS"
|
10
|
+
\fBbundle console\fR [GROUP]
|
11
|
+
.
|
12
|
+
.SH "DESCRIPTION"
|
13
|
+
Starts an interactive Ruby console session in the context of the current bundle\.
|
14
|
+
.
|
15
|
+
.P
|
16
|
+
If no \fBGROUP\fR is specified, all gems in the \fBdefault\fR group in the Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR are preliminarily loaded\.
|
17
|
+
.
|
18
|
+
.P
|
19
|
+
If \fBGROUP\fR is specified, all gems in the given group in the Gemfile in addition to the gems in \fBdefault\fR group are loaded\. Even if the given group does not exist in the Gemfile, IRB console starts without any warning or error\.
|
20
|
+
.
|
21
|
+
.P
|
22
|
+
The environment variable \fBBUNDLE_CONSOLE\fR or \fBbundle config set console\fR can be used to change the shell from the following:
|
23
|
+
.
|
24
|
+
.IP "\(bu" 4
|
25
|
+
\fBirb\fR (default)
|
26
|
+
.
|
27
|
+
.IP "\(bu" 4
|
28
|
+
\fBpry\fR (https://github\.com/pry/pry)
|
29
|
+
.
|
30
|
+
.IP "\(bu" 4
|
31
|
+
\fBripl\fR (https://github\.com/cldwalker/ripl)
|
32
|
+
.
|
33
|
+
.IP "" 0
|
34
|
+
.
|
35
|
+
.P
|
36
|
+
\fBbundle console\fR uses irb by default\. An alternative Pry or Ripl can be used with \fBbundle console\fR by adjusting the \fBconsole\fR Bundler setting\. Also make sure that \fBpry\fR or \fBripl\fR is in your Gemfile\.
|
37
|
+
.
|
38
|
+
.SH "EXAMPLE"
|
39
|
+
.
|
40
|
+
.nf
|
41
|
+
|
42
|
+
$ bundle config set console pry
|
43
|
+
$ bundle console
|
44
|
+
Resolving dependencies\.\.\.
|
45
|
+
[1] pry(main)>
|
46
|
+
.
|
47
|
+
.fi
|
48
|
+
.
|
49
|
+
.SH "NOTES"
|
50
|
+
This command was deprecated in Bundler 2\.1 and will be removed in 3\.0\. Use \fBbin/console\fR script, which can be generated by \fBbundle gem <NAME>\fR\.
|
51
|
+
.
|
52
|
+
.SH "SEE ALSO"
|
53
|
+
Gemfile(5) \fIhttps://bundler\.io/man/gemfile\.5\.html\fR
|
@@ -0,0 +1,44 @@
|
|
1
|
+
bundle-console(1) -- Deprecated way to open an IRB session with the bundle pre-loaded
|
2
|
+
=====================================================================================
|
3
|
+
|
4
|
+
## SYNOPSIS
|
5
|
+
|
6
|
+
`bundle console` [GROUP]
|
7
|
+
|
8
|
+
## DESCRIPTION
|
9
|
+
|
10
|
+
Starts an interactive Ruby console session in the context of the current bundle.
|
11
|
+
|
12
|
+
If no `GROUP` is specified, all gems in the `default` group in the [Gemfile(5)](https://bundler.io/man/gemfile.5.html) are
|
13
|
+
preliminarily loaded.
|
14
|
+
|
15
|
+
If `GROUP` is specified, all gems in the given group in the Gemfile in addition
|
16
|
+
to the gems in `default` group are loaded. Even if the given group does not
|
17
|
+
exist in the Gemfile, IRB console starts without any warning or error.
|
18
|
+
|
19
|
+
The environment variable `BUNDLE_CONSOLE` or `bundle config set console` can be used to change
|
20
|
+
the shell from the following:
|
21
|
+
|
22
|
+
* `irb` (default)
|
23
|
+
* `pry` (https://github.com/pry/pry)
|
24
|
+
* `ripl` (https://github.com/cldwalker/ripl)
|
25
|
+
|
26
|
+
`bundle console` uses irb by default. An alternative Pry or Ripl can be used with
|
27
|
+
`bundle console` by adjusting the `console` Bundler setting. Also make sure that
|
28
|
+
`pry` or `ripl` is in your Gemfile.
|
29
|
+
|
30
|
+
## EXAMPLE
|
31
|
+
|
32
|
+
$ bundle config set console pry
|
33
|
+
$ bundle console
|
34
|
+
Resolving dependencies...
|
35
|
+
[1] pry(main)>
|
36
|
+
|
37
|
+
## NOTES
|
38
|
+
|
39
|
+
This command was deprecated in Bundler 2.1 and will be removed in 3.0.
|
40
|
+
Use `bin/console` script, which can be generated by `bundle gem <NAME>`.
|
41
|
+
|
42
|
+
## SEE ALSO
|
43
|
+
|
44
|
+
[Gemfile(5)](https://bundler.io/man/gemfile.5.html)
|
@@ -0,0 +1,13 @@
|
|
1
|
+
.\" generated with Ronn/v0.7.3
|
2
|
+
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
|
+
.
|
4
|
+
.TH "BUNDLE\-HELP" "1" "September 2022" "" ""
|
5
|
+
.
|
6
|
+
.SH "NAME"
|
7
|
+
\fBbundle\-help\fR \- Displays detailed help for each subcommand
|
8
|
+
.
|
9
|
+
.SH "SYNOPSIS"
|
10
|
+
\fBbundle help\fR [COMMAND]
|
11
|
+
.
|
12
|
+
.SH "DESCRIPTION"
|
13
|
+
Displays detailed help for the given subcommand\. You can specify a single \fBCOMMAND\fR at the same time\. When \fBCOMMAND\fR is omitted, help for \fBhelp\fR command will be displayed\.
|