Improve version comparison

Author: kkochanski

_version.py

@@ -1 +1 @@
-__version__ = '2.0.8'
+__version__ = '2.0.9'

cli/cli_helper.py

@@ -1,11 +1,14 @@
 from colors import Color
 from constants import MINIMAL_SUPPORTED_INSTANCE_VERSION
-
+import pkg_resources
 
 class CliHelper:
 
  @staticmethod
  def check_if_version_is_supported(args, current_version, server):
- if args['quiet'] is False and 'hybrid-analysis.com' not in server and current_version.split('-')[0] < MINIMAL_SUPPORTED_INSTANCE_VERSION:
+ parsed_current_version = pkg_resources.parse_version(current_version.split('-')[0])
+ minimal_supported_version = pkg_resources.parse_version(MINIMAL_SUPPORTED_INSTANCE_VERSION)
+
+ if args['quiet'] is False and 'hybrid-analysis.com' not in server and parsed_current_version < minimal_supported_version:
  print(Color.warning('This version of VxAPI works best on VxWebService version {} (or above). Consider upgrading to ensure the flawless performance.'.format(MINIMAL_SUPPORTED_INSTANCE_VERSION)))
 

helper_classes/cli_helper.py

@@ -44,13 +44,3 @@ def prompt_for_dir_content_submission(args):
  if not submit_warning or submit_warning[0].lower() != 'y':
  print('You did not indicate approval, exiting ...')
  exit(1)
-
- @staticmethod
- def check_if_version_is_supported(args, api_instance_version_object, request_handler, headers, minimal_compatible_version):
- if args['quiet'] is False and 'hybrid-analysis.com' not in api_instance_version_object.server:
- api_instance_version_object.call(request_handler, headers)
- api_response = api_instance_version_object.get_api_response()
- if api_response.status_code == 200 and api_instance_version_object.get_response_msg_success_nature() is True:
- if api_instance_version_object.get_response_json()['response']['version'] < minimal_compatible_version:
- print(Color.warning('This version of VxAPI works best on VxWebService version {} (or above). Consider upgrading to ensure the flawless performance.'.format(minimal_compatible_version)))
-