Improve console driver

fdep/__init__.py

@@ -1 +1 @@
-__VERSION__ = '0.2.3'
+__VERSION__ = '0.2.4'

fdep/commands/install.py

@@ -4,6 +4,8 @@
 
    fdep install [<files...>]
 """
+from __future__ import print_function
+
 import os
 import sys
 import time
@@ -47,7 +49,7 @@ def _parallelized_install(self, to_install):
         queue = Queue()
         line_filler = lambda: sys.stdout.write('\n' * (len(to_install) - 1))  # noqa
         line_filler()
-        print('\x1b[A' * len(to_install))
+        print('\x1b[A' * len(to_install), file=sys.stderr)
         TqdmProgressBar.set_number_of_progressbars(len(to_install))
         threads = [
             Thread(
@@ -95,9 +97,15 @@ def run(self, *args, **kwargs):
                 if sha1sum is not None:
                     actual_sha1sum = HashHelper.calculate_sha1sum(path)
                     if sha1sum != actual_sha1sum:
-                        print(self.messages.FILE_CHANGED.format(entry_name))
+                        print(
+                            self.messages.FILE_CHANGED.format(entry_name),
+                            file=sys.stderr
+                        )
                         return False
-                print(self.messages.ALREADY_INSTALLED.format(entry_name))
+                print(
+                    self.messages.ALREADY_INSTALLED.format(entry_name),
+                    file=sys.stderr
+                )
                 continue
 
             to_install.append((entry_name, path, source_to_use, sha1sum))

fdep/commands/serve.py

@@ -61,7 +61,8 @@ def resolve_module(self, module_name):
             for name in names_to_resolve:
                 module = getattr(module, name)
         except ImportError:
-            sys.stderr.write(self.messages.ERROR_NO_SUCH_MODULE.format(module_name))
+            sys.stderr.write(
+                self.messages.ERROR_NO_SUCH_MODULE.format(module_name))
             return None
         return module
 
@@ -107,7 +108,7 @@ def run(self, *args, **kwargs):
         try:
             # Ensure everything is installed safe and sound.
             if not self.root_runner.commands['install'].run():
-                return False
+                raise Exception("fdep install failed")
 
             func_pairs = self.get_func_pairs(python_module_name)
             if server_driver_name in self.__class__.KNOWN_DRIVERS:

fdep/runner.py

@@ -1,4 +1,6 @@
 """Interpret configuration files and execute."""
+from __future__ import print_function
+
 import sys
 
 from fdep import messages
@@ -62,7 +64,7 @@ def __init__(self, env, config):
     def run(self, *args, **kwargs):
         """Interpret the argv and run appropriate methods."""
         args = list(args)
-        print(self.messages.CURRENT_ENVIRONMENT.format(self.env))
+        print(self.messages.CURRENT_ENVIRONMENT.format(self.env), file=sys.stderr)
         if not len(args):
             cmd = command = None
         else:

fdep/servers/console.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+
 import sys
+from inspect import signature
 
 from fdep.servers import RPCServer
 
@@ -12,21 +15,26 @@ def register_functions(self, func_pairs):
         self.funcs = dict(func_pairs)
 
     def serve_forever(self, **kwargs):
-        print("🌝 Try things out!")
-
-        try:
-            if not kwargs.get('func'):
-                print('We have: {}'.format(', '.join(self.funcs.keys())))
-                sys.stdout.write('Which function? ')
-                sys.stdout.flush()
-                func_name = sys.stdin.readline().strip()
+        if not kwargs.get('func'):
+            print(
+                'Missing --func. Available functions: {}'.format(
+                    ', '.join(self.funcs.keys())
+                ),
+                file=sys.stderr
+            )
+            return
+
+        func_name = kwargs['func']
+        func = self.funcs[func_name]
+        params = list(signature(func).parameters)
+
+        args = []
+        for param in params:
+            if kwargs.get(param):
+                arg = kwargs[param]
             else:
-                func_name = kwargs['func']
-
-            while True:
-                sys.stdout.write("? ")
-                sys.stdout.flush()
-                value = sys.stdin.readline().strip()
-                print(self.funcs[func_name](value))
-        except KeyboardInterrupt:
-            print('')
+                sys.stderr.write("{}: ".format(param))
+                sys.stderr.flush()
+                arg = sys.stdin.readline().strip()
+            args.append(arg)
+        print(self.funcs[func_name](*args))