besapi 3.7.2__tar.gz → 3.7.6__tar.gz

{besapi-3.7.2/src/besapi.egg-info → besapi-3.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.7.2
+Version: 3.7.6
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-3.7.2 → besapi-3.7.6}/src/besapi/besapi.py

@@ -29,7 +29,7 @@ import requests
 from lxml import etree, objectify
 from pkg_resources import resource_filename
 
-__version__ = "3.7.2"
+__version__ = "3.7.6"
 
 besapi_logger = logging.getLogger("besapi")
 
@@ -345,8 +345,11 @@ class BESConnection:
                         besapi_logger.info("Query did not return any results")
                     else:
                         besapi_logger.error("%s\n%s", err2, rel_result.text)
+                        result.append("ERROR: " + rel_result.text)
                         raise
             else:
+                besapi_logger.error("%s\n%s", err, rel_result.text)
+                result.append("ERROR: " + rel_result.text)
                 raise
         return result
 

{besapi-3.7.2 → besapi-3.7.6/src/besapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: besapi
-Version: 3.7.2
+Version: 3.7.6
 Summary: Library for working with the BigFix REST API
 Home-page: https://github.com/jgstew/besapi
 Author: Matt Hansen, James Stewart

{besapi-3.7.2 → besapi-3.7.6}/src/bescli/bescli.py

@@ -54,6 +54,9 @@ class BESCLInterface(Cmd):
     def do_get(self, line):
         """Perform get request to BigFix server using provided api endpoint argument"""
 
+        # remove any extra whitespace
+        line = line.strip()
+
         # Remove root server prefix:
         # if root server prefix is not removed
         # and root server is given as IP Address,
@@ -80,6 +83,26 @@ class BESCLInterface(Cmd):
         else:
             self.pfeedback("Not currently logged in. Type 'login'.")
 
+    def do_delete(self, line):
+        """Perform delete request to BigFix server using provided api endpoint argument"""
+
+        # remove any extra whitespace
+        line = line.strip()
+
+        # Remove root server prefix:
+        if "/api/" in line:
+            line = str(line).split("/api/", 1)[1]
+            self.pfeedback("get " + line)
+
+        if self.bes_conn:
+            output_item = self.bes_conn.delete(line)
+
+            print(output_item)
+            # print(output_item.besdict)
+            # print(output_item.besjson)
+        else:
+            self.pfeedback("Not currently logged in. Type 'login'.")
+
     def do_post(self, statement):
         """post file as data to path"""
         print(statement)
@@ -366,9 +389,13 @@ class BESCLInterface(Cmd):
     def do_import_bes(self, statement):
         """import bes file"""
 
-        self.poutput(f"Import file: {statement.args}")
+        bes_file_path = str(statement.args).strip()
+
+        site_path = self.bes_conn.get_current_site_path(None)
+
+        self.poutput(f"Import file: {bes_file_path}")
 
-        self.poutput(self.bes_conn.import_bes_to_site(str(statement.args)))
+        self.poutput(self.bes_conn.import_bes_to_site(bes_file_path, site_path))
 
     complete_upload = Cmd.path_complete