Merge lp:~terrycojones/tickery/work-with-pyjamas-0.7 into lp:tickery

[Terry Jones]

Lots of small changes to make the code work with
Pyjamas 0.7 which it now (maybe) does. Things seem
to run ok, with very limited testing. There was one
show-stopper bug which I tracked down the hard way.

[Terry Jones (terrycojones)]

I claim this review and I fully approve.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-06-16 17:14:49 +0000
+++ .bzrignore	2011-06-17 00:27:27 +0000
@@ -2,5 +2,9 @@
 tickery/twistd.log
 tickery/twistd.pid
 tickery/admin/output/
+tickery/admin/*.js
 tickery/www/output/
+tickery/www/*.js
 twisted/plugins/dropin.cache
+pyjamas
+distribute-*.tar.gz

=== modified file 'Makefile'
--- Makefile	2011-06-14 20:36:36 +0000
+++ Makefile	2011-06-17 00:27:27 +0000
@@ -1,24 +1,26 @@
 .PHONY: all clobber wc dist pep8 pyflakes lint
 
 all:
-	$(MAKE) -C tickery/www $@
-	$(MAKE) -C tickery/admin $@
+	fab build_pyjs
+
+debub:
+	fab build_pyjs_debug
 
 clean:
 	rm -fr tickery/test/_trial_temp MANIFEST dist
 	find . -name '*~' -o -name '*.pyc' -print0 | xargs -0 -r rm
-	$(MAKE) -C tickery/www $@
-	$(MAKE) -C tickery/admin $@
+	rm -fr tickery/www/output tickery/www/*.js
+	rm -fr tickery/admin/output tickery/admin/*.js
 	$(MAKE) -C doc $@
 
 wc:
-	find . -name '*.py' -print0 | xargs -0 wc -l
+	find tickery -name '*.py' -print0 | xargs -0 wc -l
 
 pep8:
-	find . -name '*.py' -print0 | xargs -0 -n 1 pep8 --repeat
+	find tickery -name '*.py' -print0 | xargs -0 -n 1 pep8 --repeat
 
 pyflakes:
-	find . -name '*.py' -print0 | xargs -0 pyflakes
+	find tickery -name '*.py' -print0 | xargs -0 pyflakes
 
 lint: pep8 pyflakes
 

=== modified file 'README'
--- README	2011-06-16 17:37:48 +0000
+++ README	2011-06-17 00:27:27 +0000
@@ -6,8 +6,9 @@
 http://tickery.net
 
 Tickery provides a fun way to explore sets of Twitter friends. There's much
-more to the story however, as its underlying data is stored in Fluidinfo.  This
-means it can be added to by anyone (i.e., you!), and searched on in any way.
+more to the story however, as its underlying data is stored in Fluidinfo.
+This means it can be added to by anyone (i.e., you!), and searched on in
+any way.
 
 We've open-sourced Tickery to help programmers see the insides of a
 substantial application written to use Fluidinfo. Although the Tickery
@@ -29,20 +30,20 @@
 Running Tickery
 ---------------
 
-You'll find instructions on how to run your own version of Tickery in the doc
-directory. If you have Sphinx (http://sphinx.pocoo.org) installed, you can
-build the documentation by running 'make' in the doc dir and then looking at
-doc/_build/html/index.html in your browser. If you don't have Sphinx
-installed and don't want to install it, just look directly at the doc/*.rst
-files.
+You'll find instructions on how to run your own version of Tickery in the
+doc directory. If you have Sphinx (http://sphinx.pocoo.org) installed, you
+can build the documentation by running 'make' in the doc dir and then
+looking at doc/_build/html/index.html in your browser. If you don't have
+Sphinx installed and don't want to install it, just look directly at the
+doc/*.rst files.
 
 Questions?
 ----------
 
-For discussion of Tickery, we suggest you join the Fluidinfo users mailing list
-at http://groups.google.com/group/fluiddb-users or join us in #fluidinfo on
-irc.freenode.net Please say hi, we're very interested in helping people to
-understand both Tickery and Fluidinfo.
+For discussion of Tickery, we suggest you join the Fluidinfo users mailing
+list at http://groups.google.com/group/fluiddb-users or join us in
+#fluidinfo on irc.freenode.net Please say hi, we're very interested in
+helping people to understand both Tickery and Fluidinfo.
 
 
 Happy hacking!

=== modified file 'doc/running.rst'
--- doc/running.rst	2011-06-16 17:37:48 +0000
+++ doc/running.rst	2011-06-17 00:27:27 +0000
@@ -19,8 +19,8 @@
 which is described below. These steps are required because we want to
 continue running our own version of Tickery while wanting you to be able to
 play with the source code and to deploy your own version of Tickery,
-without the possibility that you accidentally disrupt the version
-we have at http://tickery.net
+without the possibility that you accidentally disrupt the version we have
+at http://tickery.net
 
 
 Prerequisites
@@ -30,13 +30,10 @@
 Tickery.
 
 * Python (we use version 2.5.2 in production).
-* `Twisted <http://twistedmatrix.com>`_  (we use version 8.2 in production).
-* `Pyjamas <http://pyjs.org/>`_ (we run http://tickery.net against version 2389 of Pyjamas, which is quite old).
-* `txFluidDB <https://launchpad.net/txfluiddb>`_ (trunk).
-* `txRDQ <https://launchpad.net/txrdq>`_ (trunk).
-* `txJSON-RPC <https://launchpad.net/txjsonrpc>`_ (we are using a slightly modified version of txJSON-RPC, available from http://jon.es/other/txJSON-RPC-fluidinfo.tar.gz  We'll fix this soon!)
 * `Ply <http://www.dabeaz.com/ply/>`_.
 * `Sphinx <http://sphinx.pocoo.org/>`_ (to build this documentation)
+* `Virtualenv <http://pypi.python.org/pypi/virtualenv>`_.
+* `Fabric <http://fabfile.org>`_.
 
 One-time Fluidinfo setup
 ------------------------
@@ -72,28 +69,23 @@
 
 Note that the above assume you're using ``bash`` as a shell.
 
-One-time PYTHONPATH setup
+One-time virtualenv setup
 -------------------------
 
-You'll need the top-level Tickery source directory (which contains a
-directory called ``twisted``) in your Python path. The simplest way to do
-that is to add it to your PYTHONPATH environment variable. If you have
-things set up correctly, you should then be able to run
+Create a virtualenv to run Tickery inside of, and install the 
+requirements.
 
 .. code-block:: sh
 
-    $ twisted tickery --help
-
-and see command line options for Tickery.  Note: if you cannot run this
-command without error, you will not be able to run Tickery until you
-resolve the issue.
+    $ virtualenv tickery-env
+    $ . tickery-env/bin/activate
+    $ pip install -r requirements.txt
 
 Building Tickery's HTML and Javascript via Pyjamas
 --------------------------------------------------
 
-If you've installed `Pyjamas <http://pyjs.org/>`_ correctly, you'll have
-``pyjsbuild`` on your shell's PATH, and you should be able to type ``make``
-at the top level of your ``tickery`` source tree to have the Javascript
+If you've installed things correctly you should be able to type ``make`` at
+the top level of your ``tickery`` source tree to have the Javascript
 built. If this is successful, you'll see terminal output such as the
 following:
 
@@ -101,23 +93,11 @@
 .. code-block:: sh
 
     $ make
-    make -C tickery/www all
-    make[1]: Entering directory `/opt/tickery/trunk/tickery/www'
-    pyjsbuild -O index.py
-    Building: index
-    PYJSPATH: ['/opt/tickery/trunk/tickery/www', '/home/terry/s/net/pyjamas/trunk/library', '/home/terry/s/net/pyjamas/trunk/addons']
-    Built to : /opt/tickery/trunk/tickery/www/output
-    make[1]: Leaving directory `/opt/tickery/trunk/tickery/www'
-    make -C tickery/admin all
-    make[1]: Entering directory `/opt/tickery/trunk/tickery/admin'
-    pyjsbuild -O index.py
-    Building: index
-    PYJSPATH: ['/opt/tickery/trunk/tickery/admin', '/home/terry/s/net/pyjamas/trunk/library', '/home/terry/s/net/pyjamas/trunk/addons']
-    Built to : /opt/tickery/trunk/tickery/admin/output
-    make[1]: Leaving directory `/opt/tickery/trunk/tickery/admin'
+    fab build_pyjs
+    [localhost] run: cd tickery/www && ../../pyjamas/bin/pyjsbuild index.py
+    [localhost] run: cd tickery/admin && ../../pyjamas/bin/pyjsbuild index.py
 
-You'll see lots of ``.html`` and ``.js`` files have been created in
-both ``tickery/www/output`` and ``tickery/admin/output``
+    Done.
 
 To build a debug version of Tickery, use ``make debug`` instead. Note: The
 debug version is about 4 times larger than the non-debug one.
@@ -133,11 +113,12 @@
 .. code-block:: sh
 
     $ cd tickery
-    $ twistd -n tickery
+    $ PYTHONPATH=.. twistd -n tickery
 
 Note that you have to be in the ``tickery`` directory when you run the
 ``twistd`` command. The ``twistd`` server expects to find a ``www/output``
-directory to serve files from.
+directory to serve files from. The PYTHONPATH=.. is needed so that Twisted
+can find its plugins.
 
 There are various options you can use, add ``--help`` to the ``twistd``
 command above to list them. An important one is ``--cache-dir`` (which

=== modified file 'fabfile.py'
--- fabfile.py	2011-06-16 17:37:48 +0000
+++ fabfile.py	2011-06-17 00:27:27 +0000
@@ -30,17 +30,32 @@
     env.path = '%s-%s' % (env.sitename, RELEASE)
 
 
+def install_pyjs():
+    """
+    Download and configure Pyjamas.
+    """
+    local('git clone git://pyjs.org/git/pyjamas.git')
+    local('cd pyjamas && /usr/bin/env python bootstrap.py')
+
+
 def build_pyjs():
     """
     Generate HTML and Javascript from Pyjamas.
     """
-    pyjs_rev = 2389
-    pyjs_url = 'https://pyjamas.svn.sourceforge.net/svnroot/pyjamas/trunk'
-
-    local('svn co --force -r %d %s pyjamas' % (pyjs_rev, pyjs_url))
-    local('cd pyjamas && /usr/bin/env python bootstrap.py')
-    local('cd tickery/www && ../../pyjamas/bin/pyjsbuild -O index.py')
-    local('cd tickery/admin && ../../pyjamas/bin/pyjsbuild -O index.py')
+    local('cd tickery/www && ../../pyjamas/bin/pyjsbuild index.py')
+    local('cd tickery/admin && ../../pyjamas/bin/pyjsbuild index.py')
+
+
+def build_pyjs_debug():
+    """
+    Generate a debugging version of the HTML and Javascript from Pyjamas.
+    """
+    local('cd tickery/www && ../../pyjamas/bin/pyjsbuild '
+          '--strict --print-statements --debug --debug-wrap -o output '
+          'index.py')
+    local('cd tickery/admin && ../../pyjamas/bin/pyjsbuild '
+          '--strict --print-statements --debug --debug-wrap -o output '
+          'index.py')
 
 
 def upload_tickery():

=== modified file 'requirements.txt'
--- requirements.txt	2011-06-16 17:12:50 +0000
+++ requirements.txt	2011-06-17 00:27:27 +0000
@@ -1,4 +1,3 @@
 bzr+http://bazaar.launchpad.net/~terrycojones/txrdq/trunk#egg=txRDQ
 bzr+http://bazaar.launchpad.net/~txfluiddb-maint/txfluiddb/trunk#egg=txFluidDB
 http://jon.es/other/txJSON-RPC-fluidinfo.tar.gz#egg=txJSON-RPC
-#-e svn+https://pyjamas.svn.sourceforge.net/svnroot/pyjamas/trunk/pyjs@2389#egg=pyjamas

=== removed file 'tickery/Makefile'
--- tickery/Makefile	2011-06-14 20:49:53 +0000
+++ tickery/Makefile	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-.PHONY: all debug check clean
-
-all:
-	$(MAKE) -C www $@
-	$(MAKE) -C admin $@
-
-debug:
-	$(MAKE) -C www $@
-	$(MAKE) -C admin $@
-
-clean:
-	$(MAKE) -C www $@
-	$(MAKE) -C admin $@

=== removed file 'tickery/admin/Makefile'
--- tickery/admin/Makefile	2011-06-14 20:49:53 +0000
+++ tickery/admin/Makefile	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-.PHONY: all debug index check clean
-
-all: index
-
-debug: index-debug
-
-index:
-	pyjsbuild -O index.py
-
-index-debug:
-	pyjsbuild -d --strict --print-statements index.py
-
-clean:
-	rm -fr output

=== removed file 'tickery/www/Makefile'
--- tickery/www/Makefile	2011-06-14 20:49:53 +0000
+++ tickery/www/Makefile	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-.PHONY: all debug index check clean
-
-all: index
-
-index:
-	pyjsbuild -O index.py
-
-debug:
-	pyjsbuild -d --strict --print-statements index.py
-
-clean:
-	rm -fr output

=== modified file 'tickery/www/login.py'
--- tickery/www/login.py	2011-06-16 16:10:07 +0000
+++ tickery/www/login.py	2011-06-17 00:27:27 +0000
@@ -60,8 +60,7 @@
 
 class LoginPanel(Grid):
     def __init__(self):
-        Grid.__init__(self, 1, 2, StyleName='login-panel',
-                      HorizontalAlignment=HasAlignment.ALIGN_RIGHT)
+        Grid.__init__(self, 1, 2, StyleName='login-panel')
         self.setCellPadding(0)
         self.setCellSpacing(0)
         formatter = self.getCellFormatter()

=== modified file 'tickery/www/tickerytab.py'
--- tickery/www/tickerytab.py	2011-06-16 17:37:48 +0000
+++ tickery/www/tickerytab.py	2011-06-17 00:27:27 +0000
@@ -84,8 +84,7 @@
                                StyleName='tickery-tab',
                                **kwargs)
         self.topPanel = topPanel  # don't add this yet!
-        self.topGrid = Grid(1, 2, StyleName='tickery-tab-top-grid',
-                            HorizontalAlignment=HasAlignment.ALIGN_LEFT)
+        self.topGrid = Grid(1, 2, StyleName='tickery-tab-top-grid')
         self.add(self.topGrid)
         self.autoActivate = False
 
@@ -148,8 +147,7 @@
                                                  StyleName='large-query-area')
         self.checkResult = HorizontalPanel(Spacing=4)
 
-        mainGrid = Grid(2, 2, StyleName='tickery-tab-panel',
-                        HorizontalAlignment=HasAlignment.ALIGN_LEFT)
+        mainGrid = Grid(2, 2, StyleName='tickery-tab-panel')
         formatter = mainGrid.getCellFormatter()
         mainGrid.setWidget(0, 0, help)
         mainGrid.setWidget(1, 0, self.query)