Added PolymerFitPeaksCommand to hooke.plugin.polymer_fit

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index ccea160687edaa714e5bbbd15204224682104a12..52834df7ab77a607c27c9e410fa3027457b9c238 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -5,15 +5,15 @@
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation, either
-# version 3 of the License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-# Hooke is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with Hooke.  If not, see
@@ -59,16 +59,18 @@ import logging.config
 import multiprocessing
 import optparse
 import os.path
+import Queue
 import unittest
 import StringIO
 import sys
 
-from . import engine as engine
+from . import version
+from . import engine
 from . import config as config_mod
-from . import playlist as playlist
+from . import playlist
 from . import plugin as plugin_mod
 from . import driver as driver_mod
-from . import ui as ui
+from . import ui
 
 
 class Hooke (object):
@@ -94,7 +96,6 @@ class Hooke (object):
     def load_log(self):
         config_file = StringIO.StringIO()
         self.config.write(config_file)
-        x = config_file.getvalue()
         logging.config.fileConfig(StringIO.StringIO(config_file.getvalue()))
         # Don't attach the logger because it contains an unpicklable
         # thread.lock.  Instead, grab it directly every time you need it.
@@ -157,15 +158,23 @@ class HookeRunner (object):
         return (ui_to_command, command_to_ui, command)
 
     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())
-        hooke = command_to_ui.get()
-        assert isinstance(hooke, Hooke)
+        hooke = None
+        while not isinstance(hooke, Hooke):
+            log.debug('cleanup waiting for Hooke instance from the engine.')
+            hooke = command_to_ui.get(block=True)
+            log.debug('cleanup got %s instance' % type(hooke))
         command.join()
         return hooke
 
 
 def main():
     p = optparse.OptionParser()
+    p.add_option(
+        '--version', dest='version', default=False, action='store_true',
+        help="Print Hooke's version information and exit.")
     p.add_option(
         '-s', '--script', dest='script', metavar='FILE',
         help='Script of command line Hooke commands to run.')
@@ -183,6 +192,9 @@ def main():
     hooke = Hooke(debug=__debug__)
     runner = HookeRunner()
 
+    if options.version == True:
+        print version()
+        sys.exit(0)
     if options.script != None:
         f = open(os.path.expanduser(options.script), 'r')
         options.commands.extend(f.readlines())