2 files changed, 27 insertions, 4 deletions

diff --git a/devshell.py b/devshell.py
index 0518cc7..05bf215 100755
--- a/devshell.py
+++ b/devshell.py
@@ -131,6 +131,7 @@ def shell():
         elif keyword in ('py', 'python'):
             os.system("ipython -noconfirm_exit")
         else:
+            #figure out if there is a top
             if len(stack):
                 top = stack[-1]
             else:
@@ -218,18 +219,18 @@ def do_command(data, top=None):
         return output, module, mod_params
     else:
         return output, None, None
-            
 
-def main():
-    global log
+def setup_options():
     from optparse import OptionParser
     parser = OptionParser(usage="%prog [options]",
                           version="%s %s" % ('%prog', __version__),
                           description=__description__)
     parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
                       help='Display verbose debugging output')
-    (opts, args) = parser.parse_args()
+    return parser.parse_args()
 
+def setup_logger(opts):
+    global log
     # Setup our logger
     sh = logging.StreamHandler()
     if opts.verbose:
@@ -243,6 +244,11 @@ def main():
     sh.setFormatter(format)
     log.addHandler(sh)
 
+def main():
+    (opts, args) = setup_options()
+
+    setup_logger(opts)
+
     if not os.path.isdir(FEDORA_DIR):
         log.info("Creating %s" % FEDORA_DIR)
         os.makedirs(FEDORA_DIR)
diff --git a/ports.py b/ports.py
index d4d5005..f455221 100755
--- a/ports.py
+++ b/ports.py
@@ -17,4 +17,21 @@
 # Authors: Yaakov M. Nemoy <ynemoy@redhat.com>
 #
 
+import sys
+import os
+from devshell import *
 
+print sys.argv
+
+def main():
+    (opts, args) = setup_options()
+
+    setup_logger(opts)
+
+    load_modules()
+    log.debug(args)
+    
+    print do_command(args)
+    
+if __name__ == '__main__':
+    main()
\ No newline at end of file