Граф коммитов

357 Коммитов

Автор SHA1 Сообщение Дата
David Rodríguez 9995ce64a2
[bundler/bundler] Remove unnecessary assignment
https://github.com/bundler/bundler/commit/e483322519
2019-08-17 17:08:49 +09:00
David Rodríguez a2ca3a12ba
[bundler/bundler] Remove unnecessary `let`
Use shared helper instead.

https://github.com/bundler/bundler/commit/ef55470cc6
2019-08-17 17:08:49 +09:00
David Rodríguez 745b286161
[bundler/bundler] Move `lib` helper together with path helpers
https://github.com/bundler/bundler/commit/f2df73bdb4
2019-08-17 17:08:49 +09:00
David Rodríguez 50a91fcd10
[bundler/bundler] Reuse `lib` method
https://github.com/bundler/bundler/commit/4589a57852
2019-08-17 17:08:49 +09:00
David Rodríguez ef2d415802
[bundler/bundler] Remove duplicated method
https://github.com/bundler/bundler/commit/afdacd62ac
2019-08-17 17:08:49 +09:00
Kazuhiro NISHIYAMA ccbfb054b1
Fix typos 2019-08-17 13:57:12 +09:00
Hiroshi SHIBATA 02d0d424be
Revert "[bundler/bundler] Fixup #7297"
This reverts commit b8d759806f.

  It's accidentally picked from the upstream repository.
2019-08-16 14:52:03 +09:00
Hiroshi SHIBATA b8d759806f [bundler/bundler] Fixup #7297
https://github.com/bundler/bundler/commit/1a0161b970
2019-08-16 14:30:23 +09:00
Hiroshi SHIBATA 8cf90a2f80 [bundler/bundler] Fixed rubocop error
https://github.com/bundler/bundler/commit/9256177446
2019-08-16 14:30:23 +09:00
tommy 3b61019a89 [bundler/bundler] Add initial Bundler::BuildMetadata Spec
https://github.com/bundler/bundler/commit/c6458b2727
2019-08-16 14:30:23 +09:00
David Rodríguez b587e8c7f1 [bundler/bundler] Add `--[no-]git` option to `bundle gem`
I think using `--no-git` can be useful when creating gems inside
monorepos.

https://github.com/bundler/bundler/commit/154c687310
2019-08-16 14:30:23 +09:00
David Rodríguez cb71930351 [bundler/bundler] Remove unexistent folder from exemptions
https://github.com/bundler/bundler/commit/0b6d973543
2019-08-16 14:30:23 +09:00
David Rodríguez f48a61fb46 [bundler/bundler] Commit man pages to source control
This has the benefit that:

* Allows the installation of bundler as a default gem from rubygems to
include man pages.
* Removes the need to build man pages during our tests.
* Makes working with the manifest easier, because we only have source
controlled files, and not a mix of source control and generated files.

To make sure they never fall out of sync, we replace the previous
`man:build` CI task with a `man:check` task that makes sure the
generated man pages are up to date.

https://github.com/bundler/bundler/commit/23de1d0177
2019-08-16 14:30:23 +09:00
David Rodríguez 4913c9b6bf [bundler/bundler] Remove unexistent file from exemptions
https://github.com/bundler/bundler/commit/8601575490
2019-08-16 14:30:23 +09:00
David Rodríguez 94e26a97a1 [bundler/bundler] Bump rspec dependency to 3.8
Because we're using `config.bisect_runner` which is only available from
3.8.

https://github.com/bundler/bundler/commit/304a187f72
2019-08-16 14:30:23 +09:00
David Rodríguez 521a2d2beb [bundler/bundler] Revert "make system_bundle_bin_path helper and resolve failing tests for ruby < 2.6"
This reverts commit e63e844bc7444c6a489fcde0dc7011c6c4807edd.

It was introduced to resolve some failing tests at the cost of making
the intention of the spec much less clear.

Thanks to the previous fixes we have added to this spec, we can revert
that patch now.

https://github.com/bundler/bundler/commit/b29a40820f
2019-08-16 14:30:23 +09:00
David Rodríguez 5bff72c912 [bundler/bundler] Make sure spec fails if `bundle install` fails
https://github.com/bundler/bundler/commit/2ed2bbfdec
2019-08-16 14:30:23 +09:00
David Rodríguez 7ff0b4fec4 [bundler/bundler] Fix installation of system bundler
Previously it was being installed to the :bundle_path
(`/tmp/bundled_app/.bundle`), but the `bundle` helper uses the
`system_gem_path("bin/bundle")`. That means the first `bundle install`in
the spec was actually failing, but not affecting the test status because
of not being called as `bundle!`.

https://github.com/bundler/bundler/commit/ad75f75539
2019-08-16 14:30:23 +09:00
David Rodríguez 6c6c4c7388 [bundler/bundler] Use non deprecated way of setting bundler path
https://github.com/bundler/bundler/commit/6013c93e81
2019-08-16 14:30:23 +09:00
David Rodríguez ee1f3038f1 [bundler/bundler] Clarify spec description
https://github.com/bundler/bundler/commit/b2abde04aa
2019-08-16 14:30:23 +09:00
David Rodríguez 0aed0bd9ed [bundler/bundler] Bump rack and sinatra to latest versions
https://github.com/bundler/bundler/commit/09ecaf04fa
2019-08-16 14:30:23 +09:00
David Rodríguez 129657ab6a [bundler/bundler] Normalize style with other artifice files
https://github.com/bundler/bundler/commit/f11c9a2b3f
2019-08-16 14:30:23 +09:00
David Rodríguez 41534ce327 [bundler/bundler] Make spec pass more resiliently
Previously, if bundler-2.1.0.pre.1 would be installed globally, it would
fail. Now we force that a locally installed version of bundler is used,
so it always passed regardless of which bundler is installed globally.

https://github.com/bundler/bundler/commit/764d8e8fd1
2019-08-16 14:30:23 +09:00
David Rodríguez 3c23bb29ec [bundler/bundler] Remove unnecessary exclusions
https://github.com/bundler/bundler/commit/c189dfdde0
2019-08-16 14:30:23 +09:00
David Rodríguez 3f0e19c9fa [bundler/bundler] Enable retries on flaky spec
https://github.com/bundler/bundler/commit/da360659f7
2019-08-16 14:30:23 +09:00
Benoit Daloze 2b0f3aa095 [bundler/bundler] Use the standard RUBY_ENGINE_VERSION instead of JRUBY_VERSION
* RUBY_ENGINE and RUBY_ENGINE_VERSION are defined on every modern Ruby.
* There is no such constant as TRUFFLERUBY_VERSION or RBX_VERSION.

https://github.com/bundler/bundler/commit/f9d910403b
2019-08-16 14:30:23 +09:00
David Rodríguez 6711343d5a [bundler/bundler] Fix inconsistent lockfile order
When Gemfile would specify path sources as relative paths starting with
"./", the lockfile would have inconsistent order on `bundle install` and
`bundle update`.

https://github.com/bundler/bundler/commit/c7532ced89
2019-08-16 14:30:23 +09:00
David Rodríguez c11c8b69ea [bundler/bundler] Indentation tweak
https://github.com/bundler/bundler/commit/5978a88f33
2019-08-16 14:30:23 +09:00
Hiroshi SHIBATA ed9d59afc8
Added example filter for Linux of GitHub Actions. 2019-08-12 12:14:39 +09:00
Hiroshi SHIBATA 8a8f680f01
Re-use GITHUB_ACTION variables for filtering bundler examples. 2019-08-12 12:14:39 +09:00
Hiroshi SHIBATA bb2f24251f
GitHub Actions does not support ANSI color code. Skip failing examples. 2019-08-11 12:17:22 +09:00
ohbarye b1678338e5
Fix typo: duplicated the [skip-ci] 2019-08-09 16:23:49 -07:00
Hiroshi SHIBATA b3b2b55f7b
[bundler/bundler] The keys for RbConfig::CONFIG was String.
https://github.com/bundler/bundler/commit/ffc5e76335
2019-08-03 09:40:11 +09:00
Hiroshi SHIBATA 220f6aa01c
Explicitly ignored GEMRC environmental variable. 2019-08-03 09:30:00 +09:00
Hiroshi SHIBATA 4c72ca195d
Fixed up 365ee22d73ec73c119a842de271504e04bed6f45 2019-08-03 09:30:00 +09:00
Hiroshi SHIBATA 01d141938c
Fixed the broken example with ruby core structure. 2019-08-03 09:30:00 +09:00
David Rodríguez 7ed1fc527e
[bundler/bundler] Bump rubocop to 0.74.0
And reenable exclusion because the bug why we added them has been fixed.
See https://github.com/rubocop-hq/rubocop/issues/6861.

https://github.com/bundler/bundler/commit/bda63fcffc
2019-08-03 09:30:00 +09:00
David Rodríguez 1e63683795
[bundler/bundler] Bump automatiek to 0.2.0
https://github.com/bundler/bundler/commit/cd1abf8b3f
2019-08-03 09:30:00 +09:00
David Rodríguez 97f3ceeaa5
[bundler/bundler] Bump net-http-persistent to 3.0.1
* Adds an extra artifice task to vendorize new `connection_pool`
dependency.

* Cherry-pick's needed Windows fix not yet merged into master branch of
`net-http-persistent`.

* Update bundler usages to be compatible with the new version, and fix
unit specs.

https://github.com/bundler/bundler/commit/0575baa6bb
2019-08-03 09:30:00 +09:00
David Rodríguez 2b7e39f364
[bundler/bundler] Always set `cache_all` via config during tests
So that the behavior is the same regardless of the tested bundler
version.

https://github.com/bundler/bundler/commit/664549427a
2019-08-03 09:30:00 +09:00
David Rodríguez 267a72be80
[bundler/bundler] Enable `Style/UnneededInterpolation` cop
https://github.com/bundler/bundler/commit/4c6a3c3cf7
2019-08-03 09:30:00 +09:00
David Rodríguez e84e63230b
[bundler/bundler] Check for straneous quotes
And use single quotes consistenly.

https://github.com/bundler/bundler/commit/8b9fbbb2df
2019-08-03 09:30:00 +09:00
Samuel Giddins 4dea1356c3
[bundler/bundler] [CurrentRuby] Say we are ruby? when the generic local platform is Gem::Platform::RUBY
This allows us to always say we're ruby? when force_ruby_platform is
set, and fixes using gemspec & force_ruby_platform on windows.

https://github.com/bundler/bundler/commit/3cb89b7e5c
2019-08-03 09:30:00 +09:00
David Rodríguez 6fb73e6043
[bundler/bundler] Fully remove compatibility guard
https://github.com/bundler/bundler/commit/2a7a5daba0
2019-08-03 09:30:00 +09:00
David Rodríguez 452516f50f
[bundler/bundler] Remove development dependencies from gemspec
And refactor development setup.

https://github.com/bundler/bundler/commit/f288806d02
2019-08-03 09:30:00 +09:00
David Rodríguez 7255f55dba
[bundler/bundler] RUBY_ENGINE should always be defined after 1.8.7
https://github.com/bundler/bundler/commit/d6c9196d18
2019-08-03 09:30:00 +09:00
Hiroshi SHIBATA d4b1804b11
[bundler/bundler] Removed the environmental variables that are BUNDLE_USER_*.
It's affect with rspec examples and broke them.

https://github.com/bundler/bundler/commit/355a922073
2019-08-03 09:30:00 +09:00
Guillermo Guerrero e33dd659d4
[bundler/bundler] Move duplicated code to `before` blocks
https://github.com/bundler/bundler/commit/69bee117fb
2019-08-03 09:29:59 +09:00
David Rodríguez c4a2a9a381
[bundler/bundler] Remove now unused logic
https://github.com/bundler/bundler/commit/5b285685a4
2019-08-03 09:29:59 +09:00
David Rodríguez 322d4fe98d
[bundler/bundler] Remove unnecessary indirections
These specs are only run on bundler 2, so the compatibility method is
not needed.

https://github.com/bundler/bundler/commit/6cb28e3aeb
2019-08-03 09:29:59 +09:00
David Rodríguez 640dbdd155
[bundler/bundler] Better info about spec exclusions
https://github.com/bundler/bundler/commit/1ee77d9c55
2019-08-03 09:29:59 +09:00
David Rodríguez 51aaed128a
[bundler/bundler] Skip specs using `Process.fork` on Windows
https://github.com/bundler/bundler/commit/ebcb25a3c3
2019-08-03 09:29:59 +09:00
David Rodríguez d7487d6c08
[bundler/bundler] Try make some specs platform independent
https://github.com/bundler/bundler/commit/b5900e57a4
2019-08-03 09:29:59 +09:00
David Rodríguez 9d82962af3
[bundler/bundler] Check for generic lockfiles
https://github.com/bundler/bundler/commit/344a881592
2019-08-03 09:29:59 +09:00
David Rodríguez cb6abf551a
[bundler/bundler] Update error messages to be more precise
https://github.com/bundler/bundler/commit/9ddeeb1fe1
2019-08-03 09:29:59 +09:00
David Rodríguez a1c69991a5
[bundler/bundler] Use a consistent requirement in binstub
https://github.com/bundler/bundler/commit/50ccdb32c2
2019-08-03 09:29:59 +09:00
David Rodríguez 3e10b4a0be
[bundler/bundler] Indentation fixes
https://github.com/bundler/bundler/commit/2a44090cb6
2019-08-03 09:29:58 +09:00
David Rodríguez 3e83fbddfa
[bundler/bundler] Add a comment to explain the initial reset
https://github.com/bundler/bundler/commit/6d0a8f4128
2019-08-03 09:29:58 +09:00
David Rodríguez 55831647fb
[bundler/bundler] Move environment reset to the only test needing it
https://github.com/bundler/bundler/commit/6d3b809695
2019-08-03 09:29:58 +09:00
David Rodríguez 1b081cdd65
[bundler/bundler] Improve test to make it more independent from env
https://github.com/bundler/bundler/commit/038f0d7c37
2019-08-03 09:29:58 +09:00
David Rodríguez 26f651796c
[bundler/bundler] Remove unnecessary assignments
https://github.com/bundler/bundler/commit/3e5d4b2c42
2019-08-03 09:29:58 +09:00
MSP-Greg d6a2e082e6
[bundler/bundler] spec/bundler/shared_helpers_spec.rb - fixup after 7248
PR 7248 incorrectly changed a path calculation.  This reverts.

After running Azure Pipelines CI in my ruby/ruby fork and checking  the  'bundler' jobs, the error was apparent...

https://github.com/bundler/bundler/commit/811755b413
2019-08-03 09:29:58 +09:00
MSP-Greg 432285c004
[bundler/bundler] fix nested bundle exec's when bundler is a default gem
https://github.com/bundler/bundler/commit/537c0ab712
2019-08-03 09:29:58 +09:00
MSP-Greg 7b7caf9b55
[bundler/bundler] dsl_spec.rb - fix for Ruby core
https://github.com/bundler/bundler/commit/33892e1ed2
2019-08-03 09:29:58 +09:00
David Rodríguez 4f5e1b6ebf
[bundler/bundler] Remove `cache_command_is_package` feature flag
So that we handle the removal of `bundle cache` just like we'll handle
the removal of `bundle show` and `bundle console`.

https://github.com/bundler/bundler/commit/ff1a669efb
2019-08-03 09:29:58 +09:00
David Rodríguez 31541d7389
[bundler/bundler] Drop rubygems 2.5.0 and 2.5.1 support
https://github.com/bundler/bundler/commit/8ecd722b9f
2019-08-03 09:29:58 +09:00
David Rodríguez fc42423b8d
[bundler/bundler] Correct a rubygems test filter
It seems to pass under rubygems 2.5.2.

https://github.com/bundler/bundler/commit/062cd2be7c
2019-08-03 09:29:58 +09:00
David Rodríguez f5cd02f362
[bundler/bundler] Remove unnecessary test filter
Since it covers the whole range we support.

https://github.com/bundler/bundler/commit/c0b9d4e6c6
2019-08-03 09:29:58 +09:00
David Rodríguez a6ce001bab
[bundler/bundler] Change the refresh spec to not use `stubs_for`
We plan to incrementally populate this array in rubygems, so that will
break the test because the first time `find_by_name("rack")` is called
will make the `rack` gem available in the array.

We can test the same thing using some other way, which is more
appropriate anyways, because `Bundler.rubygems.find_name` is only used
inside `bundler` to look for the `bundler` gem itself whereas
`Bundler.rubygems.all_specs` is used in more places.

https://github.com/bundler/bundler/commit/49c519ef47
2019-08-03 09:29:58 +09:00
David Rodríguez a181df7542
[bundler/bundler] No need to make `Gem.refresh` a noop
The rubygems integration sets up a `post_reset` hook that resets the
specs back to what bundler knows after `Gem::Specification.reset` is
called (which is what `Gem.refresh` calls under the hood).

https://github.com/bundler/bundler/commit/3810f9945c
2019-08-03 09:29:58 +09:00
David Rodríguez f399a2b796
[bundler/bundler] Remove unnecessary line
It contains a typo, so it can't be needed.

https://github.com/bundler/bundler/commit/ef38c97fbf
2019-08-03 09:29:58 +09:00
David Rodríguez 56fd027aa6
[bundler/bundler] Tweak some quality specs to check more files
https://github.com/bundler/bundler/commit/98023e25de
2019-08-03 09:29:58 +09:00
David Rodríguez 812dfa44f0
[bundler/bundler] Refactor setting the encoding in quality specs
Instead of setting the encoding globally, set it when reading the files.

https://github.com/bundler/bundler/commit/e2a5c45e4d
2019-08-03 09:29:57 +09:00
David Rodríguez 6cbe818c66
[bundler/bundler] This seems to pass for me
https://github.com/bundler/bundler/commit/e31880b1ea
2019-08-03 09:29:57 +09:00
David Rodríguez dae6d303d5
[bundler/bundler] Remove now meaningless warning
https://github.com/bundler/bundler/commit/00b095b98f
2019-08-03 09:29:57 +09:00
David Rodríguez c1ca77281d
[bundler/bundler] Add all platforms to lockfile by default
https://github.com/bundler/bundler/commit/3dc509e645
2019-08-03 09:29:57 +09:00
David Rodríguez d8cd45cb1a
[bundler/bundler] Refactor some specs
https://github.com/bundler/bundler/commit/785c7af1f3
2019-08-03 09:29:57 +09:00
David Rodríguez cef81eb8cc
[bundler/bundler] Make some specs more explicit
https://github.com/bundler/bundler/commit/5e08e849ec
2019-08-03 09:29:57 +09:00
David Rodríguez b2baf6bb02
[bundler/bundler] Remove unnecessary begin-end block
And freeze the resulting hash to appease rubocop.

https://github.com/bundler/bundler/commit/f38ebff92f
2019-08-03 09:29:57 +09:00
David Rodríguez 0dad89c0fe
[bundler/bundler] Fix typos
https://github.com/bundler/bundler/commit/1bd9660780
2019-08-03 09:29:57 +09:00
David Rodríguez 8d9fc8466f
[bundler/bundler] Reuse `lockfile` spec helper
https://github.com/bundler/bundler/commit/e6a03f1102
2019-08-03 09:29:57 +09:00
David Rodríguez 2f1d52c266
[bundler/bundler] Remove unused filter
https://github.com/bundler/bundler/commit/102d6229d4
2019-08-03 09:29:57 +09:00
David Rodríguez aae244569b
[bundler/bundler] Reuse `gemfile` spec helper
https://github.com/bundler/bundler/commit/22de94d3b4
2019-08-03 09:29:57 +09:00
David Rodríguez 05c3b7c8a9
[bundler/bundler] More specific assertion
1.0.0 is such a common output, and it was hiding a crash in the test.

https://github.com/bundler/bundler/commit/c688337e24
2019-08-03 09:29:57 +09:00
David Rodríguez 13e5bf3454
[bundler/bundler] Remove redundant assertion
https://github.com/bundler/bundler/commit/7ac854dea1
2019-08-03 09:29:57 +09:00
David Rodríguez 2c262d137c
[bundler/bundler] Make spec easier to debug
https://github.com/bundler/bundler/commit/156629291e
2019-08-03 09:29:57 +09:00
Samuel Giddins 82bf064375
[bundler/bundler] [Package] Ensure uninstallable gems are _never_ installed
https://github.com/bundler/bundler/commit/899aeeebb0
2019-08-03 09:29:57 +09:00
Samuel Giddins d761a0f6ff
[bundler/bundler] [Package] Always resolve remotely for --all-platforms
https://github.com/bundler/bundler/commit/e45d2272ea
2019-08-03 09:29:56 +09:00
David Rodríguez 2ccb3db5fb
[bundler/bundler] Add missing mock
I'm not sure this test is useful but since it's there, it should be
complete.

https://github.com/bundler/bundler/commit/3e350089db
2019-08-03 09:29:56 +09:00
David Rodríguez e6dc7b5b5b
[bundler/bundler] Improve spec to be more realistic
https://github.com/bundler/bundler/commit/ca96316b97
2019-08-03 09:29:56 +09:00
David Rodríguez 4b1395ab4a
[bundler/bundler] Clearer MissingRevision git errors
https://github.com/bundler/bundler/commit/b47d23edf5
2019-08-03 09:29:56 +09:00
David Rodríguez bdcd1990ad
[bundler/bundler] Generate new gem development dependencies in Gemfile
https://github.com/bundler/bundler/commit/02177d0e10
2019-08-03 09:29:56 +09:00
David Rodríguez 86757abd25
[bundler/bundler] Fix local variable name
https://github.com/bundler/bundler/commit/3df138318f
2019-08-03 09:29:56 +09:00
David Rodríguez f2cc018adb
[bundler/bundler] Reuse `execute_bundle_gem` method
https://github.com/bundler/bundler/commit/773203ec5a
2019-08-03 09:29:56 +09:00
David Rodríguez 2771789302
[bundler/bundler] Don't re-resolve locked platform specific gems
https://github.com/bundler/bundler/commit/7da2bf75f5
2019-08-03 09:29:56 +09:00
David Rodríguez 72daf37dee
[bundler/bundler] Fix a typo on a spec comment
https://github.com/bundler/bundler/commit/1a853ad6ac
2019-08-03 09:29:56 +09:00
robuye 884f948a90
[bundler/bundler] bundler/inline should always install gems to system path
As discussed in the P/R, when `BUNDLE_PATH` env is set Bundler should
still install gems to the system path. `GEM_HOME` can be used to provide
different location if needed.

The test is added to document expected behavior of `bundler/inline`.

https://github.com/bundler/bundler/commit/ae419fd6f8
2019-08-03 09:29:56 +09:00
David Rodríguez 4089f8df1e
[bundler/bundler] Use real paths for `bundle clean`
https://github.com/bundler/bundler/commit/0646f9e286
2019-08-03 09:29:56 +09:00
David Rodríguez e59b57a3a7
[bundler/bundler] Fix thread leak in compact index specs
This spec was not stopping threads after itself. That would cause the
previous spec in the file (that checks that no threads are left behind)
to fail.

https://github.com/bundler/bundler/commit/81ad85b92d
2019-08-03 09:29:56 +09:00
Miklos Fazekas a12557dbfd
[bundler/bundler] Add `required_ruby_version` to gemspec template
https://github.com/bundler/bundler/commit/f47421f92d
2019-08-03 09:29:56 +09:00
David Rodríguez b014a2157f
[bundler/bundler] Factor out gemspec call inside `let`
https://github.com/bundler/bundler/commit/ae0ac190aa
2019-08-03 09:29:56 +09:00
David Rodríguez 10c0271f97
[bundler/bundler] Remove duplicated `let`'s
https://github.com/bundler/bundler/commit/43ffaab796
2019-08-03 09:29:55 +09:00
David Rodríguez a685a8643f
[bundler/bundler] Fix `rake release` not prompting for OTP code
Co-authored-by: Colby Swandale <me@colby.fyi>
Co-authored-by: Kevin Deisz <kevin.deisz@gmail.com>

https://github.com/bundler/bundler/commit/1b2bbc7364
2019-08-03 09:29:55 +09:00
David Rodríguez e111f38f34
[bundler/bundler] Fix file:// handling under Windows
Windows paths do not start with a slash, so we add an extra slash to
separate the host from the path in file:// urls. Otherwise "D:" is
parsed as the host segment in the URI.

The path for those URLs now starts with "/", so we ignore that leading
character when using the URI's path.

This reduces Windows CI spec failures from 429 to 355.

https://github.com/bundler/bundler/commit/1b7e274cbc
2019-08-03 09:29:55 +09:00
David Rodríguez c3ddd47ce7
[bundler/bundler] Normalize file:// handling in specs
https://github.com/bundler/bundler/commit/5946d62ad0
2019-08-03 09:29:55 +09:00
David Rodríguez d8d5e16305
[bundler/bundler] Use a clean gemspec for gem helper specs
https://github.com/bundler/bundler/commit/f694fe7f67
2019-08-03 09:29:55 +09:00
David Rodríguez 1c070c9c29
[bundler/bundler] Move "on releasing" to a RSpec context
So we can later add more tests with the same setup.

https://github.com/bundler/bundler/commit/21b4b6c49c
2019-08-03 09:29:55 +09:00
David Rodríguez 1a4bb80cd7
[bundler/bundler] Skip specs that need coloring on Windows
ANSI codes don't work there.

https://github.com/bundler/bundler/commit/4f05417ca7
2019-08-03 09:29:55 +09:00
David Rodríguez 38df9e18da
[bundler/bundler] Add missing no-color source specs
For consistency.

https://github.com/bundler/bundler/commit/279603ab42
2019-08-03 09:29:55 +09:00
David Rodríguez 214e992556
[bundler/bundler] Be explicit about coloring in specs that need that
https://github.com/bundler/bundler/commit/a4d04506ab
2019-08-03 09:29:55 +09:00
David Rodríguez 580e165873
[bundler/bundler] Respect color option when instantiating shells
Thor's base shell will be memoized the first time it is set. So if we
instantiate a no-color shell first, further instantiations of a bundler
shell will be initialized with a no-color shell by default. This is
caused some sources specs to fail, depending on the order they run.

See for example https://travis-ci.org/bundler/bundler/builds/500328994.

What we do to fix it is to reset the shell unless no-color is explicitly
specified. That way, further instantiations will rerun thor's internal
logic to choose the default shell.

https://github.com/bundler/bundler/commit/786b5d9894
2019-08-03 09:29:55 +09:00
Hiroshi SHIBATA 4c2255fd5c
[bundler/bundler] Added Ruby 2.6 to dsl.
https://github.com/bundler/bundler/commit/1892626858
2019-08-03 09:29:55 +09:00
Hiroshi SHIBATA e4364dbf6e
Fixed the code-style with the upstream rule. 2019-06-11 12:16:26 +09:00
Hiroshi SHIBATA 2c59c58a47 Fixed wrong BUNDLE_BIN_PATH for ruby core. 2019-06-09 12:44:31 +09:00
Hiroshi SHIBATA 44f7f093ab Added the condition for ruby_core repository. 2019-06-09 12:44:27 +09:00
Hiroshi SHIBATA 8f37629519 Merge bundler master from upstream.
Pick from 8dd59e3ba97eb80a599f8149f31bf40773b69dc0
2019-06-09 12:44:10 +09:00
Nobuyoshi Nakada 84c294eb0b
spec/bundler/bundler/dsl_spec.rb: fix exception to raise
When describing "Runtime errors", raise a `RuntimeError` as-is.
2019-06-05 15:51:48 +09:00
hsbt 3ac518f9bd Enabled to some bundler examples again.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-14 06:05:27 +00:00
hsbt 2e8b9aba9b Skip to failing examples on ruby core repository.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-14 06:03:58 +00:00
hsbt 59fa123204 Added rspec dependency for bundler examples.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-14 06:02:47 +00:00
hsbt 68ddd4d300 Merge Bundler 2.1.0.pre.1 as developed version from upstream.
a53709556b

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-04-14 06:01:35 +00:00
k0kubun 4d6e202977 Skip Bundler's test made fail by r67226
Possible fix would be https://github.com/bundler/bundler/pull/7038,
but Ruby script ending with `^~~` could be wrongly stripped by that?

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-03-14 13:47:10 +00:00
hsbt 19408c785c skip to not support color tty environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-27 12:40:19 +00:00
hsbt 7c2bbd1c7d Adjust the rubycop rules of Bundler upstream repository.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-20 10:43:23 +00:00
hsbt d04963501b Use ENV["BUNDLE_GEM"] instead of gem command provided by system ruby.
It break the examples of bundler. Because some examples detect the
  different version of system ruby than test target version like trunk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-18 13:33:25 +00:00
hsbt bef0c0a367 Fixup r66984. It breakes bundler's examples.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-18 09:53:13 +00:00
hsbt 3661d0521f The ruby core applied the difference structure from bundler upstream repository. We need to modify a configuration for test-bundler.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-18 09:46:25 +00:00
hsbt 0fadb48498 Ignore to add bundler lib direcotry if it is same as rubylibdir.
[Bug #15469][ruby-core:90742]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-05 04:58:46 +00:00
hsbt 8cca079d3b Fixup r66984. Update the location of bundler gemspec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-02-02 10:41:22 +00:00
hsbt e97741e12a Merge Bundler 2.0.1 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2019-01-04 13:10:58 +00:00
hsbt 36d93e831b Merge Bundler 1.17.2 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-12-11 11:02:41 +00:00
hsbt 91533d9ab1 Downgrade Bundler 1.17.x from 2.0.0.
We have the platform issue on heroku:
    * https://gist.github.com/schneems/26452540f6e2bbbcf2ea144f45f6b305
    * https://github.com/heroku/heroku-buildpack-ruby/issues/833

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-12-11 03:07:37 +00:00
hsbt cfa6c55347 Merge 2-0-stable branch from bundler/bundler.
It's release version of Bundler 2

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-12-04 23:33:29 +00:00
hsbt fc9509bdd2 Merge bundler-2.0.0.pre.2 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-27 12:08:19 +00:00
hsbt a943328194 Use stub executables generated by RubyGems istead of original executables.
It resolved the conflict issues when invoking `gem i rdoc` and the binstub
issues with Bundler and Rails.

  [Bug #5060][ruby-core:38257][Fix GH-2023]

  * https://github.com/rubygems/rubygems/pull/2338
  * https://github.com/heroku/heroku-buildpack-ruby/issues/829

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-25 01:20:00 +00:00
hsbt 3ec3d7d943 Switch to 2-0-stable branch of bundler/bundler repository from our fork repository.
https://github.com/bundler/bundler/tree/2-0-stable

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-16 23:27:37 +00:00
hsbt 8f4aa4fd2a Merge Bundler-2.0.0.pre1 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-12 00:53:15 +00:00
hsbt e6bf368cac Removed VCR cassettes files for reducing package size.
[Bug #14219]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-06 20:47:09 +00:00
hsbt 2fbbbba5bd Merge upstream changes from 2-0-stable branch of bundler/bundler.
* It update bundler 2 mode to bundler 3.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-04 01:14:48 +00:00
hsbt 59c8d50653 Added bundler as default gems. Revisit [Feature #12733]
* bin/*, lib/bundler/*, lib/bundler.rb, spec/bundler, man/*:
    Merge from latest stable branch of bundler/bundler repository and
    added workaround patches. I will backport them into upstream.
  * common.mk, defs/gmake.mk: Added `test-bundler` task for test suite
    of bundler.
  * tool/sync_default_gems.rb: Added sync task for bundler.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-11-02 23:07:56 +00:00
hsbt 7825e8363d Postponing the Bundler merge.
I faced a big issue about Bundler with ruby core.
  I have no time to resolve it issue before 2.5 final release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-22 23:08:05 +00:00
hsbt 4525cf2cd5 Merge release version of bundler-1.16.1 from upstream.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-21 09:22:15 +00:00
svn 0d862f34a8 * remove trailing spaces, append newline at EOF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-12 06:15:45 +00:00
hsbt a1a20cfaa2 Merge 1-16-stable branch of bundler.
It's rc version for bundler-1.16.1. I'm going to update it version
  after official release from bundler team.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-12 06:15:44 +00:00
hsbt c02174354e Follow up r60970 for bundler's examples.
r60970 break Gemfile.lock format with file protocol after bundle
  install/update. I addd hostname to these examples.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-07 08:08:56 +00:00
hsbt 6918546499 Ignored `bundle_ruby` example with Ruby core.
It was ignored with Bundler-1.15.x. It's regression at r60603.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-27 05:38:48 +00:00
usa f35fb6d36c Support Windows
* spec/bundler/spec_helper.rb: there are no reason to refuse ':' and '-' in the
  path of spec files.  especially, ':' is always contained on Windows.

* spec/bundler/spec/helper.rb: open3.rb is also supported on Windows.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-02 04:28:30 +00:00
hsbt 0b5432a7bd Fixed syntax error with ignore option order.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-02 04:27:33 +00:00
svn afdee4fb60 * remove trailing spaces, append newline at EOF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-01 23:30:00 +00:00
hsbt be7b592912 Update bundled bundler to 1.16.0.
* lib/bundler, spec/bundler: Merge bundler-1.16.0.
  * common.mk: rspec examples of bundler-1.16.0 needs require option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-01 23:29:38 +00:00
nobu 9de6c712b6 No more ubygems in trunk
[Fix GH-1711]
Author:    MSP-Greg <MSP-Greg@users.noreply.github.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-10-06 00:15:08 +00:00
hsbt 6a0ce11176 removed bin/bundle_ruby, It was ignored upstream gemspec.
* spec/bundler/other/*: Marked exclude tags for ruby repository.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-23 04:37:58 +00:00
hsbt 08a0927c0c Enabled temporary disabled examples of bundler rspec.
These are fails when merging at r59779. But these are
  working now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-19 00:37:38 +00:00
nobu 73adee9d6c cli_spec.rb: prefer BUNDLE_RUBY
* spec/bundler/bundler/cli_spec.rb: prefer BUNDLE_RUBY over env
  hack.  on macOS 10.11 or later, some system commands, e.g.
  /bin/sh and /usr/bin/env, clear DYLD_LIBRARY_PATH environment
  variable which is necessary to run not-yet installed command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-10 11:52:56 +00:00
nobu 19ae6bc70d spec/bundler/support: paths for ruby core
* spec/bundler/support/path.rb (Spec::Path#for_ruby_core?): helper
  method to tell whether running in Ruby Core or not.

* spec/bundler/support/helpers.rb (Spec::Helpers#bundle): use
  Path.bindir for ruby core case.

* spec/bundler/support/rubygems_ext.rb (Spec::Rubygems.setup):
  ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-09 11:30:32 +00:00
nobu 85cb9231a8 rubygems_ext.rb: use BUNDLE_GEM
* spec/bundler/support/rubygems_ext.rb (install_gems): use
  BUNDLE_GEM set in Makefile.in instead of the installed command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-09 10:20:38 +00:00
hsbt 8598f8c2dc Merge bundler to standard libraries.
rubygems 2.7.x depends bundler-1.15.x. This is preparation for
  rubygems and bundler migration.

  * lib/bundler.rb, lib/bundler/*: files of bundler-1.15.4
  * spec/bundler/*: rspec examples of bundler-1.15.4. I applied patches.
    * https://github.com/bundler/bundler/pull/6007
    * Exclude not working examples on ruby repository.
    * Fake ruby interpriter instead of installed ruby.
  * Makefile.in: Added test task named `test-bundler`. This task is only
    working macOS/linux yet. I'm going to support Windows environment later.
  * tool/sync_default_gems.rb: Added sync task for bundler.

  [Feature #12733][ruby-core:77172]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-08 08:45:41 +00:00