Safer dependencies collector

requirements.txt

@@ -1,3 +1,3 @@
-requests==2.12.1
-gql==2.0.0
-python-dotenv==0.19.2
+requests==2.28.1
+gql==3.4.0
+python-dotenv==0.21.0

src/combobulator.py

@@ -90,11 +90,11 @@ def load_pkgs_file(pkgs):
         print("[ERR]  Cannot process input list/file")
         raise TypeError
 
-def scan_source(pkgtype, dir):
+def scan_source(pkgtype, directory):
     if pkgtype == "npm":
-        return npm.scan_source(dir)
+        return npm.scan_source(directory)
     elif pkgtype == "maven":
-        return maven.scan_source(dir)
+        return maven.scan_source(directory)
     #TODO: add pypi scanner
     else:
         print("[ERROR]  Selected package type doesn't support import scan.")

src/metapackage.py

@@ -4,7 +4,7 @@ class MetaPackage:
 
     def __init__(self, pkgname, pkgtype=None, pkgorg=None):
         self.instances.append(self) # adding the instance to colllective
-        if len(pkgname.split(':')) == 2:
+        if len(str(pkgname).split(':')) == 2:
             if pkgtype == "maven":
                 if pkgorg == None:
                     self._pkg_name = pkgname.split(':')[1]

src/registry/maven.py

@@ -1,3 +1,4 @@
+import os
 import json
 import requests
 import xml.etree.ElementTree as ET
@@ -33,9 +34,9 @@ def recv_pkg_info(pkgs, url=REGISTRY_URL):
             x.exists = False
     return names
 
-def scan_source(dir):
+def scan_source(directory):
     try:
-        path = dir + "./pom.xml"
+        path = os.path.join(directory, "./pom.xml")
         tree = ET.parse(path)
         pom = tree.getroot()
         ns = ".//{http://maven.apache.org/POM/4.0.0}"

src/registry/npm.py

@@ -1,3 +1,4 @@
+import os
 import json
 import requests
 import sys
@@ -7,6 +8,7 @@
 # deets: https://api-docs.npms.io/#api-Package-GetPackageInfo
 REGISTRY_URL = "https://api.npms.io/v2/package/mget"
 
+
 def get_keys(data):
     result = []
     for key in data.keys():
@@ -48,20 +50,18 @@ def recv_pkg_info(pkgs, url=REGISTRY_URL):
             i.exists = False
 
 
-def scan_source(dir):
+def scan_source(directory):
     try:
-        path = dir + "./package.json"
-        file = open(path, "r")
-        body = file.read()
-        filex = json.loads(body)
+        with open(os.path.join(directory, "package.json"), "r") as file:
+            filex = json.load(file)
     except:
         print("[ERR] Couldn't import from given path.")
         sys.exit(1)
 
     lister = list(filex['dependencies'].keys())
     if 'devDependencies' in filex:
-        lister.append(filex['devDependencies'].keys())
-        # OPTIONAL - de-comment if you would like to add peer deps.
-        #lister.append(filex['peerDependencies'].keys())
+        lister += list(filex['devDependencies'].keys())
+    # OPTIONAL - de-comment if you would like to add peer deps.
+    # if 'peerDependencies' in filex:
+    #     lister += list(filex['peerDependencies'].keys())
     return lister
-