rubygems-update 3.3.5 → 3.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +34 -0
- data/CONTRIBUTING.md +9 -6
- data/Manifest.txt +0 -1
- data/bundler/CHANGELOG.md +38 -0
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli/config.rb +10 -1
- data/bundler/lib/bundler/cli/doctor.rb +9 -1
- data/bundler/lib/bundler/cli/gem.rb +11 -1
- data/bundler/lib/bundler/cli/info.rb +10 -1
- data/bundler/lib/bundler/cli/install.rb +6 -25
- data/bundler/lib/bundler/cli/platform.rb +1 -1
- data/bundler/lib/bundler/definition.rb +4 -2
- data/bundler/lib/bundler/env.rb +1 -1
- data/bundler/lib/bundler/fetcher.rb +5 -5
- data/bundler/lib/bundler/man/bundle-add.1 +1 -1
- data/bundler/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/bundler/lib/bundler/man/bundle-cache.1 +1 -1
- data/bundler/lib/bundler/man/bundle-check.1 +1 -1
- data/bundler/lib/bundler/man/bundle-clean.1 +1 -1
- data/bundler/lib/bundler/man/bundle-config.1 +2 -2
- data/bundler/lib/bundler/man/bundle-config.1.ronn +1 -1
- data/bundler/lib/bundler/man/bundle-doctor.1 +1 -1
- data/bundler/lib/bundler/man/bundle-exec.1 +1 -1
- data/bundler/lib/bundler/man/bundle-gem.1 +1 -1
- data/bundler/lib/bundler/man/bundle-info.1 +1 -1
- data/bundler/lib/bundler/man/bundle-init.1 +1 -1
- data/bundler/lib/bundler/man/bundle-inject.1 +1 -1
- data/bundler/lib/bundler/man/bundle-install.1 +1 -1
- data/bundler/lib/bundler/man/bundle-list.1 +1 -1
- data/bundler/lib/bundler/man/bundle-lock.1 +1 -1
- data/bundler/lib/bundler/man/bundle-open.1 +1 -1
- data/bundler/lib/bundler/man/bundle-outdated.1 +1 -1
- data/bundler/lib/bundler/man/bundle-platform.1 +1 -1
- data/bundler/lib/bundler/man/bundle-pristine.1 +1 -1
- data/bundler/lib/bundler/man/bundle-remove.1 +1 -1
- data/bundler/lib/bundler/man/bundle-show.1 +1 -1
- data/bundler/lib/bundler/man/bundle-update.1 +1 -1
- data/bundler/lib/bundler/man/bundle-viz.1 +1 -1
- data/bundler/lib/bundler/man/bundle.1 +1 -1
- data/bundler/lib/bundler/man/gemfile.5 +1 -1
- data/bundler/lib/bundler/remote_specification.rb +7 -0
- data/bundler/lib/bundler/resolver.rb +5 -4
- data/bundler/lib/bundler/rubygems_ext.rb +13 -10
- data/bundler/lib/bundler/rubygems_integration.rb +2 -14
- data/bundler/lib/bundler/settings.rb +1 -1
- data/bundler/lib/bundler/shared_helpers.rb +1 -1
- data/bundler/lib/bundler/source_map.rb +15 -2
- data/bundler/lib/bundler/templates/newgem/standard.yml.tt +1 -0
- data/bundler/lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt +1 -1
- data/bundler/lib/bundler/version.rb +1 -1
- data/bundler/lib/bundler.rb +1 -1
- data/lib/rubygems/basic_specification.rb +8 -8
- data/lib/rubygems/bundler_version_finder.rb +3 -3
- data/lib/rubygems/command.rb +4 -4
- data/lib/rubygems/commands/cleanup_command.rb +6 -6
- data/lib/rubygems/commands/dependency_command.rb +20 -30
- data/lib/rubygems/commands/list_command.rb +1 -1
- data/lib/rubygems/commands/pristine_command.rb +12 -12
- data/lib/rubygems/commands/push_command.rb +8 -8
- data/lib/rubygems/commands/query_command.rb +1 -1
- data/lib/rubygems/commands/rdoc_command.rb +6 -6
- data/lib/rubygems/commands/search_command.rb +1 -1
- data/lib/rubygems/commands/setup_command.rb +8 -8
- data/lib/rubygems/commands/specification_command.rb +4 -4
- data/lib/rubygems/commands/update_command.rb +8 -6
- data/lib/rubygems/config_file.rb +4 -4
- data/lib/rubygems/doctor.rb +5 -5
- data/lib/rubygems/gem_runner.rb +5 -5
- data/lib/rubygems/install_update_options.rb +4 -4
- data/lib/rubygems/installer.rb +51 -12
- data/lib/rubygems/package.rb +10 -10
- data/lib/rubygems/platform.rb +42 -42
- data/lib/rubygems/query_utils.rb +16 -18
- data/lib/rubygems/remote_fetcher.rb +4 -4
- data/lib/rubygems/request_set/lockfile.rb +4 -4
- data/lib/rubygems/source.rb +6 -6
- data/lib/rubygems/source_list.rb +7 -7
- data/lib/rubygems/spec_fetcher.rb +25 -25
- data/lib/rubygems/specification.rb +47 -47
- data/lib/rubygems/specification_policy.rb +16 -16
- data/lib/rubygems/stub_specification.rb +16 -16
- data/lib/rubygems/uninstaller.rb +7 -7
- data/lib/rubygems/user_interaction.rb +12 -12
- data/lib/rubygems/version.rb +12 -9
- data/lib/rubygems.rb +7 -7
- data/rubygems-update.gemspec +1 -1
- data/test/rubygems/helper.rb +4 -4
- data/test/rubygems/test_gem.rb +2 -0
- data/test/rubygems/test_gem_command_manager.rb +1 -1
- data/test/rubygems/test_gem_commands_setup_command.rb +2 -0
- data/test/rubygems/test_gem_commands_update_command.rb +34 -0
- data/test/rubygems/test_gem_installer.rb +170 -58
- data/test/rubygems/test_gem_stream_ui.rb +1 -1
- data/test/rubygems/test_gem_version.rb +4 -0
- data/test/rubygems/test_rubygems.rb +5 -1
- data/test/rubygems/utilities.rb +4 -4
- metadata +3 -4
- data/bundler/lib/bundler/psyched_yaml.rb +0 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 44bceb50b42ff54b74695b3b7d3a6678ebb4d58e9a81f297887e34057345e4b2
|
|
4
|
+
data.tar.gz: 722d0df8d6543619bac428e5ebfcba2ca220630afd2d7e33d690cd8064e274d6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dfc9eef13e4634aa3353dec8c5c5fd24df2d529ebba360c66adda0a4b4bf8ea1ae76259dd2ba1220c1ea43f67329948e3926649d04c5b9f66756dcbf630a43fc
|
|
7
|
+
data.tar.gz: 61340bdc183a647db091c080b343ad938f3a77c161aed4905cb2b45f64e3af536e792df12a8591c19faa139d7b6fc6e8d579d429abe7f2b6f2e1ff3e343acfca
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,37 @@
|
|
|
1
|
+
# 3.3.8 / 2022-02-23
|
|
2
|
+
|
|
3
|
+
## Enhancements:
|
|
4
|
+
|
|
5
|
+
* Installs bundler 2.3.8 as a default gem.
|
|
6
|
+
|
|
7
|
+
# 3.3.7 / 2022-02-09
|
|
8
|
+
|
|
9
|
+
## Enhancements:
|
|
10
|
+
|
|
11
|
+
* Installs bundler 2.3.7 as a default gem.
|
|
12
|
+
|
|
13
|
+
## Documentation:
|
|
14
|
+
|
|
15
|
+
* Fix missing rdoc for `Gem::Version`. Pull request #5299 by nevans
|
|
16
|
+
|
|
17
|
+
# 3.3.6 / 2022-01-26
|
|
18
|
+
|
|
19
|
+
## Enhancements:
|
|
20
|
+
|
|
21
|
+
* Forbid downgrading past the originally shipped version on Ruby 3.1. Pull
|
|
22
|
+
request #5301 by deivid-rodriguez
|
|
23
|
+
* Support `--enable-load-relative` inside binstubs. Pull request #2929 by
|
|
24
|
+
deivid-rodriguez
|
|
25
|
+
* Let `Version#<=>` accept a String. Pull request #5275 by amatsuda
|
|
26
|
+
* Installs bundler 2.3.6 as a default gem.
|
|
27
|
+
|
|
28
|
+
## Bug fixes:
|
|
29
|
+
|
|
30
|
+
* Avoid `flock` on non Windows systems, since it causing issues on NFS
|
|
31
|
+
file systems. Pull request #5278 by deivid-rodriguez
|
|
32
|
+
* Fix `gem update --system` for already installed version of
|
|
33
|
+
`rubygems-update`. Pull request #5285 by loadkpi
|
|
34
|
+
|
|
1
35
|
# 3.3.5 / 2022-01-12
|
|
2
36
|
|
|
3
37
|
## Enhancements:
|
data/CONTRIBUTING.md
CHANGED
|
@@ -61,7 +61,7 @@ Everything needs to be run from the `bundler/` subfolder.
|
|
|
61
61
|
|
|
62
62
|
To setup bundler tests:
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
rake spec:parallel_deps
|
|
65
65
|
|
|
66
66
|
To run the entire bundler test suite in parallel (it takes a while):
|
|
67
67
|
|
|
@@ -84,11 +84,14 @@ in the rubygems repository.
|
|
|
84
84
|
### Contribution
|
|
85
85
|
|
|
86
86
|
These labels are made to guide contributors to issue/pull requests that they
|
|
87
|
-
can help with.
|
|
88
|
-
|
|
89
|
-
* **
|
|
90
|
-
|
|
91
|
-
|
|
87
|
+
can help with.
|
|
88
|
+
|
|
89
|
+
* **good first issue** - The issue described here is considered a good option
|
|
90
|
+
for a new contributor. We encourage new contributors though to work on
|
|
91
|
+
whichever issue they find most interesting, the ones labeled here as just
|
|
92
|
+
estimated to have a reasonable level of complexity for someone new to the
|
|
93
|
+
code base.
|
|
94
|
+
* **help wanted** - The issue has not been claimed for work, and is awaiting
|
|
92
95
|
willing volunteers!
|
|
93
96
|
|
|
94
97
|
|
data/Manifest.txt
CHANGED
|
@@ -155,7 +155,6 @@ bundler/lib/bundler/plugin/installer/git.rb
|
|
|
155
155
|
bundler/lib/bundler/plugin/installer/rubygems.rb
|
|
156
156
|
bundler/lib/bundler/plugin/source_list.rb
|
|
157
157
|
bundler/lib/bundler/process_lock.rb
|
|
158
|
-
bundler/lib/bundler/psyched_yaml.rb
|
|
159
158
|
bundler/lib/bundler/remote_specification.rb
|
|
160
159
|
bundler/lib/bundler/resolver.rb
|
|
161
160
|
bundler/lib/bundler/resolver/spec_group.rb
|
data/bundler/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,41 @@
|
|
|
1
|
+
# 2.3.8 (February 23, 2022)
|
|
2
|
+
|
|
3
|
+
## Bug fixes:
|
|
4
|
+
|
|
5
|
+
- Fix corrupted lockfile when running `bundle check` and having to re-resolve locally [#5344](https://github.com/rubygems/rubygems/pull/5344)
|
|
6
|
+
- Fix typo in multiple gemfiles warning [#5342](https://github.com/rubygems/rubygems/pull/5342)
|
|
7
|
+
|
|
8
|
+
## Documentation:
|
|
9
|
+
|
|
10
|
+
- Add clarification for bundle-config "with" option [#5346](https://github.com/rubygems/rubygems/pull/5346)
|
|
11
|
+
|
|
12
|
+
# 2.3.7 (February 9, 2022)
|
|
13
|
+
|
|
14
|
+
## Enhancements:
|
|
15
|
+
|
|
16
|
+
- Don't activate `yaml` gem from Bundler [#5277](https://github.com/rubygems/rubygems/pull/5277)
|
|
17
|
+
- Add Reverse Dependencies section to info command [#3966](https://github.com/rubygems/rubygems/pull/3966)
|
|
18
|
+
|
|
19
|
+
## Bug fixes:
|
|
20
|
+
|
|
21
|
+
- Don't silently persist `BUNDLE_WITH` and `BUNDLE_WITHOUT` envs locally [#5335](https://github.com/rubygems/rubygems/pull/5335)
|
|
22
|
+
- Fix `bundle config` inside an application saving configuration globally [#4152](https://github.com/rubygems/rubygems/pull/4152)
|
|
23
|
+
|
|
24
|
+
# 2.3.6 (January 26, 2022)
|
|
25
|
+
|
|
26
|
+
## Enhancements:
|
|
27
|
+
|
|
28
|
+
- Use `Gem::Platform.local` instead of `RUBY_PLATFORM` when displaying local platform [#5306](https://github.com/rubygems/rubygems/pull/5306)
|
|
29
|
+
- Lock standard.yml to the required ruby version [#5284](https://github.com/rubygems/rubygems/pull/5284)
|
|
30
|
+
- Use `Fiddle` in `bundle doctor` to check for dynamic library presence [#5173](https://github.com/rubygems/rubygems/pull/5173)
|
|
31
|
+
|
|
32
|
+
## Bug fixes:
|
|
33
|
+
|
|
34
|
+
- Fix edge case where gems were incorrectly removed from the lockfile [#5302](https://github.com/rubygems/rubygems/pull/5302)
|
|
35
|
+
- Fix `force_ruby_platform` ignored when lockfile includes current specific platform [#5304](https://github.com/rubygems/rubygems/pull/5304)
|
|
36
|
+
- Create minitest file to underscored path in "bundle gem" command with dashed gem name [#5273](https://github.com/rubygems/rubygems/pull/5273)
|
|
37
|
+
- Fix regression with old marshaled specs having null `required_rubygems_version` [#5291](https://github.com/rubygems/rubygems/pull/5291)
|
|
38
|
+
|
|
1
39
|
# 2.3.5 (January 12, 2022)
|
|
2
40
|
|
|
3
41
|
## Enhancements:
|
|
@@ -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-02-23".freeze
|
|
8
|
+
@git_commit_sha = "4e812b9ca5".freeze
|
|
9
9
|
@release = true
|
|
10
10
|
# end ivars
|
|
11
11
|
|
|
@@ -180,7 +180,7 @@ module Bundler
|
|
|
180
180
|
scopes = %w[global local].select {|s| options[s] }
|
|
181
181
|
case scopes.size
|
|
182
182
|
when 0
|
|
183
|
-
@scope = "global"
|
|
183
|
+
@scope = inside_app? ? "local" : "global"
|
|
184
184
|
@explicit_scope = false
|
|
185
185
|
when 1
|
|
186
186
|
@scope = scopes.first
|
|
@@ -189,6 +189,15 @@ module Bundler
|
|
|
189
189
|
"The options #{scopes.join " and "} were specified. Please only use one of the switches at a time."
|
|
190
190
|
end
|
|
191
191
|
end
|
|
192
|
+
|
|
193
|
+
private
|
|
194
|
+
|
|
195
|
+
def inside_app?
|
|
196
|
+
Bundler.root
|
|
197
|
+
true
|
|
198
|
+
rescue GemfileNotFound
|
|
199
|
+
false
|
|
200
|
+
end
|
|
192
201
|
end
|
|
193
202
|
end
|
|
194
203
|
end
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
require "rbconfig"
|
|
4
4
|
require "shellwords"
|
|
5
|
+
require "fiddle"
|
|
5
6
|
|
|
6
7
|
module Bundler
|
|
7
8
|
class CLI::Doctor
|
|
@@ -71,7 +72,14 @@ module Bundler
|
|
|
71
72
|
|
|
72
73
|
definition.specs.each do |spec|
|
|
73
74
|
bundles_for_gem(spec).each do |bundle|
|
|
74
|
-
bad_paths = dylibs(bundle).select
|
|
75
|
+
bad_paths = dylibs(bundle).select do |f|
|
|
76
|
+
begin
|
|
77
|
+
Fiddle.dlopen(f)
|
|
78
|
+
false
|
|
79
|
+
rescue Fiddle::DLError
|
|
80
|
+
true
|
|
81
|
+
end
|
|
82
|
+
end
|
|
75
83
|
if bad_paths.any?
|
|
76
84
|
broken_links[spec] ||= []
|
|
77
85
|
broken_links[spec].concat(bad_paths)
|
|
@@ -38,6 +38,7 @@ module Bundler
|
|
|
38
38
|
namespaced_path = name.tr("-", "/")
|
|
39
39
|
constant_name = name.gsub(/-[_-]*(?![_-]|$)/) { "::" }.gsub(/([_-]+|(::)|^)(.|$)/) { $2.to_s + $3.upcase }
|
|
40
40
|
constant_array = constant_name.split("::")
|
|
41
|
+
minitest_constant_name = constant_array.clone.tap {|a| a[-1] = "Test#{a[-1]}" }.join("::") # Foo::Bar => Foo::TestBar
|
|
41
42
|
|
|
42
43
|
use_git = Bundler.git_present? && options[:git]
|
|
43
44
|
|
|
@@ -69,6 +70,7 @@ module Bundler
|
|
|
69
70
|
:git => use_git,
|
|
70
71
|
:github_username => github_username.empty? ? "[USERNAME]" : github_username,
|
|
71
72
|
:required_ruby_version => required_ruby_version,
|
|
73
|
+
:minitest_constant_name => minitest_constant_name,
|
|
72
74
|
}
|
|
73
75
|
ensure_safe_gem_name(name, constant_array)
|
|
74
76
|
|
|
@@ -104,9 +106,17 @@ module Bundler
|
|
|
104
106
|
)
|
|
105
107
|
config[:test_task] = :spec
|
|
106
108
|
when "minitest"
|
|
109
|
+
# Generate path for minitest target file (FileList["test/**/test_*.rb"])
|
|
110
|
+
# foo => test/test_foo.rb
|
|
111
|
+
# foo-bar => test/foo/test_bar.rb
|
|
112
|
+
# foo_bar => test/test_foo_bar.rb
|
|
113
|
+
paths = namespaced_path.rpartition("/")
|
|
114
|
+
paths[2] = "test_#{paths[2]}"
|
|
115
|
+
minitest_namespaced_path = paths.join("")
|
|
116
|
+
|
|
107
117
|
templates.merge!(
|
|
108
118
|
"test/minitest/test_helper.rb.tt" => "test/test_helper.rb",
|
|
109
|
-
"test/minitest/test_newgem.rb.tt" => "test
|
|
119
|
+
"test/minitest/test_newgem.rb.tt" => "test/#{minitest_namespaced_path}.rb"
|
|
110
120
|
)
|
|
111
121
|
config[:test_task] = :test
|
|
112
122
|
when "test-unit"
|
|
@@ -73,7 +73,8 @@ module Bundler
|
|
|
73
73
|
gem_info << "\tBug Tracker: #{metadata["bug_tracker_uri"]}\n" if metadata.key?("bug_tracker_uri")
|
|
74
74
|
gem_info << "\tMailing List: #{metadata["mailing_list_uri"]}\n" if metadata.key?("mailing_list_uri")
|
|
75
75
|
gem_info << "\tPath: #{spec.full_gem_path}\n"
|
|
76
|
-
gem_info << "\tDefault Gem: yes" if spec.respond_to?(:default_gem?) && spec.default_gem?
|
|
76
|
+
gem_info << "\tDefault Gem: yes\n" if spec.respond_to?(:default_gem?) && spec.default_gem?
|
|
77
|
+
gem_info << "\tReverse Dependencies: \n\t\t#{gem_dependencies.join("\n\t\t")}" if gem_dependencies.any?
|
|
77
78
|
|
|
78
79
|
if name != "bundler" && spec.deleted_gem?
|
|
79
80
|
return Bundler.ui.warn "The gem #{name} has been deleted. Gemspec information is still available though:\n#{gem_info}"
|
|
@@ -81,5 +82,13 @@ module Bundler
|
|
|
81
82
|
|
|
82
83
|
Bundler.ui.info gem_info
|
|
83
84
|
end
|
|
85
|
+
|
|
86
|
+
def gem_dependencies
|
|
87
|
+
@gem_dependencies ||= Bundler.definition.specs.map do |spec|
|
|
88
|
+
dependency = spec.dependencies.find {|dep| dep.name == gem_name }
|
|
89
|
+
next unless dependency
|
|
90
|
+
"#{spec.name} (#{spec.version}) depends on #{gem_name} (#{dependency.requirements_list.join(", ")})"
|
|
91
|
+
end.compact.sort
|
|
92
|
+
end
|
|
84
93
|
end
|
|
85
94
|
end
|
|
@@ -135,32 +135,13 @@ module Bundler
|
|
|
135
135
|
end
|
|
136
136
|
|
|
137
137
|
def normalize_groups
|
|
138
|
-
options[:with] &&= options[:with].join(":").tr(" ", ":").split(":")
|
|
139
|
-
options[:without] &&= options[:without].join(":").tr(" ", ":").split(":")
|
|
140
|
-
|
|
141
138
|
check_for_group_conflicts_in_cli_options
|
|
142
139
|
|
|
143
|
-
|
|
144
|
-
Bundler.settings.set_command_option :without, nil
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
with -= options[:without] if options[:without]
|
|
149
|
-
|
|
150
|
-
without = options.fetch(:without, [])
|
|
151
|
-
without |= Bundler.settings[:without].map(&:to_s)
|
|
152
|
-
without -= options[:with] if options[:with]
|
|
153
|
-
|
|
154
|
-
options[:with] = with
|
|
155
|
-
options[:without] = without
|
|
156
|
-
|
|
157
|
-
unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with]
|
|
158
|
-
# need to nil them out first to get around validation for backwards compatibility
|
|
159
|
-
Bundler.settings.set_command_option :without, nil
|
|
160
|
-
Bundler.settings.set_command_option :with, nil
|
|
161
|
-
Bundler.settings.set_command_option :without, options[:without] - options[:with]
|
|
162
|
-
Bundler.settings.set_command_option :with, options[:with]
|
|
163
|
-
end
|
|
140
|
+
# need to nil them out first to get around validation for backwards compatibility
|
|
141
|
+
Bundler.settings.set_command_option :without, nil
|
|
142
|
+
Bundler.settings.set_command_option :with, nil
|
|
143
|
+
Bundler.settings.set_command_option :without, options[:without]
|
|
144
|
+
Bundler.settings.set_command_option :with, options[:with]
|
|
164
145
|
end
|
|
165
146
|
|
|
166
147
|
def normalize_settings
|
|
@@ -184,7 +165,7 @@ module Bundler
|
|
|
184
165
|
|
|
185
166
|
Bundler.settings.set_command_option_if_given :clean, options["clean"]
|
|
186
167
|
|
|
187
|
-
normalize_groups
|
|
168
|
+
normalize_groups if options[:without] || options[:with]
|
|
188
169
|
|
|
189
170
|
options[:force] = options[:redownload]
|
|
190
171
|
end
|
|
@@ -23,7 +23,7 @@ module Bundler
|
|
|
23
23
|
output << "No ruby version specified"
|
|
24
24
|
end
|
|
25
25
|
else
|
|
26
|
-
output << "Your platform is: #{
|
|
26
|
+
output << "Your platform is: #{Gem::Platform.local}"
|
|
27
27
|
output << "Your app has gems that work on these platforms:\n#{platforms.join("\n")}"
|
|
28
28
|
|
|
29
29
|
if ruby_version
|
|
@@ -265,7 +265,7 @@ module Bundler
|
|
|
265
265
|
else
|
|
266
266
|
# Run a resolve against the locally available gems
|
|
267
267
|
Bundler.ui.debug("Found changes from the lockfile, re-resolving dependencies because #{change_reason}")
|
|
268
|
-
expanded_dependencies = expand_dependencies(dependencies + metadata_dependencies,
|
|
268
|
+
expanded_dependencies = expand_dependencies(dependencies + metadata_dependencies, true)
|
|
269
269
|
Resolver.resolve(expanded_dependencies, source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms)
|
|
270
270
|
end
|
|
271
271
|
end
|
|
@@ -495,6 +495,7 @@ module Bundler
|
|
|
495
495
|
|
|
496
496
|
def current_ruby_platform_locked?
|
|
497
497
|
return false unless generic_local_platform == Gem::Platform::RUBY
|
|
498
|
+
return false if Bundler.settings[:force_ruby_platform] && !@platforms.include?(Gem::Platform::RUBY)
|
|
498
499
|
|
|
499
500
|
current_platform_locked?
|
|
500
501
|
end
|
|
@@ -781,6 +782,7 @@ module Bundler
|
|
|
781
782
|
else
|
|
782
783
|
{ :default => Source::RubygemsAggregate.new(sources, source_map) }.merge(source_map.direct_requirements)
|
|
783
784
|
end
|
|
785
|
+
source_requirements.merge!(source_map.locked_requirements) unless @remote
|
|
784
786
|
metadata_dependencies.each do |dep|
|
|
785
787
|
source_requirements[dep.name] = sources.metadata_source
|
|
786
788
|
end
|
|
@@ -827,7 +829,7 @@ module Bundler
|
|
|
827
829
|
end
|
|
828
830
|
|
|
829
831
|
def source_map
|
|
830
|
-
@source_map ||= SourceMap.new(sources, dependencies)
|
|
832
|
+
@source_map ||= SourceMap.new(sources, dependencies, @locked_specs)
|
|
831
833
|
end
|
|
832
834
|
end
|
|
833
835
|
end
|
data/bundler/lib/bundler/env.rb
CHANGED
|
@@ -71,7 +71,7 @@ module Bundler
|
|
|
71
71
|
def self.ruby_version
|
|
72
72
|
str = String.new(RUBY_VERSION)
|
|
73
73
|
str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
|
|
74
|
-
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{
|
|
74
|
+
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{Gem::Platform.local}]"
|
|
75
75
|
end
|
|
76
76
|
|
|
77
77
|
def self.git_version
|
|
@@ -240,7 +240,7 @@ module Bundler
|
|
|
240
240
|
raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
|
|
241
241
|
|
|
242
242
|
con = PersistentHTTP.new :name => "bundler", :proxy => :ENV
|
|
243
|
-
if gem_proxy =
|
|
243
|
+
if gem_proxy = Gem.configuration[:http_proxy]
|
|
244
244
|
con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy
|
|
245
245
|
end
|
|
246
246
|
|
|
@@ -251,8 +251,8 @@ module Bundler
|
|
|
251
251
|
end
|
|
252
252
|
|
|
253
253
|
ssl_client_cert = Bundler.settings[:ssl_client_cert] ||
|
|
254
|
-
(
|
|
255
|
-
|
|
254
|
+
(Gem.configuration.ssl_client_cert if
|
|
255
|
+
Gem.configuration.respond_to?(:ssl_client_cert))
|
|
256
256
|
if ssl_client_cert
|
|
257
257
|
pem = File.read(ssl_client_cert)
|
|
258
258
|
con.cert = OpenSSL::X509::Certificate.new(pem)
|
|
@@ -283,8 +283,8 @@ module Bundler
|
|
|
283
283
|
def bundler_cert_store
|
|
284
284
|
store = OpenSSL::X509::Store.new
|
|
285
285
|
ssl_ca_cert = Bundler.settings[:ssl_ca_cert] ||
|
|
286
|
-
(
|
|
287
|
-
|
|
286
|
+
(Gem.configuration.ssl_ca_cert if
|
|
287
|
+
Gem.configuration.respond_to?(:ssl_ca_cert))
|
|
288
288
|
if ssl_ca_cert
|
|
289
289
|
if File.directory? ssl_ca_cert
|
|
290
290
|
store.add_path ssl_ca_cert
|
|
@@ -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" "February 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" "February 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" "February 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" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-clean\fR \- Cleans up unused gems in your bundler directory
|
|
@@ -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\-CONFIG" "1" "
|
|
4
|
+
.TH "BUNDLE\-CONFIG" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-config\fR \- Set bundler configuration options
|
|
@@ -83,7 +83,7 @@ A space\-separated list of groups referencing gems to skip during installation\.
|
|
|
83
83
|
.
|
|
84
84
|
.TP
|
|
85
85
|
\fBwith\fR
|
|
86
|
-
A space\-separated list of groups referencing gems to include during installation\.
|
|
86
|
+
A space\-separated list of \fBoptional\fR groups referencing gems to include during installation\.
|
|
87
87
|
.
|
|
88
88
|
.SH "BUILD OPTIONS"
|
|
89
89
|
You can use \fBbundle config\fR to give Bundler the flags to pass to the gem installer every time bundler tries to install a particular gem\.
|
|
@@ -83,7 +83,7 @@ The options that can be configured are:
|
|
|
83
83
|
A space-separated list of groups referencing gems to skip during installation.
|
|
84
84
|
|
|
85
85
|
* `with`:
|
|
86
|
-
A space-separated list of groups referencing gems to include during installation.
|
|
86
|
+
A space-separated list of **optional** groups referencing gems to include during installation.
|
|
87
87
|
|
|
88
88
|
## BUILD OPTIONS
|
|
89
89
|
|
|
@@ -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\-GEM" "1" "
|
|
4
|
+
.TH "BUNDLE\-GEM" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-gem\fR \- Generate a project skeleton for creating a rubygem
|
|
@@ -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\-INFO" "1" "
|
|
4
|
+
.TH "BUNDLE\-INFO" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-info\fR \- Show information for the given gem in your bundle
|
|
@@ -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\-INIT" "1" "
|
|
4
|
+
.TH "BUNDLE\-INIT" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-init\fR \- Generates a Gemfile into the current working directory
|
|
@@ -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\-INJECT" "1" "
|
|
4
|
+
.TH "BUNDLE\-INJECT" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-inject\fR \- Add named gem(s) with version requirements to Gemfile
|
|
@@ -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\-INSTALL" "1" "
|
|
4
|
+
.TH "BUNDLE\-INSTALL" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-install\fR \- Install the dependencies specified in your Gemfile
|
|
@@ -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\-LOCK" "1" "
|
|
4
|
+
.TH "BUNDLE\-LOCK" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-lock\fR \- Creates / Updates a lockfile without installing
|
|
@@ -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\-OPEN" "1" "
|
|
4
|
+
.TH "BUNDLE\-OPEN" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-open\fR \- Opens the source directory for a gem in your bundle
|
|
@@ -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\-OUTDATED" "1" "
|
|
4
|
+
.TH "BUNDLE\-OUTDATED" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-outdated\fR \- List installed gems with newer versions available
|
|
@@ -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\-PLATFORM" "1" "
|
|
4
|
+
.TH "BUNDLE\-PLATFORM" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-platform\fR \- Displays platform compatibility information
|
|
@@ -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\-PRISTINE" "1" "
|
|
4
|
+
.TH "BUNDLE\-PRISTINE" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-pristine\fR \- Restores installed gems to their pristine condition
|
|
@@ -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\-SHOW" "1" "
|
|
4
|
+
.TH "BUNDLE\-SHOW" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-show\fR \- Shows all the gems in your bundle, or the path to a gem
|
|
@@ -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\-UPDATE" "1" "
|
|
4
|
+
.TH "BUNDLE\-UPDATE" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-update\fR \- Update your gems to the latest available versions
|
|
@@ -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\-VIZ" "1" "
|
|
4
|
+
.TH "BUNDLE\-VIZ" "1" "February 2022" "" ""
|
|
5
5
|
.
|
|
6
6
|
.SH "NAME"
|
|
7
7
|
\fBbundle\-viz\fR \- Generates a visual dependency graph for your Gemfile
|