Skip to content

Commit a122169

Browse files
author
Robert Vincent
committed
Add r10k/g10k hooks.
1 parent 6723f54 commit a122169

File tree

4 files changed

+71
-28
lines changed

4 files changed

+71
-28
lines changed

.pre-commit-hooks.yaml

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,45 @@
1-
- id: puppet-validate
2-
name: Validate Puppet manifests
3-
description: Validate syntax of Puppet manifests
4-
entry: puppet-validate
5-
language: ruby
6-
files: \.pp$
7-
additional_dependencies: ['puppet']
1+
- id: epp-validate
2+
additional_dependencies: ['puppet']
3+
description: Validate syntax of Puppet EPP templates
4+
entry: epp-validate
5+
files: \.epp$
6+
language: ruby
7+
name: Validate EPP templates
88

9-
- id: erb-validate
10-
name: Validate ERB templates
11-
description: Validate syntax of Ruby ERB templates
12-
entry: erb-validate
13-
language: ruby
14-
files: \.erb$
9+
- id: erb-validate
10+
description: Validate syntax of Ruby ERB templates
11+
entry: erb-validate
12+
files: \.erb$
13+
language: ruby
14+
name: Validate ERB templates
1515

16-
- id: epp-validate
17-
name: Validate EPP templates
18-
description: Validate syntax of Puppet EPP templates
19-
entry: epp-validate
20-
language: ruby
21-
files: \.epp$
22-
additional_dependencies: ['puppet']
16+
- id: g10k-validate
17+
description: Validate syntax of Puppetfile using g10k
18+
entry: g10k-validate
19+
files: ^Puppetfile$
20+
language: ruby
21+
name: Validate g10k Puppetfile
2322

24-
- id: puppet-lint
25-
name: puppet-lint
26-
description: Check Puppet manifests for stylistic problems
27-
entry: puppet-lint
28-
language: ruby
29-
files: \.pp$
30-
additional_dependencies: ['puppet-lint']
23+
- id: puppet-lint
24+
additional_dependencies: ['puppet-lint']
25+
description: Check Puppet manifests for stylistic problems
26+
entry: puppet-lint
27+
files: \.pp$
28+
language: ruby
29+
name: puppet-lint
30+
31+
- id: puppet-validate
32+
additional_dependencies: ['puppet']
33+
description: Validate syntax of Puppet manifests
34+
entry: puppet-validate
35+
files: \.pp$
36+
language: ruby
37+
name: Validate Puppet manifests
38+
39+
- id: r10k-validate
40+
additional_dependencies: ['r10k']
41+
description: Validate syntax of Puppetfile using r10k
42+
entry: r10k-validate
43+
files: ^Puppetfile$
44+
language: ruby
45+
name: Validate r10k Puppetfile

pre_commit_fake_gem.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ Gem::Specification.new do |s|
66
s.description = 'pre-commit hooks for Puppet projects'
77

88
s.bindir = 'ruby-stubs'
9-
s.executables = ['puppet-validate', 'erb-validate', 'epp-validate']
9+
s.executables = ['erb-validate', 'epp-validate', 'g10k-validate', 'r10k-validate', 'puppet-validate']
1010
end

ruby-stubs/g10k-validate

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
require 'English'
2+
3+
status = 0
4+
ARGV.each do |file|
5+
output = `g10k -puppetfile "#{file}" check 2>&1`
6+
next if $CHILD_STATUS.exitstatus == 0
7+
puts "#{file}: failed g10k validation"
8+
puts output
9+
status = 1
10+
end
11+
12+
exit status
13+
14+
# vim: ft=ruby

ruby-stubs/r10k-validate

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
require 'English'
2+
3+
status = 0
4+
ARGV.each do |file|
5+
output = `(cd $(dirname "#{file}") && r10k puppetfile check 2>&1)`
6+
next if $CHILD_STATUS.exitstatus == 0
7+
puts "#{file}: failed r10k validation"
8+
puts output
9+
status = 1
10+
end
11+
12+
exit status
13+
14+
# vim: ft=ruby

0 commit comments

Comments
 (0)