Update main.py

README.md

@@ -4,65 +4,76 @@
 ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/rly0nheart/octosuite?style=for-the-badge&logo=github) 
 ![OS](https://img.shields.io/badge/OS-GNU%2FLinux-red?style=for-the-badge&logo=Linux)
 ![OS](https://img.shields.io/badge/OS-Windows-blue?style=for-the-badge&logo=Windows)
+![OS](https://img.shields.io/badge/OS-Mac-blue?style=for-the-badge&logo=apple)
 ![GitHub](https://img.shields.io/github/license/rly0nheart/octosuite?style=for-the-badge&logo=github)
-![Lines of code](https://img.shields.io/tokei/lines/github/rly0nheart/octosuite?style=for-the-badge&logo=github)
 ![GitHub repo size](https://img.shields.io/github/repo-size/rly0nheart/octosuite?style=for-the-badge&logo=github)
 
 > *Simply gather OSINT on Github users and organizations like a god🔥*
 
+
 # INSTALLATION
 **clone project**:
 
 ```
-$ git clone https://github.com/rly0nheart/octosuite.git
+git clone https://github.com/rly0nheart/octosuite.git
 ```
 
 ```
-$ cd octosuite
+cd octosuite
+```
+
+```
+pip install -r requirements.txt
 ```
 
 # USAGE
 **Linux**:
 ```
-$ sudo chmod +x octosuite
+sudo chmod +x octosuite
 ```
 
 ```
-$ ./octosuite
+sudo ./octosuite
 ```
 
 **Windows**:
 ```
-$ python3 octosuite
+python3 octosuite
+```
+
+**Mac**:
+```
+python3 octosuite
 ```
 
 # AVAILABLE COMMANDS
 | Command         | Usage|
 | ------------- |:---------:|
-| <code>orginfo</code> | *get organization info*  |
+| ``orginfo`` | *get organization info*  |
-| <code>userinfo</code> | *get user profile info*  |
+| ``userinfo`` | *get user profile info*  |
-| <code>repoinfo</code> | *get repository info*  |
+| ``repoinfo`` | *get repository info*  |
-| <code>pathcontents</code>  | *get contents of a path from a specified repository* |
+| ``pathcontents``  | *get contents of a path from a specified repository* |
-| <code>orgrepos</code>      | *get a list of repositories owned by a specified organization* |
+| ``orgrepos``      | *get a list of repositories owned by a specified organization* |
-| <code>userrepos</code>  | *get a list of repositories owned by a specified user* |
+| ``userrepos``  | *get a list of repositories owned by a specified user* |
-| <code>usergists</code>  |  *get a list of gists owned by a specified user* |
+| ``usergists``  |  *get a list of gists owned by a specified user* |
-| <code>userfollowers</code>  |  *get a list of a user's followers* |
+| ``userfollowers``  |  *get a list of a user's followers* |
-| <code>userfollowing</code> | *check whether user A follows user B* |
+| ``userfollowing`` | *check whether user A follows user B* |
-| <code>usersearch</code> | *search user(s)* |
+| ``usersearch`` | *search user(s)* |
-| <code>reposearch</code> | *search repositor(y)(ies)* |
+| ``reposearch`` | *search repositor(y)(ies)* |
-| <code>topicsearch</code> | *search topics(s)* |
+| ``topicsearch`` | *search topics(s)* |
-| <code>issuesearch</code> | *search issue(s)* |
+| ``issuesearch`` | *search issue(s)* |
-| <code>commitsearch</code> | *search commit(s)* |
+| ``commitsearch`` | *search commit(s)* |
-| <code>usersearch</code> | *search user(s)* |
+| ``usersearch`` | *search user(s)* |
-| <code>update</code> | *check for/download updates* |
+| ``update`` | *update octosuite* |
-| <code>author</code> | *show author info* |
+| ``changelog`` | *show changelog* |
-| <code>help</code> | *show usage/help* |
+| ``author`` | *show author info* |
-| <code>exit</code> | *exit session* |
+| ``help`` | *show usage/help* |
+| ``exit`` | *exit session* |
 
 
 # NOTE
 * *octosuite automatically logs network and minor user activity. The logs are saved by date and time in .logs folder*
-* *octosuite has only been tested on **Termux** *and* **Kali Linux** (for now), please be sure to let me know how it works on **Windows***
+* *Although octosuite was developed to work on **Mac**, **Windows**, or any **Linux** *Distribution*, it has only been tested on **Termux** *and* **Kali Linux***
 
 # LICENSE
 ![license](https://user-images.githubusercontent.com/74001397/137917929-2f2cdb0c-4d1d-4e4b-9f0d-e01589e027b5.png)

lib/banner.py

@@ -7,7 +7,7 @@ banner = f'''{red}
 ░ ████▓▒░▒ ▓███▀ ░  ▒██▒ ░ ░ ████▓▒░▒██████▒▒▒█████▓ ░██░  ▒██▒ ░ ░▒████▒
 ░ ▒░▒░▒░ ░ ░▒ ▒  ░  ▒ ░░   ░ ▒░▒░▒░ ▒ ▒▓▒ ▒ ░░▒▓▒ ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
   ░ ▒ ▒░   ░  ▒       ░      ░ ▒ ▒░ ░ ░▒  ░ ░░░▒░ ░ ░  ▒ ░    ░     ░ ░  ░
-░ ░ ░ ▒  ░          ░      ░ ░ ░ ▒  ░  ░  ░   ░░░ ░ ░  ▒ v1.1.0
+░ ░ ░ ▒  ░          ░      ░ ░ ░ ▒  ░  ░  ░   ░░░ ░ ░  ▒ v1.3.0
     ░ ░  ░ ░                   ░ ░        ░     ░      ░              ░  ░
          ░                              {white}— Advanced Github {red}OSINT{white} Framework{reset}
 

lib/colors.py

@@ -1,9 +1,10 @@
 import sys
 
+# Colors will be unavailable on non-linux machines
 colors = True
-machine = sys.platform # Detecting the os
+machine = sys.platform
 if machine.lower().startswith(("os", "win", "darwin")): 
-    colors = False # Colors will not be displayed
+    colors = False
 
 if not colors:
 	reset = red = white = green  = ""

requirements.txt

@@ -0,0 +1,2 @@
+tqdm
+requests

src/main.py

@@ -1,18 +1,13 @@
 import os
 import logging
+import requests
 import platform
 import subprocess
 import urllib.request
+from tqdm import tqdm
 from pprint import pprint
 from lib import colors,banner
 from datetime import datetime
-try:
-	import requests
-except ImportError:
-	print(f'{colors.white}[{colors.green}*{colors.white}] Installing requirement(s). Please wait...{colors.reset}')
-	subprocess.run(['pip', 'install', 'requests'],shell=False)
-	exit(f'{colors.white}[{colors.green}+{colors.white}] Installation complete. Re-run octosuite.{colors.reset}')
-
 
 class octosuite:
     def __init__(self):
@@ -155,9 +150,6 @@ class octosuite:
         # Author dictionary
         self.author_dict = {'Alias': 'rly0nheart',
                                          'Country': 'Zambia, Africa',
-                                         'Github': 'https://github.com/rly0nheart',
-                                         'Twitter': 'https://twitter.com/rly0nheart',
-                                         'Facebook': 'https://fb.me/rly0nheart',
                                          'About.me': 'https://about.me/rly0nheart'}    
         
     def on_start(self):
@@ -200,6 +192,8 @@ class octosuite:
             	self.commits_search()
             elif command == 'update':
             	self.update()
+            elif command == 'changelog':
+            	print(self.changelog())
             elif command == 'author':
             	self.author()
             elif command == 'help':
@@ -410,10 +404,9 @@ class octosuite:
     
     # Update program
     def update(self):
-    	logging.info('Checking for update(s)...')
+    	logging.info('Fetching updates...')
-    	files_to_update = ['src/main.py','lib/banner.py','lib/colors.py','octosuite','LICENSE','README.md']
+    	files_to_update = ['src/main.py','lib/banner.py','lib/colors.py','octosuite','LICENSE','README.md','requirements.txt']
-    	print(f'\n{colors.white}[{colors.green}*{colors.white}] Fetching update(s). Please wait...{colors.reset}',end='')
+    	for file in tqdm(files_to_update,desc=f'{colors.white}[{colors.green}*{colors.white}] Fetching updates...{colors.reset}'):
-    	for file in files_to_update:
     		data = urllib.request.urlopen(f'https://raw.githubusercontent.com/rly0nheart/octosuite/master/{file}').read()
     		with open(file, 'wb') as code:
     			code.write(data)
@@ -423,6 +416,20 @@ class octosuite:
     	exit(f'\n{colors.white}[{colors.green}+{colors.white}] Update complete. Re-run octosuite.{colors.reset}')
     	
     	
+    # Show changelog
+    def changelog(self):
+    	# lol yes the changelog is hard coded
+    	changelog_text = '''
+    	v1.3.0 Changelog:
+    		
+• Adjusted to work on Mac
+• Added changelog command
+• Added progress bar when fetching updates
+• Minor bug fixes
+'''
+    	return changelog_text
+    	
+    	
     # Author info   
     def author(self):
         print(f'\n{colors.white}Richard Mwewa (Ritchie){colors.reset}')
@@ -448,7 +455,8 @@ usage:
    topicsearch       -->    Search topic(s)
    issuesearch       -->    Search issue(s)
    commitsearch      -->    Search commit(s)
-   update            -->    Check for/download update(s)
+   update            -->    Update octosuite
+   changelog         -->    Show changelog
    author            -->    Show author info
    help              -->    Show usage/help
    exit              -->    Exit session
@@ -456,5 +464,5 @@ usage:
     	return help
 
 
-# Set to automatically monitor and log network and user activity to .log folder
+# Set to automatically monitor and log network and user activity into the .logs folder
 logging.basicConfig(filename=f'.logs/{datetime.now()}.log',format='[%(asctime)s] %(message)s',level=logging.DEBUG)