Merge pull request #29 from fosslight/develop

Fix the pub parsing error

Author: bjk7119

cli.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+from fosslight_dependency.analyze_dependency import main
+
+
+if __name__ == '__main__':
+    main()

src/fosslight_dependency/_version.py renamed to hooks/hook-fosslight_dependency.py

@@ -2,4 +2,6 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
-__version__ = "3.2.1"
+from PyInstaller.utils.hooks import collect_all
+
+datas, binaries, hiddenimports = collect_all('fosslight_dependency')

setup.py

@@ -13,12 +13,11 @@
 with open('requirements.txt', 'r', 'utf-8') as f:
     required = f.read().splitlines()
 
-exec(open("src/fosslight_dependency/_version.py").read())
 
 if __name__ == "__main__":
     setup(
         name='fosslight_dependency',
-        version=__version__,
+        version='3.3.0',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Dependency Scanner',

src/fosslight_dependency/_help.py

@@ -22,7 +22,7 @@
         Optional
             -h\t\t\t\t    Print help message.
             -v\t\t\t\t    Print the version of the script.
-            -m <package_manager>\t    Enther the package manager(npm, maven, gradle, pip, pub, cocoapods, android).
+            -m <package_manager>\t    Enter the package manager(npm, maven, gradle, pip, pub, cocoapods).
             -p <input_path>\t\t    Enter the path where the script will be run.
             -o <output_path>\t\t    Enter the path where the result file will be generated.
 
@@ -31,10 +31,11 @@
             -d <deactivate_cmd>\t\t    Virtual environment deactivate command(ex, 'conda deactivate')
 
         Optional only for gradle, maven
-            -c <dir_name>\t\t    Enter the customized build output directory name(default: target)
-        
+            -c <dir_name>\t\t    Enter the customized build output directory name
+                                    \t\t-Default name : 'build' for gradle, 'target' for maven
+
         Optional only for android
-            -n <app_name>\t\t   Enter the application directory name where the plugin output file is located(default: app)
+            -n <app_name>\t\t    Enter the application directory name where the plugin output file is located(default: app)
         """
 
 

src/fosslight_dependency/analyze_dependency.py

@@ -16,13 +16,14 @@
 from xml.etree.ElementTree import parse
 from bs4 import BeautifulSoup
 import yaml
-from lastversion import lastversion
-from fosslight_util.set_log import init_log
+import pkg_resources
 from datetime import datetime
+from fosslight_util.set_log import init_log, init_log_item
 from fosslight_util.write_excel import write_excel_and_csv
-from fosslight_dependency._version import __version__
 from fosslight_dependency._help import print_help_msg
 
+# Package Name
+_PKG_NAME = "fosslight_dependency"
 
 # Check the manifest file
 manifest_array = [["pip", "requirements.txt"], ["npm", "package.json"], ["maven", "pom.xml"],
@@ -83,7 +84,8 @@ def parse_option():
 
     # -v option
     if args.version:
-        print(__version__)
+        cur_version = pkg_resources.get_distribution(_PKG_NAME).version
+        print("Current version : " + cur_version)
         sys.exit(0)
 
     # -m option
@@ -732,9 +734,8 @@ def parse_and_generate_output_gradle(input_fp):
 
 
 def preprocess_pub_result(input_file):
-    matched_json = re.findall(r'final ossLicenses = <String, dynamic>({.*});', input_file.read())
-
-    if matched_json[0] is not None:
+    matched_json = re.findall(r'final ossLicenses = <String, dynamic>({[\s\S]*});', input_file.read())
+    if len(matched_json) > 0:
         return matched_json[0]
     else:
         logger.error("### Error Message ###")
@@ -1016,13 +1017,9 @@ def main():
 
     parse_option()
     logger = init_log(os.path.join(OUTPUT_RESULT_DIR, "fosslight_dependency_log_" + start_time + ".txt"), True, 20, 10)
+    _result_log = init_log_item(_PKG_NAME)
 
-    # Check the latest version
-    latest_version = lastversion.has_update(repo="fosslight_dependency", at='pip', current_version=__version__)
-    if latest_version:
-        logger.info('### Version Info ###')
-        logger.info('Newer version is available:{}'.format(str(latest_version)))
-        logger.info('You can update it with command (\'pip install fosslight_dependency --upgrade\')')
+    logger.info("Tool Info : " + _result_log["Tool Info"])
 
     # Configure global variables according to package manager.
     try:

tox.ini

@@ -7,6 +7,8 @@ skipdist = true
 [testenv]
 install_command = pip install {opts} {packages}
 basepython= python3.6
+setenv =
+  PYTHONPATH=.
 
 [pytest]
 filterwarnings = ignore::DeprecationWarning
@@ -17,12 +19,17 @@ exclude = .tox/*
 ignore = E722
 
 [testenv:test_run]
-deps =
-    -r{toxinidir}/requirements-dev.txt
+commands =
+  fosslight_dependency -h
 
-setenv =
-  PYTHONPATH=.
+[testenv:release]
+deps =
+  -r{toxinidir}/requirements-dev.txt
 
 commands =
-    fosslight_dependency -h
-    pytest -v --flake8
+  fosslight_dependency -h
+  fosslight_dependency -v
+  pytest -v --flake8
+  pyinstaller --onefile cli.py build.spec --additional-hooks-dir=hooks
+  {toxinidir}/dist/cli -o test_result_cli
+