Skip to content

Commit ddde365

Browse files
committed
Auto merge of #2051 - rubygems:seg-bundler-1-16, r=hsbt
Update vendored Bundler to v1.16.0 # Description: See https://github.com/bundler/bundler/releases/tag/v1.16.0 # Tasks: - [ ] Describe the problem / feature - [ ] Write tests - [ ] Write code to solve the problem - [ ] Get code review from coworkers / friends I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md).
2 parents 7106c8d + 6490108 commit ddde365

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,4 @@ matrix:
4848
env: "TEST_TOOL=rubygems YAML=syck"
4949
allow_failures:
5050
- rvm: ruby-head
51-
- rvm: 1.8.7
52-
env: "TEST_TOOL=bundler RGV=master"
53-
- rvm: 1.9.3
54-
env: "TEST_TOOL=bundler RGV=master"
55-
- rvm: 2.0.0
56-
env: "TEST_TOOL=bundler RGV=master"
51+

Manifest.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ bundler/exe/bundle
2727
bundler/exe/bundle_ruby
2828
bundler/exe/bundler
2929
bundler/lib/bundler.rb
30+
bundler/lib/bundler/build_metadata.rb
3031
bundler/lib/bundler/capistrano.rb
3132
bundler/lib/bundler/cli.rb
3233
bundler/lib/bundler/cli/add.rb
@@ -45,6 +46,7 @@ bundler/lib/bundler/cli/init.rb
4546
bundler/lib/bundler/cli/inject.rb
4647
bundler/lib/bundler/cli/install.rb
4748
bundler/lib/bundler/cli/issue.rb
49+
bundler/lib/bundler/cli/list.rb
4850
bundler/lib/bundler/cli/lock.rb
4951
bundler/lib/bundler/cli/open.rb
5052
bundler/lib/bundler/cli/outdated.rb
@@ -58,6 +60,7 @@ bundler/lib/bundler/cli/viz.rb
5860
bundler/lib/bundler/compact_index_client.rb
5961
bundler/lib/bundler/compact_index_client/cache.rb
6062
bundler/lib/bundler/compact_index_client/updater.rb
63+
bundler/lib/bundler/compatibility_guard.rb
6164
bundler/lib/bundler/constants.rb
6265
bundler/lib/bundler/current_ruby.rb
6366
bundler/lib/bundler/definition.rb
@@ -93,6 +96,7 @@ bundler/lib/bundler/installer/gem_installer.rb
9396
bundler/lib/bundler/installer/parallel_installer.rb
9497
bundler/lib/bundler/installer/standalone.rb
9598
bundler/lib/bundler/lazy_specification.rb
99+
bundler/lib/bundler/lockfile_generator.rb
96100
bundler/lib/bundler/lockfile_parser.rb
97101
bundler/lib/bundler/match_platform.rb
98102
bundler/lib/bundler/mirror.rb
@@ -105,9 +109,11 @@ bundler/lib/bundler/plugin/installer.rb
105109
bundler/lib/bundler/plugin/installer/git.rb
106110
bundler/lib/bundler/plugin/installer/rubygems.rb
107111
bundler/lib/bundler/plugin/source_list.rb
112+
bundler/lib/bundler/process_lock.rb
108113
bundler/lib/bundler/psyched_yaml.rb
109114
bundler/lib/bundler/remote_specification.rb
110115
bundler/lib/bundler/resolver.rb
116+
bundler/lib/bundler/resolver/spec_group.rb
111117
bundler/lib/bundler/retry.rb
112118
bundler/lib/bundler/ruby_dsl.rb
113119
bundler/lib/bundler/ruby_version.rb
@@ -116,13 +122,15 @@ bundler/lib/bundler/rubygems_gem_installer.rb
116122
bundler/lib/bundler/rubygems_integration.rb
117123
bundler/lib/bundler/runtime.rb
118124
bundler/lib/bundler/settings.rb
125+
bundler/lib/bundler/settings/validator.rb
119126
bundler/lib/bundler/setup.rb
120127
bundler/lib/bundler/shared_helpers.rb
121128
bundler/lib/bundler/similarity_detector.rb
122129
bundler/lib/bundler/source.rb
123130
bundler/lib/bundler/source/gemspec.rb
124131
bundler/lib/bundler/source/git.rb
125132
bundler/lib/bundler/source/git/git_proxy.rb
133+
bundler/lib/bundler/source/metadata.rb
126134
bundler/lib/bundler/source/path.rb
127135
bundler/lib/bundler/source/path/installer.rb
128136
bundler/lib/bundler/source/rubygems.rb
@@ -136,8 +144,10 @@ bundler/lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuran
136144
bundler/lib/bundler/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
137145
bundler/lib/bundler/stub_specification.rb
138146
bundler/lib/bundler/templates/Executable
147+
bundler/lib/bundler/templates/Executable.bundler
139148
bundler/lib/bundler/templates/Executable.standalone
140149
bundler/lib/bundler/templates/Gemfile
150+
bundler/lib/bundler/templates/gems.rb
141151
bundler/lib/bundler/templates/newgem/.travis.yml.tt
142152
bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
143153
bundler/lib/bundler/templates/newgem/Gemfile.tt
@@ -164,7 +174,9 @@ bundler/lib/bundler/ui/rg_proxy.rb
164174
bundler/lib/bundler/ui/shell.rb
165175
bundler/lib/bundler/ui/silent.rb
166176
bundler/lib/bundler/uri_credentials_filter.rb
177+
bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
167178
bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
179+
bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
168180
bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
169181
bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
170182
bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -219,6 +231,7 @@ bundler/lib/bundler/vendor/thor/lib/thor/shell/color.rb
219231
bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
220232
bundler/lib/bundler/vendor/thor/lib/thor/util.rb
221233
bundler/lib/bundler/vendor/thor/lib/thor/version.rb
234+
bundler/lib/bundler/vendored_fileutils.rb
222235
bundler/lib/bundler/vendored_molinillo.rb
223236
bundler/lib/bundler/vendored_persistent.rb
224237
bundler/lib/bundler/vendored_thor.rb
@@ -238,6 +251,7 @@ bundler/man/bundle-info.ronn
238251
bundler/man/bundle-init.ronn
239252
bundler/man/bundle-inject.ronn
240253
bundler/man/bundle-install.ronn
254+
bundler/man/bundle-list.ronn
241255
bundler/man/bundle-lock.ronn
242256
bundler/man/bundle-open.ronn
243257
bundler/man/bundle-outdated.ronn
@@ -249,7 +263,6 @@ bundler/man/bundle-update.ronn
249263
bundler/man/bundle-viz.ronn
250264
bundler/man/bundle.ronn
251265
bundler/man/gemfile.5.ronn
252-
bundler/man/index.txt
253266
hide_lib_for_update/note.txt
254267
lib/rubygems.rb
255268
lib/rubygems/available_set.rb

bundler

0 commit comments

Comments
 (0)