Merge pull request #619 from NullArray/dev-beta

Bump to version 3.0.3

Author: NullArray

autosploit/main.py

@@ -12,7 +12,6 @@
 )
 from lib.output import (
     info,
-    warning,
     prompt,
     misc_info
 )

lib/banner.py

@@ -1,7 +1,7 @@
 import os
 import random
 
-VERSION = "3.0"
+VERSION = "3.0.3"
 
 
 def banner_1(line_sep="#--", space=" " * 30):

lib/jsonize.py

@@ -58,7 +58,7 @@ def load_exploits(path, node="exploits"):
             try:
                 selected_file = file_list[int(action) - 1]
                 selected = True
-            except Except:
+            except Exception:
                 lib.output.warning("invalid selection ('{}'), select from below".format(action))
                 selected = False
     else:

lib/settings.py

@@ -54,6 +54,7 @@ def complete_text(self, text, state):
 personal/custom         Load a custom host file
 tokens/reset            Reset API tokens if needed
 external                View loaded external commands
+ver[sion]               View the current version of the program
 help/?                  Display this help
 """
 

lib/term/terminal.py

@@ -1,6 +1,7 @@
 import os
 import datetime
 
+import lib.banner
 import lib.settings
 import lib.output
 import lib.errors
@@ -42,6 +43,8 @@ class object for the main terminal of the program
         "external",
         # reset API tokens
         "reset", "tokens",
+        # show the version number
+        "ver", "version",
         # easter eggs!
         "idkwhatimdoing", "ethics", "skid"
     ]
@@ -127,6 +130,12 @@ def get_choice(self):
             retval = ("unknown", original_choice)
         return retval
 
+    def do_show_version_number(self):
+        """
+        display the current version number
+        """
+        lib.output.info("your current version number: {}".format(lib.banner.VERSION))
+
     def do_display_external(self):
         """
         display all external commands
@@ -402,7 +411,7 @@ def terminal_main_display(self, tokens, extra_commands=None, save_history=True):
         terminal main display
         """
         lib.output.warning(
-            "no arguments have been passed, dropping into terminal session. "
+            "no arguments have been parsed at run time, dropping into terminal session. "
             "to get help type `help` to quit type `exit/quit` to get help on "
             "a specific command type `command help`"
         )
@@ -462,6 +471,8 @@ def terminal_main_display(self, tokens, extra_commands=None, save_history=True):
                             self.do_quit_terminal(save_history=save_history)
                         elif any(c in choice for c in ("view", "gathered")):
                             self.do_view_gathered()
+                        elif any(c in choice for c in ("ver", "version")):
+                            self.do_show_version_number()
                         elif "single" in choice:
                             if "help" in choice_data_list:
                                 print(self.do_add_single_host.__doc__)