Branch 'dashboard' - setup.py
by Luke Macken
setup.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 83268fb182489d2cf03331df03a0d0ef103c8936
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sun Dec 13 15:52:40 2009 -0500
Require CatWalk, for now
diff --git a/setup.py b/setup.py
index 6f99bba..5df0354 100644
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,7 @@ setup(
"tw.forms",
"pytz",
"Babel",
+ "Catwalk",
#"WidgetBrowser", # not in PyPi yet
],
packages=find_packages(exclude=['ez_setup']),
14 years, 6 months
Branch 'dashboard' - setup.py
by Luke Macken
setup.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f157421f7d14c79e629cd0e9a4c4973eec55cea2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sun Dec 13 15:51:53 2009 -0500
Require Babel
diff --git a/setup.py b/setup.py
index 3b16dcc..6f99bba 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ setup(
"Paver",
"tw.forms",
"pytz",
+ "Babel",
#"WidgetBrowser", # not in PyPi yet
],
packages=find_packages(exclude=['ez_setup']),
14 years, 6 months
4 commits - moksha/api moksha/apps moksha/widgets
by Luke Macken
moksha/api/errorcodes.py | 4 ++--
moksha/apps/feeds/moksha/apps/feeds/consumer.py | 2 --
moksha/widgets/container/tests/test_container.py | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 1a5c1ea0815d30048d7dbce56adf2503b9c82c28
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 22:10:48 2009 -0500
Update our container test case
diff --git a/moksha/widgets/container/tests/test_container.py b/moksha/widgets/container/tests/test_container.py
index 0d42cf8..4151cda 100644
--- a/moksha/widgets/container/tests/test_container.py
+++ b/moksha/widgets/container/tests/test_container.py
@@ -23,7 +23,8 @@ class TestContainer:
self.w = MokshaContainer('test')
def test_render_widget(self):
- assert '<div id="test" ' in self.w()
+ assert 'Moksha Container' in self.w()
+
def test_widget_content(self):
""" Ensure we can render a container with another widget """
commit c1a3f1cd07253b916af07ac98727697cdde3de2c
Merge: b3c7e5d... d73a276...
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 21:20:41 2009 -0500
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha
commit b3c7e5d5432798adb7360431e54dbf5039bcf7f0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Dec 11 14:49:57 2009 -0500
Remove some unnecessary debugging output
diff --git a/moksha/apps/feeds/moksha/apps/feeds/consumer.py b/moksha/apps/feeds/moksha/apps/feeds/consumer.py
index d3ba480..164ae6b 100644
--- a/moksha/apps/feeds/moksha/apps/feeds/consumer.py
+++ b/moksha/apps/feeds/moksha/apps/feeds/consumer.py
@@ -61,8 +61,6 @@ class MokshaFeedConsumer(Consumer):
'rootVisible': False,
'key': "%s::%s" % (url, entry.get('title', '').replace(' ','')),
})
- print "Sending response! back to %s" % message['topic']
- print len(entries)
self.send_message(message['topic'], {
'entries': entries,
'key': url,
commit b7e96a6cace9f468a69d83a0150f3bf70845d407
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Dec 11 14:49:21 2009 -0500
Fix a typo with one of our error codes
diff --git a/moksha/api/errorcodes.py b/moksha/api/errorcodes.py
index b37155d..03959b7 100644
--- a/moksha/api/errorcodes.py
+++ b/moksha/api/errorcodes.py
@@ -29,9 +29,9 @@ login_err = ErrEnum ('login_err',
('The username or password you entered is not valid. Please '
'try again.')
),
- ('UNKOWN_AUTH_ERROR',
+ ('UNKNOWN_AUTH_ERROR',
('An unknown error occurred while trying to log you in. '
'Please try again later or notify an admin if the problem '
'persists')
)
- )
\ No newline at end of file
+ )
14 years, 6 months
Changes to 'dashboard'
by Luke Macken
New branch 'dashboard' available with the following commits:
commit 24dbba8565867312faf9cd2c22f6c7d7162b0336
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sun Dec 13 14:30:23 2009 -0500
Initial attempt at a dashboard quickstart & test case.
- The unit test doesn't seem to work yet.
commit 1a5c1ea0815d30048d7dbce56adf2503b9c82c28
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 22:10:48 2009 -0500
Update our container test case
commit c1a3f1cd07253b916af07ac98727697cdde3de2c
Merge: b3c7e5d5432798adb7360431e54dbf5039bcf7f0 d73a276ea55d78e78c49ff495e0deae45e32efa6
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 21:20:41 2009 -0500
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha
commit b3c7e5d5432798adb7360431e54dbf5039bcf7f0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Dec 11 14:49:57 2009 -0500
Remove some unnecessary debugging output
commit b7e96a6cace9f468a69d83a0150f3bf70845d407
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Dec 11 14:49:21 2009 -0500
Fix a typo with one of our error codes
14 years, 6 months
moksha/templates
by Luke Macken
moksha/templates/widgets.mak | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 539f96d2561e94704efd12c20e72874944a8cec9
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 17:27:26 2009 -0500
Add a moksha.templates.widgets template
diff --git a/moksha/templates/widgets.mak b/moksha/templates/widgets.mak
new file mode 100644
index 0000000..e636937
--- /dev/null
+++ b/moksha/templates/widgets.mak
@@ -0,0 +1,15 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ </head>
+ <body>
+ % for widget in tmpl_context.widgets:
+ ${widget(**options.get(widget, dict()))}
+ % endfor
+ </body>
+
+ % if tmpl_context.moksha_socket:
+ ${tmpl_context.moksha_socket()}
+ % endif
+
+</html>
14 years, 6 months
.gitignore
by Luke Macken
.gitignore | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f99c069824baa0c87dbd0c15f2dfa3088ee17459
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 17:26:44 2009 -0500
Hide dist directories in our gitignore
diff --git a/.gitignore b/.gitignore
index 50a3769..432dd88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ moksha/apps/*/build
moksha/apps/*/*egg-info
tg2-bootstrap.py
*.cachegrind
+dist
14 years, 6 months
start-moksha
by Luke Macken
start-moksha | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 24ca0ea775af40419e7c4596ef2e561a4a9ebdf0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 16:16:26 2009 -0500
install pysqlite, for the love of $DEITY
diff --git a/start-moksha b/start-moksha
index d35801e..e40c79d 100755
--- a/start-moksha
+++ b/start-moksha
@@ -16,6 +16,7 @@ if [ ! $VIRTUAL_ENV ]; then
easy_install -U SQLAlchemy
easy_install Paver
easy_install Twisted
+ easy_install pysqlite
easy_install -U ToscaWidgets
# `install` instead of `develop` to avoid weird directory vs. egg
14 years, 6 months
2 commits - docs/main pavement.py
by Luke Macken
docs/main/MessageBrokers.rst | 10 ++++++++--
pavement.py | 10 ++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit ee98d9e9b429e65591022f88b9c6103073e2029e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 11:18:00 2009 -0500
Add restart_orbited and all paver tasks
diff --git a/pavement.py b/pavement.py
index e360ac5..1b64fc6 100644
--- a/pavement.py
+++ b/pavement.py
@@ -201,6 +201,10 @@ def restart_hub():
sh('sudo /sbin/service moksha-hub restart')
@task
+def restart_orbited():
+ sh('sudo /sbin/service orbited restart')
+
+@task
def reinstall_apps():
for app in os.listdir('moksha/apps'):
app_dir = path('moksha') / 'apps' / app
@@ -246,3 +250,9 @@ def smock(options):
@needs(['paver.doctools.html'])
def html():
pass
+
+@task
+@needs(['reinstall', 'reinstall_apps', 'test', 'restart_httpd', 'restart_hub', 'restart_orbited'])
+def all():
+ pass
+magic = all
commit 82795ff734163b2562e957fb526b43342e77c9ba
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Dec 11 18:23:07 2009 -0500
Update our Message Broker docs to reflect recent AMQP improvements
diff --git a/docs/main/MessageBrokers.rst b/docs/main/MessageBrokers.rst
index c61452c..3b14357 100644
--- a/docs/main/MessageBrokers.rst
+++ b/docs/main/MessageBrokers.rst
@@ -23,14 +23,20 @@ well.
-------------------------
Plugging an `AMQP <http://amqp.org>`_ broker into Moksha is trivial. Simply
-add an `amqp_broker` to your configuration:
+add an `amqp_broker` to your configuration, and change the live socket backend:
.. code-block:: none
amqp_broker = guest/guest@localhost
+ moksha.livesocket.backend = amqp
-The :class:`MokshaHub` will then automatically connect up to your AMQP broker and proxy messages to the STOMP broker and Moksha Consumers.
+.. note::
+
+ It's probably best to comment out the `stomp_broker` when you enable AMQP
+ support. You can have both, but Moksha will enter a bridged mode that
+ may or may not work as expected.
+The :class:`MokshaHub` will then automatically connect up to your AMQP broker and proxy messages to the STOMP broker and Moksha Consumers.
AMQP support in Moksha has been tested with `Qpid <http://qpid.apache.org>`_.
14 years, 6 months
start-moksha
by Luke Macken
start-moksha | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 1b8f64fab9a6826ef2d22fc47917210584a292d7
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 15:22:03 2009 -0500
'install' then 'develop' when running start-moksha
For some reason this was the only way I could get the start-moksha
to run out of the box on my iMac, without routes exploding not being
able to find the moksha.metrics/controllers directory. It must
be expecting both egg.lnk, and the .egg directory.
diff --git a/start-moksha b/start-moksha
index dc999f0..d35801e 100755
--- a/start-moksha
+++ b/start-moksha
@@ -49,19 +49,13 @@ if [ ! $VIRTUAL_ENV ]; then
#pushd moksha/widgetbrowser; python setup.py develop; popd
else
source tg2env/bin/activate
-
- # `install` instead of `develop` to avoid weird directory vs. egg
- # namespace issues
- #echo "Installing Moksha"
- #rm -fr dist
- #python setup.py bdist_egg
- #easy_install -Z dist/*.egg
- python setup.py install
fi
fi
echo "Starting Moksha..."
+python setup.py develop
+
echo "Starting the WSGI stack..."
paster serve development.ini &
echo $! >> paster.pid
14 years, 6 months
moksha/hub
by Luke Macken
moksha/hub/hub.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 7d91feb7143942501a30c0ddcfccbb390d9dcccb
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Dec 12 15:09:48 2009 -0500
Add the current directory to the path in the hub.
This should hopefully have pkg_resources look in the current
directory for un-installed egg-info metadata
diff --git a/moksha/hub/hub.py b/moksha/hub/hub.py
index db14dc3..4788c18 100644
--- a/moksha/hub/hub.py
+++ b/moksha/hub/hub.py
@@ -16,13 +16,20 @@
#
# Authors: Luke Macken <lmacken(a)redhat.com>
-from moksha.hub.reactor import reactor
+import os
import sys
+
+# Look in the current directory for egg-info
+if os.getcwd() not in sys.path:
+ sys.path.insert(0, os.getcwd())
+
import signal
import pkg_resources
import logging
+from moksha.hub.reactor import reactor
+
from tg import config
from orbited import json
from paste.deploy import appconfig
14 years, 6 months