Skip to content

Commit

Permalink
Merge pull request #2740 from pre-commit/gem-file-bleh
Browse files Browse the repository at this point in the history
Revert "also ignore Gemfile in project"
  • Loading branch information
asottile committed Feb 1, 2023
2 parents 9868b1a + 1129e7d commit bfe1a72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion pre_commit/languages/ruby.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ def get_env_patch(
('GEM_HOME', os.path.join(venv, 'gems')),
('GEM_PATH', UNSET),
('BUNDLE_IGNORE_CONFIG', '1'),
('BUNDLE_GEMFILE', os.devnull),
)
if language_version == 'system':
patches += (
Expand Down
7 changes: 4 additions & 3 deletions tests/languages/ruby_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ def test_ruby_hook_language_version(tmp_path):
def test_ruby_with_bundle_disable_shared_gems(tmp_path):
workdir = tmp_path.joinpath('workdir')
workdir.mkdir()
# this Gemfile is missing `source`
workdir.joinpath('Gemfile').write_text('gem "lol_hai"\n')
# this needs a `source` or there's a deprecation warning
# silencing this with `BUNDLE_GEMFILE` breaks some tools (#2739)
workdir.joinpath('Gemfile').write_text('source ""\ngem "lol_hai"\n')
# this bundle config causes things to be written elsewhere
bundle = workdir.joinpath('.bundle')
bundle.mkdir()
Expand All @@ -134,5 +135,5 @@ def test_ruby_with_bundle_disable_shared_gems(tmp_path):
)

with cwd(workdir):
# `3.2.0` has new enough `gem` requiring `source` and reading `.bundle`
# `3.2.0` has new enough `gem` reading `.bundle`
test_ruby_hook_language_version(tmp_path)

0 comments on commit bfe1a72

Please sign in to comment.