Compare commits

..

No commits in common. "551e18f793bbe2032a79d676fecf0b1a415cd16c" and "0a9fc9f5a0481531ada78f96213cabff3dd14081" have entirely different histories.

2 changed files with 6 additions and 13 deletions

View File

@ -23,7 +23,6 @@ positional arguments:
optional arguments:
-h, --help show this help message and exit
-r, --recursive recursively check all dependencies for mismatches
-b, --brief do not show detailed comparisons of mismatching values
-c, --color colorize the output
```

View File

@ -58,11 +58,11 @@ def parse_manifest(pkg):
try:
dependencies = latest_manifest['dependencies']
except KeyError:
dependencies = {}
dependencies = None
try:
scripts = latest_manifest['scripts']
except KeyError:
scripts = {}
scripts = json.loads('{}')
name = latest_manifest['name']
return Manifest(name, latest_ver, dependencies, scripts)
@ -96,16 +96,16 @@ def parse_actual_manifest(pkg, ver):
try:
dependencies = manifest['dependencies']
except KeyError:
dependencies = {}
dependencies = None
try:
scripts = manifest['scripts']
except KeyError:
scripts = {}
scripts = json.loads('{}')
name = manifest['name']
return Manifest(name, version, dependencies, scripts)
def compare_manifests(pkg, brief=False, color=False, recursive=False):
def compare_manifests(pkg, brief=False, color=False):
mismatch = False
if pkg.reported_manifest.version != pkg.actual_manifest.version:
mismatch = True
@ -177,11 +177,6 @@ def compare_manifests(pkg, brief=False, color=False, recursive=False):
if color:
print(colors.END, end='')
if recursive:
for package in pkg.actual_manifest.dependencies:
print('Recursive: {}'.format(package))
mismatch = compare_manifests(Package(package), brief=brief, color=color, recursive=True) or mismatch
return mismatch
@ -190,14 +185,13 @@ def main():
import sys
parser = argparse.ArgumentParser(prog='npm-manifest-check', description='Check NPM packages for manifest mismatches')
parser.add_argument('-r', '--recursive', action='store_true', help='recursively check all dependencies for mismatches')
parser.add_argument('-b', '--brief', action='store_true', help='do not show detailed comparisons of mismatching values')
parser.add_argument('-c', '--color', action='store_true', help='colorize the output')
parser.add_argument('package', type=str, help='name of the NPM package')
args = parser.parse_args()
package = Package(args.package)
mismatching = compare_manifests(package, brief=args.brief, color=args.color, recursive=args.recursive)
mismatching = compare_manifests(package, brief=args.brief, color=args.color)
if mismatching:
sys.exit(1)