fosslight-dependency 4.1.26__tar.gz → 4.1.28__tar.gz

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.26
+Version: 4.1.28
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -23,7 +23,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: fosslight_util>=2.1.34
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/requirements.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.30
+fosslight_util>=2.1.34
 PyGithub
 requirements-parser
 defusedxml

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='4.1.26',
+        version='4.1.28',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/src/fosslight_dependency/package_manager/Nuget.py

@@ -48,25 +48,9 @@ class Nuget(PackageManager):
         logger.info(f"Found {self.directory_packages_props}. Using NuGet CPM flow.")
         self.packageReference = True
 
-        has_any_assets = False
-        for root, dirs, files in os.walk(self.input_dir):
-            rel_root = os.path.relpath(root, self.input_dir)
-            parts = rel_root.split(os.sep) if rel_root != os.curdir else []
-            if any(p.lower() in self._exclude_dirs for p in parts):
-                continue
-            assets_candidate = os.path.join(root, 'obj', 'project.assets.json')
-            if os.path.isfile(assets_candidate):
-                has_any_assets = True
-                break
-
-        if not has_any_assets:
-            logger.info("No project.assets.json found. Running 'dotnet restore'...")
-            restore_targets = self._find_restore_targets()
-            if not restore_targets:
-                logger.warning("No .sln or .csproj files found to restore.")
-                return False
-
-            success = False
+        restore_targets = self._find_restore_targets()
+        if restore_targets:
+            logger.info("Found .sln or .csproj files. Running 'dotnet restore'...")
             for target_path, target_file in restore_targets:
                 logger.info(f"Restoring: {os.path.relpath(target_file, self.input_dir)}")
                 try:
@@ -78,22 +62,19 @@ class Nuget(PackageManager):
                         timeout=300
                     )
                     if result.returncode == 0:
-                        success = True
+                        logger.info(f"Successfully restored {os.path.relpath(target_file, self.input_dir)}")
                     else:
                         logger.warning(f"'dotnet restore' failed for {target_file} with return code {result.returncode}")
                         if result.stderr:
                             logger.warning(result.stderr)
                 except FileNotFoundError:
                     logger.error("'dotnet' command not found. Please install .NET SDK.")
-                    return False
                 except subprocess.TimeoutExpired:
                     logger.warning(f"'dotnet restore' timed out for {target_file}.")
                 except Exception as e:
                     logger.warning(f"Failed to run 'dotnet restore' for {target_file}: {e}")
-
-            if not success:
-                logger.warning("All 'dotnet restore' attempts failed.")
-                return False
+        else:
+            logger.warning("No .sln or .csproj files found to restore.")
 
         self.project_dirs = []
         found_projects = False
@@ -377,11 +358,11 @@ class Nuget(PackageManager):
                 elif f.endswith('.csproj'):
                     csproj_files.append((depth, root, os.path.join(root, f)))
 
+        result = []
         if sln_files:
-            sln_files.sort(key=lambda x: x[0])
-            min_depth = sln_files[0][0]
-            return [(d, f) for depth, d, f in sln_files if depth == min_depth]
+            result.extend([(d, f) for _, d, f in sln_files])
+
         if csproj_files:
-            return [(d, f) for _, d, f in csproj_files]
+            result.extend([(d, f) for _, d, f in csproj_files])
 
-        return []
+        return result

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/src/fosslight_dependency/run_dependency_scanner.py

@@ -20,6 +20,7 @@ from fosslight_dependency._analyze_dependency import analyze_dependency
 from fosslight_util.output_format import check_output_formats_v2, write_output_file
 from fosslight_util.oss_item import ScannerItem
 from fosslight_dependency._graph_convertor import GraphConvertor
+from fosslight_util.exclude import get_excluded_paths
 
 # Package Name
 _PKG_NAME = "fosslight_dependency"
@@ -244,7 +245,6 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     else:
         input_dir = os.getcwd()
         os.chdir(input_dir)
-    scan_item.set_cover_pathinfo(input_dir, path_to_exclude)
 
     autodetect = True
     found_package_manager = {}
@@ -268,6 +268,12 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         manifest_file_name = []
 
     try:
+        excluded_path_with_default_exclusion, excluded_path_without_dot, _, _ = (
+            get_excluded_paths(input_dir, path_to_exclude, ''))
+        logger.debug(f"Skipped paths: {excluded_path_with_default_exclusion}")
+        scan_item.set_cover_pathinfo(input_dir, excluded_path_without_dot)
+        abs_path_to_exclude = [os.path.abspath(os.path.join(input_dir, path))
+                               for path in excluded_path_with_default_exclusion]
         ret, found_package_manager, input_dir, suggested_files = find_package_manager(input_dir,
                                                                                       abs_path_to_exclude,
                                                                                       manifest_file_name,

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.26
+Version: 4.1.28
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -23,7 +23,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight_util>=2.1.30
+Requires-Dist: fosslight_util>=2.1.34
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-4.1.26 → fosslight_dependency-4.1.28}/src/fosslight_dependency.egg-info/requires.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.30
+fosslight_util>=2.1.34
 PyGithub
 requirements-parser
 defusedxml