Rename "bonobo graph" to "bonobo inspect". For now, graphviz is default but there will probably be a humand default in the future, with graphviz source generation set if --graph (or -g) flag is passed.

bonobo/commands/graph.py

@@ -1,32 +0,0 @@
-import json
-
-import itertools
-
-from bonobo.util.objects import get_name
-from bonobo.commands.run import read, register_generic_run_arguments
-from bonobo.constants import BEGIN
-
-
-def execute(filename, module, install=False, quiet=False, verbose=False):
-    graph, plugins, services = read(filename, module, install, quiet, verbose)
-
-    print('digraph {')
-    print('  rankdir = LR;')
-    print('  "BEGIN" [shape="point"];')
-
-    for i in graph.outputs_of(BEGIN):
-        print('  "BEGIN" -> ' + json.dumps(get_name(graph[i])) + ';')
-
-    for ix in graph.topologically_sorted_indexes:
-        for iy in graph.outputs_of(ix):
-            print('  {} -> {};'.format(
-                json.dumps(get_name(graph[ix])),
-                json.dumps(get_name(graph[iy]))
-            ))
-
-    print('}')
-
-
-def register(parser):
-    register_generic_run_arguments(parser)
-    return execute

bonobo/commands/inspect.py

@@ -0,0 +1,33 @@
+import json
+
+from bonobo.commands.run import read, register_generic_run_arguments
+from bonobo.constants import BEGIN
+from bonobo.util.objects import get_name
+
+OUTPUT_GRAPHVIZ = 'graphviz'
+
+def execute(*, output, **kwargs):
+    graph, plugins, services = read(**kwargs)
+
+    if output == OUTPUT_GRAPHVIZ:
+        print('digraph {')
+        print('  rankdir = LR;')
+        print('  "BEGIN" [shape="point"];')
+
+        for i in graph.outputs_of(BEGIN):
+            print('  "BEGIN" -> ' + json.dumps(get_name(graph[i])) + ';')
+
+        for ix in graph.topologically_sorted_indexes:
+            for iy in graph.outputs_of(ix):
+                print('  {} -> {};'.format(json.dumps(get_name(graph[ix])), json.dumps(get_name(graph[iy]))))
+
+        print('}')
+    else:
+        raise NotImplementedError('Output type not implemented.')
+
+
+def register(parser):
+    register_generic_run_arguments(parser)
+    parser.add_argument('--graph', '-g', dest='output', action='store_const', const=OUTPUT_GRAPHVIZ)
+    parser.set_defaults(output=OUTPUT_GRAPHVIZ)
+    return execute

bonobo/commands/run.py

@@ -3,7 +3,7 @@ import os
 import bonobo
 from bonobo.constants import DEFAULT_SERVICES_ATTR, DEFAULT_SERVICES_FILENAME
 
-DEFAULT_GRAPH_FILENAMES = ('__main__.py', 'main.py',)
+DEFAULT_GRAPH_FILENAMES = ('__main__.py', 'main.py', )
 DEFAULT_GRAPH_ATTR = 'get_graph'
 
 
@@ -99,11 +99,7 @@ def read(filename, module, install=False, quiet=False, verbose=False, env=None):
 def execute(filename, module, install=False, quiet=False, verbose=False, env=None):
     graph, plugins, services = read(filename, module, install, quiet, verbose, env)
 
-    return bonobo.run(
-        graph,
-        plugins=plugins,
-        services=services
-    )
+    return bonobo.run(graph, plugins=plugins, services=services)
 
 
 def register_generic_run_arguments(parser, required=True):