code42
diff --git a/‎CHANGELOG.md‎
Lines changed: 5 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 20 additions & 12 deletions b/‎README.md‎
Lines changed: 20 additions & 12 deletions
diff --git a/‎docs/conf.py‎
Lines changed: 4 additions & 4 deletions b/‎docs/conf.py‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎integration/__init__.py‎
Lines changed: 3 additions & 3 deletions b/‎integration/__init__.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎integration/test_alerts.py‎
Lines changed: 26 additions & 16 deletions b/‎integration/test_alerts.py‎
Lines changed: 26 additions & 16 deletions
diff --git a/‎integration/util.py‎
Lines changed: 5 additions & 2 deletions b/‎integration/util.py‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎setup.py‎
Lines changed: 4 additions & 1 deletion b/‎setup.py‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/code42cli/__init__.py‎
Lines changed: 2 additions & 2 deletions b/‎src/code42cli/__init__.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/code42cli/args.py‎
Lines changed: 0 additions & 120 deletions b/‎src/code42cli/args.py‎
Lines changed: 0 additions & 120 deletions
@@ -13,6 +13,11 @@ how a consumer would use the library (e.g. adding unit tests, updating documenta
 ### Changed
 
 - `-i` (`--incremental`) has been removed, use `-c` (`--use-checkpoint`) with a string name for the checkpoint instead.
+- The code42cli has been migrated to the [click](https://click.palletsprojects.com) framework. This brings:
+    - BREAKING CHANGE: Commands that accept multiple values for the same option now must have the option flag provided 
+        before each value: 
+            `--option value1 --option value2` instead of `--option value1 value2` (which was previously possible).
+    - Cosmetic changes to error messages, progress bars, and help message formatting.
 
 ### Added
 
 
@@ -10,15 +10,15 @@ Use the `code42` command to interact with your Code42 environment.
 
 ## Requirements
 
-- Python 2.7.x or 3.5.0+
+- Python 3.5.0+
 - Code42 Server 6.8.x+
 
 ## Installation
 
 Install the `code42` CLI using:
 
 ```bash
-$ python setup.py install
+$ python3 -m pip install code42cli
 ```
 
 ## Usage
@@ -144,7 +144,7 @@ This is only guaranteed if you did not change your query.
 To send events to a server using a specific profile, do:
 
 ```bash
-code42 security-data send-to --profile PROFILE_FOR_RECURRING_JOB syslog.company.com -b 2020-02-02 -f CEF -i
+code42 security-data --profile PROFILE_FOR_RECURRING_JOB send-to syslog.company.com -b 2020-02-02 -f CEF -i
 ```
 
 You can also use wildcard for queries, but note, if they are not in quotes, you may get unexpected behavior.
@@ -173,6 +173,8 @@ Each destination-type subcommand shares query parameters
 You cannot use other query parameters if you use `--advanced-query`.
 To learn more about acceptable arguments, add the `-h` flag to `code42` or any of the destination-type subcommands.
 
+
+
 ## Detection Lists
 
 You can both add and remove employees from detection lists using the CLI. This example uses `high-risk-employee`.
@@ -212,16 +214,22 @@ If that doesn't work, delete your credentials file located at ~/.code42cli or th
 
 ## Tab completion
 
-For `zsh`, add these commands to your `.zshrc` file:
+For Bash, add this to ~/.bashrc:
 
-```bash
-C42_COMPLETER=$(which code42cli_completer)
-autoload bashcompinit && bashcompinit
-complete -C '$C42_COMPLETER' code42
+```
+eval "$(_CODE42_COMPLETE=source_bash code42)"
 ```
 
-For bash, add just the first and last commands to your `.bash_profile`:
-```bash
-C42_COMPLETER=$(which code42cli_completer)
-complete -C '$C42_COMPLETER' code42
+For Zsh, add this to ~/.zshrc:
+
 ```
+eval "$(_CODE42_COMPLETE=source_zsh code42)"
+```
+
+For Fish, add this to ~/.config/fish/completions/code42.fish:
+
+```
+eval (env _CODE42_COMPLETE=source_fish code42)
+```
+
+Open a new shell to enable completion. Or run the eval command directly in your current shell to enable it temporarily.
@@ -21,9 +21,9 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u"code42cli"
-copyright = u"2020, Code42 Software"
-author = u"Code42 Software"
+project = "code42cli"
+copyright = "2020, Code42 Software"
+author = "Code42 Software"
 
 # The short X.Y version
 version = "code42cli v{}".format(meta.__version__)
@@ -63,7 +63,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = [u"_build", "Thumbs.db", ".DS_Store"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = None
 
@@ -2,9 +2,9 @@
 import pexpect
 
 
-LINE_FEED = b'\r\n'
-PASSWORD_PROMPT = b'Password: '
-ENCODING_TYPE = 'utf-8'
+LINE_FEED = b"\r\n"
+PASSWORD_PROMPT = b"Password: "
+ENCODING_TYPE = "utf-8"
 
 
 def encode_response(line, encoding_type=ENCODING_TYPE):
 
@@ -20,17 +20,27 @@ def _validate_field_value(field, value, response):
 
 @pytest.mark.parametrize(
     "command, field, value",
-    [("{} --state OPEN".format(ALERT_COMMAND), "state", "OPEN"),
-     ("{} --state RESOLVED".format(ALERT_COMMAND), "state", "RESOLVED"),
-     ("{} --actor spatel@code42.com".format(ALERT_COMMAND), "actor", "spatel@code42.com"),
-     ("{} --rule-name 'File Upload Alert'".format(ALERT_COMMAND), "name", "File Upload Alert"),
-     ("{} --rule-id 962a6a1c-54f6-4477-90bd-a08cc74cbf71".format(ALERT_COMMAND), "ruleId",
-      "962a6a1c-54f6-4477-90bd-a08cc74cbf71"),
-     ("{} --rule-type FedEndpointExfiltration".format(ALERT_COMMAND), "type",
-      "FED_ENDPOINT_EXFILTRATION"),
-     ("{} --description 'Alert on any file upload'".format(ALERT_COMMAND), "description",
-      "Alert on any file upload events"),
-     ]
+    [
+        ("{} --state OPEN".format(ALERT_COMMAND), "state", "OPEN"),
+        ("{} --state RESOLVED".format(ALERT_COMMAND), "state", "RESOLVED"),
+        ("{} --actor spatel@code42.com".format(ALERT_COMMAND), "actor", "spatel@code42.com"),
+        ("{} --rule-name 'File Upload Alert'".format(ALERT_COMMAND), "name", "File Upload Alert"),
+        (
+            "{} --rule-id 962a6a1c-54f6-4477-90bd-a08cc74cbf71".format(ALERT_COMMAND),
+            "ruleId",
+            "962a6a1c-54f6-4477-90bd-a08cc74cbf71",
+        ),
+        (
+            "{} --rule-type FedEndpointExfiltration".format(ALERT_COMMAND),
+            "type",
+            "FED_ENDPOINT_EXFILTRATION",
+        ),
+        (
+            "{} --description 'Alert on any file upload'".format(ALERT_COMMAND),
+            "description",
+            "Alert on any file upload events",
+        ),
+    ],
 )
 def test_alert_prints_to_stdout_and_filters_result_by_given_value(command, field, value):
     return_code, response = run_command(command)
@@ -45,9 +55,7 @@ def _validate_begin_date(response):
         assert record["createdAt"].startswith("2020-05-18")
 
 
-@pytest.mark.parametrize("command, validate", [
-    (ALERT_COMMAND, _validate_begin_date),
-])
+@pytest.mark.parametrize("command, validate", [(ALERT_COMMAND, _validate_begin_date),])
 def test_alert_prints_to_stdout_and_filters_result_between_given_date(command, validate):
     return_code, response = run_command(command)
     assert return_code is 0
@@ -61,7 +69,9 @@ def _validate_severity(response):
 
 @cleanup_after_validation("./integration/alerts")
 def test_alert_writes_to_file_and_filters_result_by_severity():
-    command = "code42 alerts write-to ./integration/alerts -b 2020-05-18 -e 2020-05-20 " \
-              "--severity MEDIUM"
+    command = (
+        "code42 alerts write-to ./integration/alerts -b 2020-05-18 -e 2020-05-20 "
+        "--severity MEDIUM"
+    )
     return_code, response = run_command(command)
     return _validate_severity
@@ -2,12 +2,12 @@
 
 
 class cleanup(object):
-    def __init__(self, filename):    
+    def __init__(self, filename):
         self.filename = filename
 
     def __enter__(self):
         return open(self.filename, "r")
-    
+
     def __exit__(self, exc_type, exc_val, exc_tb):
         os.remove(self.filename)
 
@@ -19,11 +19,14 @@ def cleanup_after_validation(filename):
     The decorated function should return validation function that takes the content of the file
     as input. e.g `test_alerts.py::test_alert_writes_to_file_and_filters_result_by_severity`
     """
+
     def wrap(test_function):
         def wrapper():
             validate = test_function()
             with cleanup(filename) as f:
                 response = f.read()
                 validate(response)
+
         return wrapper
+
     return wrap
@@ -21,9 +21,12 @@
     package_dir={"": "src"},
     python_requires=">3, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4",
     install_requires=[
+        "click>=7.1.1",
+        "colorama>=0.4.3",
         "c42eventextractor==0.3.2",
         "keyring==18.0.1",
         "keyrings.alt==3.2.0",
+        "py42>=1.5.1",
     ],
     license="MIT",
     include_package_data=True,
@@ -54,5 +57,5 @@
         "Programming Language :: Python :: Implementation :: CPython",
     ],
     scripts=["bin/code42cli_completer"],
-    entry_points={"console_scripts": ["code42=code42cli.main:main"]},
+    entry_points={"console_scripts": ["code42=code42cli.main:cli"]},
 )
@@ -1,2 +1,2 @@
-PRODUCT_NAME = u"code42cli"
-MAIN_COMMAND = u"code42"
+PRODUCT_NAME = "code42cli"
+MAIN_COMMAND = "code42"