Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@ that have helped us get this far!

0.13.1 - 2017-02-16
===================
- Fix dummy gem for ruby local hooks
- Fix placeholder gem for ruby local hooks

0.13.0 - 2017-02-16
===================
Expand Down
2 changes: 1 addition & 1 deletion pre_commit/resources/empty_template_Makefile.PL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ExtUtils::MakeMaker;

WriteMakefile(
NAME => "PreCommitDummy",
NAME => "PreCommitPlaceholder",
VERSION => "0.0.1",
);
2 changes: 1 addition & 1 deletion pre_commit/resources/empty_template_go.mod
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module pre-commit-dummy-empty-module
module pre-commit-placeholder-empty-module
2 changes: 1 addition & 1 deletion pre_commit/resources/empty_template_package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "pre_commit_dummy_package",
"name": "pre_commit_placeholder_package",
"version": "0.0.0"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Gem::Specification.new do |s|
s.name = 'pre_commit_placeholder_package'
s.version = '0.0.0'
s.summary = 'placeholder gem for pre-commit hooks'
s.authors = ['Anthony Sottile']
end
2 changes: 1 addition & 1 deletion pre_commit/resources/empty_template_setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from setuptools import setup


setup(name='pre-commit-dummy-package', version='0.0.0')
setup(name='pre-commit-placeholder-package', version='0.0.0')
2 changes: 1 addition & 1 deletion pre_commit/store.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def _git_cmd(*args: str) -> None:

LOCAL_RESOURCES = (
'Cargo.toml', 'main.go', 'go.mod', 'main.rs', '.npmignore',
'package.json', 'pre_commit_dummy_package.gemspec', 'setup.py',
'package.json', 'pre_commit_placeholder_package.gemspec', 'setup.py',
'environment.yml', 'Makefile.PL',
'renv.lock', 'renv/activate.R', 'renv/LICENSE.renv',
)
Expand Down
14 changes: 7 additions & 7 deletions tests/commands/run_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,9 @@ def test_merge_conflict(cap_out, store, in_merge_conflict):

def test_merge_conflict_modified(cap_out, store, in_merge_conflict):
# Touch another file so we have unstaged non-conflicting things
assert os.path.exists('dummy')
with open('dummy', 'w') as dummy_file:
dummy_file.write('bar\nbaz\n')
assert os.path.exists('placeholder')
with open('placeholder', 'w') as placeholder_file:
placeholder_file.write('bar\nbaz\n')

ret, printed = _do_run(cap_out, store, in_merge_conflict, run_opts())
assert ret == 1
Expand Down Expand Up @@ -831,9 +831,9 @@ def test_local_hook_passes(cap_out, store, repo_with_passing_hook):
}
add_config_to_repo(repo_with_passing_hook, config)

with open('dummy.py', 'w') as staged_file:
with open('placeholder.py', 'w') as staged_file:
staged_file.write('"""TODO: something"""\n')
cmd_output('git', 'add', 'dummy.py')
cmd_output('git', 'add', 'placeholder.py')

_test_run(
cap_out,
Expand All @@ -858,9 +858,9 @@ def test_local_hook_fails(cap_out, store, repo_with_passing_hook):
}
add_config_to_repo(repo_with_passing_hook, config)

with open('dummy.py', 'w') as staged_file:
with open('placeholder.py', 'w') as staged_file:
staged_file.write('"""TODO: something"""\n')
cmd_output('git', 'add', 'dummy.py')
cmd_output('git', 'add', 'placeholder.py')

_test_run(
cap_out,
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def _make_conflict():
@pytest.fixture
def in_merge_conflict(tempdir_factory):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
open(os.path.join(path, 'dummy'), 'a').close()
cmd_output('git', 'add', 'dummy', cwd=path)
open(os.path.join(path, 'placeholder'), 'a').close()
cmd_output('git', 'add', 'placeholder', cwd=path)
git_commit(msg=in_merge_conflict.__name__, cwd=path)

conflict_path = tempdir_factory.get()
Expand Down
8 changes: 4 additions & 4 deletions tests/languages/ruby_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ def test_uses_system_if_both_gem_and_ruby_are_available(find_exe_mck):
def fake_gem_prefix(tmpdir):
gemspec = '''\
Gem::Specification.new do |s|
s.name = 'pre_commit_dummy_package'
s.name = 'pre_commit_placeholder_package'
s.version = '0.0.0'
s.summary = 'dummy gem for pre-commit hooks'
s.summary = 'placeholder gem for pre-commit hooks'
s.authors = ['Anthony Sottile']
end
'''
tmpdir.join('dummy_gem.gemspec').write(gemspec)
tmpdir.join('placeholder_gem.gemspec').write(gemspec)
yield Prefix(tmpdir)


Expand All @@ -53,7 +53,7 @@ def test_install_ruby_system(fake_gem_prefix):
# Should be able to activate and use rbenv install
with ruby.in_env(fake_gem_prefix, 'system'):
_, out, _ = cmd_output('gem', 'list')
assert 'pre_commit_dummy_package' in out
assert 'pre_commit_placeholder_package' in out


@xfailif_windows # pragma: win32 no cover
Expand Down