commit: 2f5ceb7da0eb16ee819aba6f0a4e4dcdd8417d42 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 24 13:07:20 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Apr 21 06:31:16 2023 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=2f5ceb7d
MissingEAPIBlankLine: new check for missing blank after EAPI Resolves: https://github.com/pkgcore/pkgcheck/issues/570 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> pyproject.toml | 4 ++-- src/pkgcheck/checks/whitespace.py | 17 +++++++++++++++-- .../BadCommandsCheck/BannedEapiCommand/expected.json | 2 +- .../BadCommandsCheck/BannedEapiCommand/fix.patch | 4 ++-- .../DeprecatedEapiCommand/expected.json | 2 +- .../BadCommandsCheck/DeprecatedEapiCommand/fix.patch | 4 ++-- .../repos/standalone/EapiCheck/BannedEapi/fix.patch | 3 ++- .../repos/standalone/EapiCheck/DeprecatedEapi/fix.patch | 3 ++- .../EbuildUnquotedVariable/expected.json | 6 +++--- .../EbuildUnquotedVariable/fix.patch | 4 ++-- .../InsintoCheck/DeprecatedInsinto/expected.json | 10 +++++----- .../standalone/InsintoCheck/DeprecatedInsinto/fix.patch | 6 +++--- .../standalone/IuseCheck/InvalidUseFlags/fix.patch | 2 +- .../standalone/IuseCheck/UnknownUseFlags/fix.patch | 2 +- .../MissingSlotDepCheck/MissingSlotDep/fix.patch | 2 +- .../ReadonlyVariable/expected.json | 2 +- .../ReadonlyVariableCheck/ReadonlyVariable/fix.patch | 3 ++- .../RedundantDodirCheck/RedundantDodir/expected.json | 6 +++--- .../RedundantDodirCheck/RedundantDodir/fix.patch | 12 ++++++------ .../RequiredUseCheck/RequiredUseDefaults/fix.patch | 2 +- .../standalone/RequiredUseCheck/UnstatedIuse/fix.patch | 2 +- .../standalone/SrcUriCheck/RedundantUriRename/fix.patch | 6 ++++-- .../standalone/SrcUriCheck/TarballAvailable/fix.patch | 2 +- .../EbuildVariableScope/expected.json | 2 +- .../VariableScopeCheck/EbuildVariableScope/fix.patch | 6 +++--- .../BadWhitespaceCharacter/expected.json | 6 +++--- .../WhitespaceCheck/BadWhitespaceCharacter/fix.patch | 4 ++-- .../WhitespaceCheck/MissingEAPIBlankLine/expected.json | 1 + .../WhitespaceCheck/MissingEAPIBlankLine/fix.patch | 9 +++++++++ .../BannedEapiCommand/BannedEapiCommand-0.ebuild | 1 + .../DeprecatedEapiCommand-0.ebuild | 1 + .../BadDependency/BadDependency-0.ebuild | 1 + .../InvalidBdepend/InvalidBdepend-0.ebuild | 1 + .../InvalidDepend/InvalidDepend-0.ebuild | 1 + .../InvalidPdepend/InvalidPdepend-0.ebuild | 1 + .../InvalidRdepend/InvalidRdepend-0.ebuild | 1 + .../MissingUseDepDefault/MissingUseDepDefault-0.ebuild | 1 + .../standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild | 1 + .../EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild | 1 + .../EbuildUnquotedVariable-0.ebuild | 1 + .../DeprecatedInsinto/DeprecatedInsinto-1.ebuild | 1 + .../IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild | 1 + .../IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild | 1 + .../MissingSlotDep/MissingSlotDep-0.ebuild | 1 + .../ReadonlyVariable/ReadonlyVariable-0.ebuild | 1 + .../RedundantDodir/RedundantDodir-0.ebuild | 1 + .../RequiredUseDefaults/RequiredUseDefaults-0.ebuild | 1 + .../RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild | 1 + .../RedundantUriRename/RedundantUriRename-0.ebuild | 1 + .../RedundantUriRename/RedundantUriRename-1.ebuild | 1 + .../TarballAvailable/TarballAvailable-0.ebuild | 1 + .../EbuildVariableScope/EbuildVariableScope-0.ebuild | 1 + .../BadWhitespaceCharacter-0.ebuild | 1 + .../MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild} | 3 +-- 54 files changed, 106 insertions(+), 55 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 880675c3..92e13cd3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ requires = [ "pathspec", "tree-sitter>=0.19.0", "snakeoil~=0.10.4", - "pkgcore~=0.12.20", + "pkgcore~=0.12.21", ] build-backend = "setuptools.build_meta" @@ -41,7 +41,7 @@ dependencies = [ "pathspec", "tree-sitter>=0.19.0", "snakeoil~=0.10.4", - "pkgcore~=0.12.18", + "pkgcore~=0.12.21", ] [project.optional-dependencies] diff --git a/src/pkgcheck/checks/whitespace.py b/src/pkgcheck/checks/whitespace.py index 823a8cfd..31667f9c 100644 --- a/src/pkgcheck/checks/whitespace.py +++ b/src/pkgcheck/checks/whitespace.py @@ -73,6 +73,12 @@ class BadWhitespaceCharacter(results.LineResult, results.Warning): ) +class MissingEAPIBlankLine(results.VersionResult, results.Style): + """Missing blank line after ``EAPI=`` assignment.""" + + desc = "missing blank line after EAPI= assignment" + + class WhitespaceData(NamedTuple): """Data format to register hardcoded list of bad whitespace characters.""" @@ -118,14 +124,15 @@ class WhitespaceCheck(Check): _source = sources.EbuildFileRepoSource known_results = frozenset( - [ + { WhitespaceFound, WrongIndentFound, DoubleEmptyLine, TrailingEmptyLine, NoFinalNewline, BadWhitespaceCharacter, - ] + MissingEAPIBlankLine, + } ) _indent_regex = re.compile("^\t* \t+") @@ -141,8 +148,14 @@ class WhitespaceCheck(Check): leading = [] indent = [] double_empty = [] + eapi_lineno = None for lineno, line in enumerate(pkg.lines, 1): + if line.startswith("EAPI="): + eapi_lineno = lineno + elif eapi_lineno is not None and lineno == eapi_lineno + 1 and line != "\n": + yield MissingEAPIBlankLine(pkg=pkg) + for match in self.bad_whitespace_regex.finditer(line): yield BadWhitespaceCharacter( repr(match.group("char")), diff --git a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/expected.json b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/expected.json index ea79dfac..dee93d43 100644 --- a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/expected.json +++ b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/expected.json @@ -1 +1 @@ -{"__class__": "BannedEapiCommand", "category": "BadCommandsCheck", "package": "BannedEapiCommand", "version": "0", "line": "dohtml doc/*", "lineno": 8, "command": "dohtml", "eapi": "7"} +{"__class__": "BannedEapiCommand", "category": "BadCommandsCheck", "package": "BannedEapiCommand", "version": "0", "line": "dohtml doc/*", "lineno": 9, "command": "dohtml", "eapi": "7"} diff --git a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch index 5cce0057..180e7f03 100644 --- a/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch +++ b/testdata/data/repos/standalone/BadCommandsCheck/BannedEapiCommand/fix.patch @@ -1,9 +1,9 @@ diff -Naur standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild fixed/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild --- standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild 2019-10-01 15:48:21.121467232 -0600 +++ fixed/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild 2019-10-01 15:50:51.970090195 -0600 -@@ -5,5 +5,6 @@ +@@ -6,5 +6,6 @@ LICENSE="BSD" - + src_install() { - dohtml doc/* + docinto html diff --git a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/expected.json b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/expected.json index 4e71be0a..a1186afd 100644 --- a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/expected.json +++ b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/expected.json @@ -1 +1 @@ -{"__class__": "DeprecatedEapiCommand", "category": "BadCommandsCheck", "package": "DeprecatedEapiCommand", "version": "0", "line": "dohtml doc/*", "lineno": 8, "command": "dohtml", "eapi": "6"} +{"__class__": "DeprecatedEapiCommand", "category": "BadCommandsCheck", "package": "DeprecatedEapiCommand", "version": "0", "line": "dohtml doc/*", "lineno": 9, "command": "dohtml", "eapi": "6"} diff --git a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch index eafea12c..894f69c5 100644 --- a/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch +++ b/testdata/data/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/fix.patch @@ -1,9 +1,9 @@ diff -Naur standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild fixed/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild --- standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild 2019-10-01 15:50:01.517881845 -0600 +++ fixed/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild 2019-10-01 15:51:40.877292175 -0600 -@@ -5,5 +5,6 @@ +@@ -6,5 +6,6 @@ LICENSE="BSD" - + src_install() { - dohtml doc/* + docinto html diff --git a/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch b/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch index c8453021..c42befcd 100644 --- a/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch +++ b/testdata/data/repos/standalone/EapiCheck/BannedEapi/fix.patch @@ -1,9 +1,10 @@ diff -Naur standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild fixed/EapiCheck/BannedEapi/BannedEapi-0.ebuild --- standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild 2019-09-15 03:05:12.832870282 -0600 +++ fixed/EapiCheck/BannedEapi/BannedEapi-0.ebuild 2019-09-15 03:11:08.602303656 -0600 -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ -EAPI=1 +EAPI=7 + DESCRIPTION="Ebuild using banned EAPI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch b/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch index b5be79b8..efea8671 100644 --- a/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch +++ b/testdata/data/repos/standalone/EapiCheck/DeprecatedEapi/fix.patch @@ -1,9 +1,10 @@ diff -Naur standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild fixed/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild --- standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild 2019-09-15 03:08:00.380545715 -0600 +++ fixed/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild 2019-09-15 03:11:41.260435170 -0600 -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ -EAPI=5 +EAPI=7 + DESCRIPTION="Ebuild using deprecated EAPI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json index ab08e2be..5f4daa15 100644 --- a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json +++ b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/expected.json @@ -1,3 +1,3 @@ -{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "FILESDIR", "lines": [9, 19]} -{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "T", "lines": [25, 27, 41, 42]} -{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "WORKDIR", "lines": [34]} +{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "FILESDIR", "lines": [10, 20]} +{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "T", "lines": [26, 28, 42, 43]} +{"__class__": "EbuildUnquotedVariable", "category": "EbuildUnquotedVariablesCheck", "package": "EbuildUnquotedVariable", "version": "0", "variable": "WORKDIR", "lines": [35]} diff --git a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch index d1172534..768a77a5 100644 --- a/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch +++ b/testdata/data/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/fix.patch @@ -1,6 +1,6 @@ --- standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild 2022-05-18 20:27:34.657647175 +0200 +++ fixed/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild 2022-05-18 20:50:00.271294657 +0200 -@@ -6,7 +6,7 @@ +@@ -7,7 +7,7 @@ S=${WORKDIR}/${PV} # ok PATCHES=( @@ -9,7 +9,7 @@ "${FILESDIR}"/foo.patch # ok "${FILESDIR}/foo.patch" # ok ) -@@ -16,28 +16,28 @@ +@@ -17,28 +17,28 @@ : fi diff --git a/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/expected.json b/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/expected.json index 3ae55712..fdff7886 100644 --- a/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/expected.json +++ b/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/expected.json @@ -3,8 +3,8 @@ {"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "0", "line": "insinto /etc/init.d", "lineno": 11, "cmd": "doinitd or newinitd"} {"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "0", "line": "insinto /etc/pam.d", "lineno": 13, "cmd": "dopamd or newpamd from pam.eclass"} {"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "0", "line": "insinto /usr/share/applications", "lineno": 15, "cmd": "domenu or newmenu from desktop.eclass"} -{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}", "lineno": 8, "cmd": "docinto/dodoc"} -{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/\"${PF}\"", "lineno": 10, "cmd": "docinto/dodoc"} -{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}", "lineno": 12, "cmd": "docinto/dodoc"} -{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}/examples", "lineno": 14, "cmd": "docinto/dodoc"} -{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/\"${PF}\"/examples", "lineno": 16, "cmd": "docinto/dodoc"} +{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}", "lineno": 9, "cmd": "docinto/dodoc"} +{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/\"${PF}\"", "lineno": 11, "cmd": "docinto/dodoc"} +{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}", "lineno": 13, "cmd": "docinto/dodoc"} +{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/${PF}/examples", "lineno": 15, "cmd": "docinto/dodoc"} +{"__class__": "DeprecatedInsinto", "category": "InsintoCheck", "package": "DeprecatedInsinto", "version": "1", "line": "insinto /usr/share/doc/\"${PF}\"/examples", "lineno": 17, "cmd": "docinto/dodoc"} diff --git a/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/fix.patch b/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/fix.patch index df268c7c..0dab9656 100644 --- a/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/fix.patch +++ b/testdata/data/repos/standalone/InsintoCheck/DeprecatedInsinto/fix.patch @@ -3,7 +3,7 @@ diff -Naur standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild +++ fixed/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild 2020-01-21 13:28:02.414341321 -0700 @@ -4,14 +4,9 @@ LICENSE="BSD" - + src_install() { - insinto /etc/conf.d - doins foo @@ -24,9 +24,9 @@ diff -Naur standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-0.ebuild diff -Naur standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild fixed/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild --- standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild 2020-01-21 13:20:18.815286720 -0700 +++ fixed/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild 2020-01-21 13:26:43.359992323 -0700 -@@ -5,14 +5,11 @@ +@@ -6,14 +6,11 @@ LICENSE="BSD" - + src_install() { - insinto /usr/share/doc/${PF} - doins foo diff --git a/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch b/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch index e6b11f7e..a05b05ff 100644 --- a/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch +++ b/testdata/data/repos/standalone/IuseCheck/InvalidUseFlags/fix.patch @@ -10,7 +10,7 @@ diff -Naur standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-0.ebuild fixed/I diff -Naur standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild fixed/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild --- standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild 2021-05-24 04:15:45.921607273 -0600 +++ fixed/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild 2021-05-24 04:26:36.519704480 -0600 -@@ -3,4 +3,4 @@ +@@ -4,4 +4,4 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" LICENSE="BSD" diff --git a/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch b/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch index a3c52922..ebac0b50 100644 --- a/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch +++ b/testdata/data/repos/standalone/IuseCheck/UnknownUseFlags/fix.patch @@ -11,7 +11,7 @@ diff -Naur standalone/IuseCheck/UnknownUseFlags/metadata.xml fixed/IuseCheck/Unk diff -Naur standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild fixed/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild --- standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild 2021-05-24 04:16:22.701404227 -0600 +++ fixed/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild 2021-05-24 04:22:44.096668337 -0600 -@@ -3,4 +3,4 @@ +@@ -4,4 +4,4 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" LICENSE="BSD" diff --git a/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch b/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch index 0bb7501f..6f405e60 100644 --- a/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch +++ b/testdata/data/repos/standalone/MissingSlotDepCheck/MissingSlotDep/fix.patch @@ -1,7 +1,7 @@ diff -Naur standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild fixed/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild --- standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild 2019-11-28 01:46:30.606468149 -0700 +++ fixed/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild 2019-11-28 01:50:03.520400413 -0700 -@@ -3,5 +3,5 @@ +@@ -4,5 +4,5 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" LICENSE="BSD" diff --git a/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/expected.json b/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/expected.json index f51bc804..94cc7ae4 100644 --- a/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/expected.json +++ b/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/expected.json @@ -1 +1 @@ -{"__class__": "ReadonlyVariable", "category": "ReadonlyVariableCheck", "package": "ReadonlyVariable", "version": "0", "line": "PV=\"5\"", "lineno": 2, "variable": "PV"} +{"__class__": "ReadonlyVariable", "category": "ReadonlyVariableCheck", "package": "ReadonlyVariable", "version": "0", "line": "PV=\"5\"", "lineno": 3, "variable": "PV"} diff --git a/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/fix.patch b/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/fix.patch index e776beef..50da27d2 100644 --- a/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/fix.patch +++ b/testdata/data/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/fix.patch @@ -1,8 +1,9 @@ diff -Naur standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild fixed/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild --- standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild 2021-03-17 00:53:28.492690175 -0600 +++ fixed/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild 2021-03-17 00:56:13.093297393 -0600 -@@ -1,5 +1,4 @@ +@@ -1,6 +1,5 @@ EAPI=7 + -PV="5" DESCRIPTION="Ebuild that assigns read-only variable in global scope" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; diff --git a/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/expected.json b/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/expected.json index 02e221f3..7f2d0747 100644 --- a/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/expected.json +++ b/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/expected.json @@ -1,3 +1,3 @@ -{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/bar", "lineno": 9, "cmd": "insinto"} -{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/bin", "lineno": 19, "cmd": "exeinto"} -{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/doc", "lineno": 24, "cmd": "docinto"} +{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/bar", "lineno": 10, "cmd": "insinto"} +{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/bin", "lineno": 20, "cmd": "exeinto"} +{"__class__": "RedundantDodir", "category": "RedundantDodirCheck", "package": "RedundantDodir", "version": "0", "line": "dodir /foo/doc", "lineno": 25, "cmd": "docinto"} diff --git a/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/fix.patch b/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/fix.patch index 1748b44d..7ece1dd6 100644 --- a/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/fix.patch +++ b/testdata/data/repos/standalone/RedundantDodirCheck/RedundantDodir/fix.patch @@ -1,22 +1,22 @@ diff -Naur standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild fixed/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild --- standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild 2020-01-25 20:21:40.686366299 -0700 +++ fixed/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild 2020-01-25 20:23:11.888699916 -0700 -@@ -6,7 +6,6 @@ - +@@ -7,7 +7,6 @@ + src_install() { touch blah - dodir /foo/bar insinto /foo/bar doins blah - -@@ -16,12 +15,10 @@ + +@@ -17,12 +16,10 @@ doins blah - + touch blaz - dodir /foo/bin exeinto /foo/bin doexe blaz - + touch blob - dodir /foo/doc docinto /foo/doc diff --git a/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch b/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch index 0289749a..cdfec099 100644 --- a/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch +++ b/testdata/data/repos/standalone/RequiredUseCheck/RequiredUseDefaults/fix.patch @@ -1,7 +1,7 @@ diff -Naur standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild fixed/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild --- standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild 2019-11-23 13:59:36.895606367 -0700 +++ fixed/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild 2019-11-23 14:00:49.199924482 -0700 -@@ -4,5 +4,5 @@ +@@ -5,5 +5,5 @@ SLOT="0" LICENSE="BSD" KEYWORDS="~amd64" diff --git a/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch b/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch index c6da9f1a..d55c65f9 100644 --- a/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch +++ b/testdata/data/repos/standalone/RequiredUseCheck/UnstatedIuse/fix.patch @@ -1,7 +1,7 @@ diff -Naur standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild fixed/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild --- standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-11-23 13:50:52.531217164 -0700 +++ fixed/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild 2019-11-23 13:51:47.992485035 -0700 -@@ -3,5 +3,5 @@ +@@ -4,5 +4,5 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" LICENSE="BSD" diff --git a/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch index 6217a025..557f3c87 100644 --- a/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch +++ b/testdata/data/repos/standalone/SrcUriCheck/RedundantUriRename/fix.patch @@ -1,8 +1,9 @@ diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild --- standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild 2020-01-13 19:03:24.208241614 -0700 +++ fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild 2020-01-13 19:07:15.539341286 -0700 -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ EAPI=7 + DESCRIPTION="Ebuild with reundant rename in SRC_URI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; -SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz" @@ -12,8 +13,9 @@ diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild diff -Naur standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild --- standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild 2020-01-13 19:05:11.310754211 -0700 +++ fixed/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild 2020-01-13 19:07:22.031371966 -0700 -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ EAPI=7 + DESCRIPTION="Ebuild with reundant rename in SRC_URI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; -SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz" diff --git a/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch b/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch index 2b1615fa..1f8b1974 100644 --- a/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch +++ b/testdata/data/repos/standalone/SrcUriCheck/TarballAvailable/fix.patch @@ -7,7 +7,7 @@ diff -Naur standalone/SrcUriCheck/TarballAvailable/Manifest fixed/SrcUriCheck/Ta diff -Naur standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild fixed/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild --- standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild 2019-08-23 17:07:52.527170936 -0600 +++ fixed/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild 2019-08-23 17:16:30.793240821 -0600 -@@ -2,9 +2,8 @@ +@@ -3,9 +3,8 @@ DESCRIPTION="Ebuild with SRC_URI using .zip archive when .tar* is available" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SRC_URI=" diff --git a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/expected.json b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/expected.json index 3388dda4..48c53690 100644 --- a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/expected.json +++ b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/expected.json @@ -1 +1 @@ -{"__class__": "EbuildVariableScope", "category": "VariableScopeCheck", "package": "EbuildVariableScope", "version": "0", "variable": "EROOT", "func": "src_configure", "lines": [9]} +{"__class__": "EbuildVariableScope", "category": "VariableScopeCheck", "package": "EbuildVariableScope", "version": "0", "variable": "EROOT", "func": "src_configure", "lines": [10]} diff --git a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch index b660ed89..be4a05bd 100644 --- a/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch +++ b/testdata/data/repos/standalone/VariableScopeCheck/EbuildVariableScope/fix.patch @@ -1,12 +1,12 @@ diff -Naur standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild fixed/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild --- standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild 2021-03-17 01:20:05.423678951 -0600 +++ fixed/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild 2021-03-17 01:21:57.421132212 -0600 -@@ -6,7 +6,7 @@ - +@@ -7,7 +7,7 @@ + src_configure() { # EROOT isn't allowed in src_* phases - econf --sysconfdir="${EROOT}/etc/${PN}" + econf --sysconfdir="${EPREFIX}/etc/${PN}" } - + pkg_postinst() { diff --git a/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/expected.json b/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/expected.json index bedbeb1e..c1e70142 100644 --- a/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/expected.json +++ b/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/expected.json @@ -1,3 +1,3 @@ -{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "\"\\t# bad chars aren't ignored\\xa0in comments\\n\"", "lineno": 8, "char": "'\\xa0'", "position": 28} -{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "'\\tcd \"${S}\"/cpp ||\\xa0die # or\\xa0inline comments\\n'", "lineno": 9, "char": "'\\xa0'", "position": 18} -{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "'\\tcd \"${S}\"/cpp ||\\xa0die # or\\xa0inline comments\\n'", "lineno": 9, "char": "'\\xa0'", "position": 27} +{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "\"\\t# bad chars aren't ignored\\xa0in comments\\n\"", "lineno": 9, "char": "'\\xa0'", "position": 28} +{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "'\\tcd \"${S}\"/cpp ||\\xa0die # or\\xa0inline comments\\n'", "lineno": 10, "char": "'\\xa0'", "position": 18} +{"__class__": "BadWhitespaceCharacter", "category": "WhitespaceCheck", "package": "BadWhitespaceCharacter", "version": "0", "line": "'\\tcd \"${S}\"/cpp ||\\xa0die # or\\xa0inline comments\\n'", "lineno": 10, "char": "'\\xa0'", "position": 27} diff --git a/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/fix.patch b/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/fix.patch index 50aa6275..5f64b144 100644 --- a/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/fix.patch +++ b/testdata/data/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/fix.patch @@ -1,9 +1,9 @@ diff -Naur standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild fixed/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild --- standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild 2019-12-03 14:20:02.089699996 -0700 +++ fixed/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild 2019-12-03 14:24:43.960923352 -0700 -@@ -5,7 +5,7 @@ +@@ -6,7 +6,7 @@ LICENSE="BSD" - + src_test() { - # bad chars aren't ignored in comments - cd "${S}"/cpp || die # or inline comments diff --git a/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/expected.json b/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/expected.json new file mode 100644 index 00000000..d0630087 --- /dev/null +++ b/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/expected.json @@ -0,0 +1 @@ +{"__class__": "MissingEAPIBlankLine", "category": "WhitespaceCheck", "package": "MissingEAPIBlankLine", "version": "0"} diff --git a/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/fix.patch b/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/fix.patch new file mode 100644 index 00000000..e6b838e3 --- /dev/null +++ b/testdata/data/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/fix.patch @@ -0,0 +1,9 @@ +diff -Naur standalone/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild fixed/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild +--- standalone/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild ++++ fixed/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild +@@ -1,4 +1,5 @@ + EAPI=7 ++ + DESCRIPTION="Ebuild is missing blank line after EAPI" + HOMEPAGE="https://github.com/pkgcore/pkgcheck"; + SLOT="0" diff --git a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild index c93c92cd..304308b5 100644 --- a/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild +++ b/testdata/repos/standalone/BadCommandsCheck/BannedEapiCommand/BannedEapiCommand-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild using banned EAPI command" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild b/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild index 49182b4c..1ef4813e 100644 --- a/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild +++ b/testdata/repos/standalone/BadCommandsCheck/DeprecatedEapiCommand/DeprecatedEapiCommand-0.ebuild @@ -1,4 +1,5 @@ EAPI=6 + DESCRIPTION="Ebuild using deprecated EAPI command" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild b/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild index 6507af33..4fcffaa8 100644 --- a/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/BadDependency/BadDependency-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with bad dependencies" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild index d5050239..71cdda2d 100644 --- a/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/InvalidBdepend/InvalidBdepend-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with invalid BDEPEND" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild index a790cde4..d25a1168 100644 --- a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with invalid DEPEND" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild index 2a5ece5c..e9c51202 100644 --- a/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/InvalidPdepend/InvalidPdepend-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with invalid PDEPEND" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild b/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild index 09d3ea1c..4c876488 100644 --- a/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/InvalidRdepend/InvalidRdepend-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with invalid RDEPEND" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild b/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild index 0272b643..53992988 100644 --- a/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild +++ b/testdata/repos/standalone/DependencyCheck/MissingUseDepDefault/MissingUseDepDefault-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild missing USE dependency default" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild b/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild index 086ba8fc..04dbdbd8 100644 --- a/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild +++ b/testdata/repos/standalone/EapiCheck/BannedEapi/BannedEapi-0.ebuild @@ -1,4 +1,5 @@ EAPI=1 + DESCRIPTION="Ebuild using banned EAPI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild b/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild index 8efd64a6..c05b58ea 100644 --- a/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild +++ b/testdata/repos/standalone/EapiCheck/DeprecatedEapi/DeprecatedEapi-0.ebuild @@ -1,4 +1,5 @@ EAPI=5 + DESCRIPTION="Ebuild using deprecated EAPI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild b/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild index 30ff4887..4a475d71 100644 --- a/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild +++ b/testdata/repos/standalone/EbuildUnquotedVariablesCheck/EbuildUnquotedVariable/EbuildUnquotedVariable-0.ebuild @@ -1,4 +1,5 @@ EAPI=8 + DESCRIPTION="Ebuild with variables that must be quoted" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild index 7a577866..2967624d 100644 --- a/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild +++ b/testdata/repos/standalone/InsintoCheck/DeprecatedInsinto/DeprecatedInsinto-1.ebuild @@ -1,4 +1,5 @@ EAPI=4 + DESCRIPTION="Ebuild with deprecated insinto usage" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild index c8360cc0..4cda2928 100644 --- a/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild +++ b/testdata/repos/standalone/IuseCheck/InvalidUseFlags/InvalidUseFlags-4.ebuild @@ -1,4 +1,5 @@ EAPI=4 + DESCRIPTION="Ebuild with invalid USE flags" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild b/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild index d42b40ed..9fb834ca 100644 --- a/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild +++ b/testdata/repos/standalone/IuseCheck/UnknownUseFlags/UnknownUseFlags-0.ebuild @@ -1,4 +1,5 @@ EAPI=4 + DESCRIPTION="Ebuild with unknown USE flags" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild b/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild index 2394a37f..4a4a4d40 100644 --- a/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild +++ b/testdata/repos/standalone/MissingSlotDepCheck/MissingSlotDep/MissingSlotDep-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with dependency missing a slot dep" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild b/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild index 5320e4da..809752ce 100644 --- a/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild +++ b/testdata/repos/standalone/ReadonlyVariableCheck/ReadonlyVariable/ReadonlyVariable-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + PV="5" DESCRIPTION="Ebuild that assigns read-only variable in global scope" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; diff --git a/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild b/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild index 19069813..bcf00a6b 100644 --- a/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild +++ b/testdata/repos/standalone/RedundantDodirCheck/RedundantDodir/RedundantDodir-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with redundant dodir calls" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild b/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild index 27879434..31494b50 100644 --- a/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild +++ b/testdata/repos/standalone/RequiredUseCheck/RequiredUseDefaults/RequiredUseDefaults-0.ebuild @@ -1,4 +1,5 @@ EAPI=4 + DESCRIPTION="Ebuild with REQUIRED_USE failing by default" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild b/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild index 6cb3821e..2b407f8b 100644 --- a/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild +++ b/testdata/repos/standalone/RequiredUseCheck/UnstatedIuse/UnstatedIuse-0.ebuild @@ -1,4 +1,5 @@ EAPI=4 + DESCRIPTION="Ebuild with unstated USE flag in REQUIRED_USE" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild index a4a7c8a2..d0fce630 100644 --- a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild +++ b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with reundant rename in SRC_URI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SRC_URI="https://github.com/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz" diff --git a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild index 7ba49077..7ee2f8cd 100644 --- a/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild +++ b/testdata/repos/standalone/SrcUriCheck/RedundantUriRename/RedundantUriRename-1.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild with reundant rename in SRC_URI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SRC_URI="mirror://used/pkgcore/pkgcheck/${P}.tar.gz -> ${P}.tar.gz" diff --git a/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild b/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild index e5ea35a1..93e37de2 100644 --- a/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild +++ b/testdata/repos/standalone/SrcUriCheck/TarballAvailable/TarballAvailable-0.ebuild @@ -1,4 +1,5 @@ EAPI=2 + DESCRIPTION="Ebuild with SRC_URI using .zip archive when .tar* is available" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SRC_URI=" diff --git a/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild b/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild index 6020854c..28cc609e 100644 --- a/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild +++ b/testdata/repos/standalone/VariableScopeCheck/EbuildVariableScope/EbuildVariableScope-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild using a variable outside its defined scope" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild index 84641c86..d245eef2 100644 --- a/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild +++ b/testdata/repos/standalone/WhitespaceCheck/BadWhitespaceCharacter/BadWhitespaceCharacter-0.ebuild @@ -1,4 +1,5 @@ EAPI=7 + DESCRIPTION="Ebuild uses bad whitespace character" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" diff --git a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild b/testdata/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild similarity index 57% copy from testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild copy to testdata/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild index a790cde4..fc5a6781 100644 --- a/testdata/repos/standalone/DependencyCheck/InvalidDepend/InvalidDepend-0.ebuild +++ b/testdata/repos/standalone/WhitespaceCheck/MissingEAPIBlankLine/MissingEAPIBlankLine-0.ebuild @@ -1,6 +1,5 @@ EAPI=7 -DESCRIPTION="Ebuild with invalid DEPEND" +DESCRIPTION="Ebuild is missing blank line after EAPI" HOMEPAGE="https://github.com/pkgcore/pkgcheck"; SLOT="0" LICENSE="BSD" -DEPEND="stub1"
