From 04f2540be11377c4664dfff42f8282c7c40ab5df Mon Sep 17 00:00:00 2001
From: jrtechs <jeffery@jrtechs.net>
Date: Thu, 26 Apr 2018 17:41:31 -0400
Subject: [PATCH] Added functionality to pipe messages into cowsay.

---
 src/roosay.py      | 18 ++++++++++++++----
 src/ssh_manager.py | 27 +++++++++++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/roosay.py b/src/roosay.py
index 407b132..7d3a504 100644
--- a/src/roosay.py
+++ b/src/roosay.py
@@ -17,7 +17,13 @@ def main():
         if len(message) > 0:
             message += " "
         message += sys.argv[i]
+    
+    for line in sys.stdin:
+        message+= line.rstrip()
+        print(line)
 
+    message = " ".join(message.split())
+    print(message)
     roo_say(message)
 
 
@@ -49,11 +55,14 @@ def print_message(message):
         else:
             for i in range(0, len(print_list)):
                 if i == 0:
-                    print("/ " + print_list[i] + " " * (max_len - len(print_list[i])) +" \\")
+                    print("/ " + print_list[i] 
+                        + " " * (max_len - len(print_list[i])) +" \\")
                 elif i == len(print_list) -1:
-                    print("\ " + print_list[i] + " " * (max_len - len(print_list[i])) + " /")
+                    print("\ " + print_list[i]
+                        + " " * (max_len - len(print_list[i])) + " /")
                 else:
-                    print("| " + print_list[i] + " " * (max_len - len(print_list[i])) + " |")
+                    print("| " + print_list[i] 
+                        + " " * (max_len - len(print_list[i])) + " |")
         "print bottom"
         print(" " + "-" * (max_len + 2))
     else:
@@ -62,7 +71,8 @@ def print_message(message):
 
 def convert_to_list(message):
     """
-    Converts the message into string lines which are less than 35 characters - easier for printing
+    Converts the message into string lines which are 
+    less than 35 characters - easier for printing
     :param message: the string message
     :return: the list of the string lines and the length of the longest line
     """
diff --git a/src/ssh_manager.py b/src/ssh_manager.py
index 13e8450..ff2d511 100644
--- a/src/ssh_manager.py
+++ b/src/ssh_manager.py
@@ -35,7 +35,8 @@ def print_menu_option(s):
 
 def main():
     """
-    This function inputs all the available hosts from a text file and prompts the user to connect to them
+    This function inputs all the available hosts from a text file and 
+    prompts the user to connect to them
     :return:
     """
     print_welcome_message()
@@ -48,7 +49,8 @@ def main():
         cmp.append(Computer(line, count))
         count += 1
 
-    print(print_magenta("*") + "         " + print_green("SSH manager V 0.2") + "        " + print_magenta("*"))
+    print(print_magenta("*") + "         " + 
+        print_green("SSH manager V 0.2") + "        " + print_magenta("*"))
     for c in cmp:
         print_menu_option(str(c.menu_id) + ") " + c.host)
 
@@ -85,7 +87,8 @@ def socks_ssh_tunnel():
         cmp.append(Computer(line, count))
         count += 1
 
-    print(print_magenta("*") + "         " + print_green("Socks Tunnel") + "             " + print_magenta("*"))
+    print(print_magenta("*") + "         " + 
+            print_green("Socks Tunnel") + "             " + print_magenta("*"))
     for c in cmp:
         print_menu_option(str(c.menu_id) + ") " + c.host)
     print_menu_option("A) Exit")
@@ -111,7 +114,8 @@ def print_sub_menu():
     :return: None
     """
     print(print_magenta("**************************************"))
-    print(print_magenta("*") + print_green("Options") + "                           " + print_magenta("*"))
+    print(print_magenta("*") + print_green("Options") + 
+        "                           " + print_magenta("*"))
     print_menu_option("1) Add Host")
     print_menu_option("2) Copy SSH key to server")
     print_menu_option("3) Remove host name")
@@ -131,7 +135,8 @@ def print_red(prt): return "\033[91m {}\033[00m" .format(prt)
 
 def sub_menu():
     """
-    calls printSubMenu and then gets input from user to make appropriate function calls
+    calls printSubMenu and then gets input from user to 
+    make appropriate function calls
     :return: None
     """
     print_sub_menu()
@@ -184,7 +189,8 @@ def copy_ssh_key():
         cmp.append(Computer(line, count))
         count += 1
 
-    print(print_magenta("*") + "         " + print_green("Copy SSH Key") + "             " + print_magenta("*"))
+    print(print_magenta("*") + "         " + 
+        print_green("Copy SSH Key") + "             " + print_magenta("*"))
     for c in cmp:
         print_menu_option(str(c.menu_id) + ") " + c.host)
 
@@ -210,8 +216,10 @@ def remove_host():
         cmp.append(Computer(line, count))
         count += 1
     for c in cmp:
-        space = " " * (len(WELCOME_MESSAGE) - 3 - len(str(c.menu_id) + ") " + c.host))
-        print(print_red("*") + str(c.menu_id) + ") " + c.host + space + print_red("*"))
+        space = " " * (len(WELCOME_MESSAGE) - 3 - 
+                len(str(c.menu_id) + ") " + c.host))
+        print(print_red("*") + str(c.menu_id) + ") " + 
+            c.host + space + print_red("*"))
 
     print(print_red("*" * len(WELCOME_MESSAGE)))
 
@@ -226,4 +234,7 @@ def remove_host():
 Makes sure that other programs don't execute the main
 """
 if __name__ == '__main__':
+    try:
         main()
+    except KeyboardInterrupt:
+        exit_program();