Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.5.2 merge to master #36

Merged
merged 4 commits into from
Nov 26, 2019
Merged

1.5.2 merge to master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92bec54
Quote prefixes
homebysix Nov 26, 2019
d8fe94a
Skip redundant EndOfCheckPhase validation
homebysix Nov 26, 2019
a118192
Add URLGetter to min vers check
homebysix Nov 26, 2019
987d8aa
Bump version to 1.5.2
homebysix Nov 26, 2019
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For any hook in this repo you wish to use, add the following to your pre-commit

```yaml
- repo: https://github.com/homebysix/pre-commit-macadmin
rev: v1.5.1
rev: v1.5.2
hooks:
- id: check-plists
# - id: ...
Expand Down Expand Up @@ -114,7 +114,7 @@ When combining arguments that take lists (for example: `--required-keys`, `--cat

```yaml
- repo: https://github.com/homebysix/pre-commit-macadmin
rev: v1.5.1
rev: v1.5.2
hooks:
- id: check-munki-pkgsinfo
args: ['--catalogs', 'testing', 'stable', '--']
Expand All @@ -124,7 +124,7 @@ But if you also use the `--categories` argument, you would move the trailing `--

```yaml
- repo: https://github.com/homebysix/pre-commit-macadmin
rev: v1.5.1
rev: v1.5.2
hooks:
- id: check-munki-pkgsinfo
args: ['--catalogs', 'testing', 'stable', '--categories', 'Design', 'Engineering', 'Web Browsers', '--']
Expand All @@ -136,7 +136,7 @@ If it looks better to your eye, feel free to use a multi-line list for long argu

```yaml
- repo: https://github.com/homebysix/pre-commit-macadmin
rev: v1.5.1
rev: v1.5.2
hooks:
- id: check-munki-pkgsinfo
args: [
Expand Down
7 changes: 5 additions & 2 deletions pre_commit_hooks/check_autopkg_recipes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def validate_recipe_prefix(recipe, filename, prefix):
print(
"{}: identifier does not start with {}".format(
filename,
'one of: "%s"' % ", ".join(prefix) if len(prefix) > 1 else prefix[0],
'one of: "%s"' % '", "'.join(prefix) if len(prefix) > 1 else prefix[0],
)
)
passed = False
Expand Down Expand Up @@ -182,6 +182,7 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
"StopProcessingIf": "0.1.0",
"Symlinker": "0.1.0",
"Unarchiver": "0.1.0",
"URLGetter": "1.4",
"URLTextSearcher": "0.2.9",
"Versioner": "0.1.0",
}
Expand Down Expand Up @@ -297,7 +298,9 @@ def validate_required_proc_for_types(process, filename):
# For each recipe type, this is the list of processors that
# MUST exist in that type. Uses "OR" logic, not "AND."
required_proc_for_type = {
"download": ["EndOfCheckPhase"],
# Skipping EndOfCheckPhase because validate_endofcheckphase()
# already tests this.
# "download": ["EndOfCheckPhase"],
"munki": ["MunkiImporter"],
"pkg": ["AppPkgCreator", "PkgCreator", "PkgCopier"],
"install": ["InstallFromDMG", "Installer"],
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name="pre-commit-macadmin",
description="Pre-commit hooks for Mac admins, client engineers, and IT consultants.",
url="https://github.com/homebysix/pre-commit-macadmin",
version="1.5.1",
version="1.5.2",
author="Elliot Jordan",
author_email="[email protected]",
packages=["pre_commit_hooks"],
Expand Down