Updated copyright blurbs in all files to '# Copyright'

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index ed6f8ba867edd5efc621a00e552f1e0da7b8ca2a..b2b599835fd7f46ec8bef12eca684ecf30da32aa 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -1,15 +1,13 @@
-#!/usr/bin/env python
+# Copyright
 
-'''
-Hooke - A force spectroscopy review & analysis tool.
-
-A free, open source data analysis platform
-
-COPYRIGHT
-'''
+"""Hooke - A force spectroscopy review & analysis tool.
+"""
 
 import multiprocessing
+import optparse
+import os.path
 import unittest
+import sys
 
 from . import engine as engine
 from . import config as config_mod
@@ -74,26 +72,55 @@ class Hooke (object):
             ui_to_command.put(ui.CloseEngine())
             command.join()
 
+    def run_lines(self, lines):
+        """Run the pre-set commands `lines` with the "command line" UI.
+
+        Allows for non-interactive sessions that are otherwise
+        equivalent to :meth:'.run'.
+        """
+        cmdline = ui.load_ui(self.config, 'command line')
+        ui_to_command = multiprocessing.Queue()
+        command_to_ui = multiprocessing.Queue()
+        command = multiprocessing.Process(
+            target=self.command.run, args=(self, ui_to_command, command_to_ui))
+        command.start()
+        try:
+            cmdline.run_lines(
+                self.commands, ui_to_command, command_to_ui, lines)
+        finally:
+            ui_to_command.put(ui.CloseEngine())
+            command.join()
+
 def main():
+    p = optparse.OptionParser()
+    p.add_option(
+        '-s', '--script', dest='script', metavar='FILE',
+        help='Script of command line Hooke commands to run.')
+    p.add_option(
+        '-c', '--command', dest='commands', metavar='COMMAND',
+        action='append', default=[],
+        help='Add a command line Hooke command to run.')
+    options,arguments = p.parse_args()
+    if len(arguments) > 0:
+        print >> sys.stderr, 'Too many arguments to %s: %d > 0' \
+            % (sys.argv[0], len(arguments))
+        print >> sys.stderr, p.help()
+        sys.exit(1)
+
     app = Hooke(debug=__debug__)
+
+    if options.script != None:
+        f = open(os.path.expanduser(options.script), 'r')
+        options.commands.extend(f.readlines())
+        f.close
+    if len(options.commands) > 0:
+        app.run_lines(options.commands)
+        sys.exit(0)
+
     try:
         app.run()
     finally:
         app.close()
 
-class TestHooke (unittest.TestCase):
-    def test_queue_safe(self):
-        """Ensure :class:`Hooke` is :class:`multiprocessing.Queue`-safe.
-        """
-        from multiprocessing import Queue
-        q = Queue()
-        a = Hooke()
-        q.put(a)
-        b = q.get(a)
-        for attribute_name in dir(a):
-            a_attr = getattr(a, attribute_name)
-            b_attr = getattr(b, attribute_name)
-            self.failUnless(a_attr == b_attr)
-
 if __name__ == '__main__':
     main()