Add --save-config to bin/hooke and don't silently save config file.

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index a8079a9a2e498ca19b0db75730ab4cd8bc202252..d9def059acc40035eaece866362e2e970049753a 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -107,6 +107,8 @@ class Hooke (object):
         self.commands = []
         for plugin in self.plugins:
             self.commands.extend(plugin.commands())
+        self.command_by_name = dict(
+            [(c.name, c) for c in self.commands])
 
     def load_drivers(self):
         self.drivers = plugin_mod.load_graph(
@@ -115,8 +117,9 @@ class Hooke (object):
     def load_ui(self):
         self.ui = ui.load_ui(self.config)
 
-    def close(self):
-        self.config.write() # Does not preserve original comments
+    def close(self, save_config=False):
+        if save_config == True:
+            self.config.write()  # Does not preserve original comments
 
     def run_command(self, command, arguments):
         """Run `command` with `arguments` using
@@ -170,7 +173,7 @@ class HookeRunner (object):
     def _cleanup_run(self, ui_to_command, command_to_ui, command):
         log = logging.getLogger('hooke')
         log.debug('cleanup sending CloseEngine')
-        ui_to_command.put(ui.CloseEngine())
+        ui_to_command.put(engine.CloseEngine())
         hooke = None
         while not isinstance(hooke, Hooke):
             log.debug('cleanup waiting for Hooke instance from the engine.')
@@ -196,6 +199,13 @@ def main():
         '--command-no-exit', dest='command_exit',
         action='store_false', default=True,
         help="Don't exit after running a script or commands.")
+    p.add_option(
+        '--save-config', dest='save_config',
+        action='store_true', default=False,
+        help="Automatically save a changed configuration on exit.")
+    p.add_option(
+        '--debug', dest='debug', action='store_true', default=False,
+        help="Enable debug logging.")
     options,arguments = p.parse_args()
     if len(arguments) > 0:
         print >> sys.stderr, 'More than 0 arguments to %s: %s' \
@@ -209,6 +219,10 @@ def main():
     if options.version == True:
         print version()
         sys.exit(0)
+    if options.debug == True:
+        hooke.config.set(
+            section='handler_hand1', option='level', value='NOTSET')
+        hooke.load_log()
     if options.script != None:
         with open(os.path.expanduser(options.script), 'r') as f:
             options.commands.extend(f.readlines())
@@ -217,10 +231,10 @@ def main():
             hooke = runner.run_lines(hooke, options.commands)
         finally:
             if options.command_exit == True:
-                hooke.close()
+                hooke.close(save_config=options.save_config)
                 sys.exit(0)
 
     try:
         hooke = runner.run(hooke)
     finally:
-        hooke.close()
+        hooke.close(save_config=options.save_config)