Merge pull request #9 from fosslight/develop

Change the parameters related to the scanner path

Author: soimkim

requirements-dev.txt

@@ -1,4 +1,5 @@
 tox
 pytest
 pytest-cov
+flake8==3.9.2
 pytest-flake8

requirements.txt

@@ -5,5 +5,5 @@ xlrd
 openpyxl
 progress
 pyyaml
-fosslight_util>=1.3.1
+fosslight_util>=1.3.3
 fosslight_dependency>=3.7.3

src/fosslight_scanner/_get_input.py

@@ -39,8 +39,6 @@ def get_input_mode():
     _PYTHON_VERSION = sys.version_info[0]
 
     _input_path_msg = "Please enter the path to analyze:"
-    _additional_msg = "\n(Enter if it is the same as "\
-        + "the source code analysis path)"
 
     url_to_analyze = ""
     src_path = ""
@@ -53,18 +51,10 @@ def get_input_mode():
             2. Local source path\n"):
         success, url_to_analyze = get_input("Enter the link to analyze:", "")
     else:
-        # 1. FOSSLight Source
-        if ask_to_run("1. Do you want to analyze the source code? (y/n)"):
-            success, src_path = get_input(_input_path_msg, "")
+        success, src_path = get_input(_input_path_msg, "")
+        dep_path = src_path
 
-        if src_path == "":
-            _additional_msg = ""
-
-        # 2. FOSSLight Dependency
-        if ask_to_run("3. Do you want to analyze the dependency? (y/n)"):
-            success, dep_path = get_input(
-                _input_path_msg + _additional_msg, src_path)
-            success, dep_arguments = get_input(
-                "Please enter arguments for dependency analysis:", "")
+        success, dep_arguments = get_input(
+            "Please enter arguments for dependency analysis:", "")
 
     return src_path, dep_path, dep_arguments, url_to_analyze

src/fosslight_scanner/_help.py

@@ -15,11 +15,10 @@
         -h\t\t\t\t\t    Print help message
         -r\t\t\t\t\t    Keep raw data
         -t\t\t\t\t\t    Hide the progress bar
-        -s <source_path>\t\t\t    Path to analyze source
+        -p <source_path>\t\t\t    Path to analyze source, dependency
         -w <link>\t\t\t\t    Link to be analyzaed can be downloaded by wget or git clone
         -o <output>\t\t\t\t    Output directory or file
-        -d <dependency_path> \t\t\t    Path to analyze dependencies
-        -d <dependency_path> -a <additional_arg>    (Using with -d option) Additional arguments for running dependency analysis"""
+        -d <dependency_argument> \t\t\t    Additional arguments for running dependency analysis"""
 
 
 def print_help_msg():

src/fosslight_scanner/fosslight_scanner.py

@@ -214,13 +214,11 @@ def main():
     for opt, arg in opts:
         if opt == "-h":
             print_help_msg()
-        elif opt == "-s":
+        elif opt == "-p":
             src_path = arg
-            _cli_mode = True
-        elif opt == "-d":
             dep_path = arg
             _cli_mode = True
-        elif opt == "-a":
+        elif opt == "-d":
             dep_arguments = arg
         elif opt == "-w":
             _cli_mode = True

tox.ini

@@ -24,8 +24,9 @@ norecursedirs = test_result_*
 [testenv:test_run]
 commands =
     fosslight -h
-    rm -rf test_result_*
-    fosslight -o test_result_local_path -s tests -d tests
+    rm -rf test_result_local_path
+    rm -rf test_result_wget
+    fosslight -o test_result_local_path -p tests
     fosslight -o test_result_wget -w "https://github.com/LGE-OSS/example.git"
 
 [testenv:release]
@@ -34,6 +35,6 @@ deps =
 
 commands =
     fosslight -h
-    fosslight -o test_result_local_path -s tests -d tests
+    fosslight -o test_result_local_path -p tests
     fosslight -o test_result_wget -w "https://github.com/LGE-OSS/example.git"
     pytest -v --flake8