Compare commits

..

No commits in common. "c11a24cd9d269f29a40e8e17822cefcc17ac9d61" and "403cf485022eaf68e5197f4af4ed283e3bf6cca5" have entirely different histories.

2 changed files with 7 additions and 11 deletions

View File

@ -2,8 +2,6 @@
import requests import requests
import json import json
import time import time
from pprint import pprint
from deepdiff import DeepDiff
# https://www.npmjs.com/package/darcyclarke-manifest-pkg/v/2.1.15/index # https://www.npmjs.com/package/darcyclarke-manifest-pkg/v/2.1.15/index
# hex checksum = file name # hex checksum = file name
@ -46,7 +44,7 @@ def get_actual_manifest(pkg, ver):
break break
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
print('Failed to get index from webservice, retrying...') print('Failed to get index from webservice, retrying...')
time.sleep(5) time.sleep(1)
hexsum = index['files']['/package.json']['hex'] hexsum = index['files']['/package.json']['hex']
manifest_url = 'https://www.npmjs.com/package/{}/file/{}'.format(pkg, hexsum) manifest_url = 'https://www.npmjs.com/package/{}/file/{}'.format(pkg, hexsum)
@ -58,7 +56,7 @@ def get_actual_manifest(pkg, ver):
break break
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
print('Failed getting manifest JSON from webserver, retrying...') print('Failed getting manifest JSON from webserver, retrying...')
time.sleep(5) time.sleep(1)
# now we can parse it # now we can parse it
version = manifest['version'] version = manifest['version']
@ -74,6 +72,7 @@ def get_actual_manifest(pkg, ver):
return version, dependencies, scripts, name return version, dependencies, scripts, name
def main(): def main():
import sys import sys
mismatch = False mismatch = False
@ -92,17 +91,15 @@ def main():
if actual_dependencies != reported_dependencies: if actual_dependencies != reported_dependencies:
mismatch = True mismatch = True
dep_diff = DeepDiff(reported_dependencies, actual_dependencies, verbose_level=2)
print('Dependency mismatch detected for {}!'.format(pkg)) print('Dependency mismatch detected for {}!'.format(pkg))
pprint(dep_diff, indent=2) print('Reported dependencies: {}'.format(reported_dependencies))
print('Actual dependencies: {}'.format(actual_dependencies))
if actual_scripts != reported_scripts: if actual_scripts != reported_scripts:
mismatch = True mismatch = True
scripts_diff = DeepDiff(reported_scripts, actual_scripts, verbose_level=2)
print('Scripts mismatch detected for {}!'.format(pkg)) print('Scripts mismatch detected for {}!'.format(pkg))
pprint(scripts_diff, indent=2) print('Reported scripts: {}'.format(reported_scripts))
print('Actual scripts: {}'.format(actual_scripts))
if actual_name != reported_name: if actual_name != reported_name:
mismatch = True mismatch = True

View File

@ -1,2 +1 @@
requests requests
deepdiff