[Checkins] SVN: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/ Use hurry.resource in the resulting project.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Fri Nov 12 15:00:31 EST 2010
Log message for revision 118385:
Use hurry.resource in the resulting project.
Changed:
U grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/buildout.cfg_tmpl
U grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/setup.py_tmpl
U grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/app.py_tmpl
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/__init__.py
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/hello.js
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/style.css
A grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/resource.py_tmpl
U grokproject/branches/janjaapdriessen-hurry.resource/grokproject/templates.py
U grokproject/branches/janjaapdriessen-hurry.resource/grokproject/utils.py
-=-
Modified: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/buildout.cfg_tmpl 2010-11-12 19:59:19 UTC (rev 118384)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/buildout.cfg_tmpl 2010-11-12 20:00:31 UTC (rev 118385)
@@ -1,7 +1,6 @@
[buildout]
extends = ${version_info_url}
extends-cache = extends-cache
-find-links = ${find_links_url}
include-site-packages = false
develop = .
unzip = true
@@ -28,7 +27,16 @@
# unless you specify an eggs-directory option here.
${eggs_dir}
extensions = buildout.dumppickedversions
+ mr.developer
+auto-checkout = hurry.zoperesource
+ hurry.resource
+ zope.app.wsgi
+[sources]
+hurry.resource = svn svn+ssh://svn.zope.org/repos/main/hurry.resource/branches/janjaapdriessen-resource-publisher
+hurry.zoperesource = svn svn+ssh://svn.zope.org/repos/main/hurry.zoperesource/branches/janjaapdriessen-wsgi
+zope.app.wsgi = svn svn+ssh://svn.zope.org/repos/main/zope.app.wsgi/trunk
+
[versions]
# Override versions here.
Modified: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/setup.py_tmpl
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/setup.py_tmpl 2010-11-12 19:59:19 UTC (rev 118384)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/setup.py_tmpl 2010-11-12 20:00:31 UTC (rev 118385)
@@ -22,7 +22,13 @@
'grok',
'grokui.admin',
'z3c.testsetup',
+ 'hurry.resource[wsgi]',
+ 'hurry.zoperesource',
'grokcore.startup',
# Add extra requirements here
],
- )
+ entry_points={
+ 'hurry.resource.libraries': [
+ 'foo = ${project}.resource:foo',
+ ]
+ })
Modified: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/app.py_tmpl
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/app.py_tmpl 2010-11-12 19:59:19 UTC (rev 118384)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/app.py_tmpl 2010-11-12 20:00:31 UTC (rev 118385)
@@ -1,7 +1,12 @@
import grok
+from ${package} import resource
+
class ${app_class_name}(grok.Application, grok.Container):
pass
class Index(grok.View):
- pass # see app_templates/index.pt
+ # see app_templates/index.pt
+ def update(self):
+ resource.hello.need()
+ resource.style.need()
Added: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/__init__.py
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/__init__.py (rev 0)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/__init__.py 2010-11-12 20:00:31 UTC (rev 118385)
@@ -0,0 +1 @@
+# package
Added: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/hello.js
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/hello.js (rev 0)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/hello.js 2010-11-12 20:00:31 UTC (rev 118385)
@@ -0,0 +1 @@
+window.alert('hello from javascript');
Added: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/style.css
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/style.css (rev 0)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/browser/resources/foo/style.css 2010-11-12 20:00:31 UTC (rev 118385)
@@ -0,0 +1,3 @@
+body {
+ color: #f00;
+}
Added: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/resource.py_tmpl
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/resource.py_tmpl (rev 0)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/template/src/+package+/resource.py_tmpl 2010-11-12 20:00:31 UTC (rev 118385)
@@ -0,0 +1,7 @@
+from hurry.resource import Library, ResourceInclusion
+
+foo = Library('foo', 'browser/resources/foo')
+
+style = ResourceInclusion(foo, 'style.css')
+
+hello = ResourceInclusion(foo, 'hello.js')
Modified: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/templates.py
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/templates.py 2010-11-12 19:59:19 UTC (rev 118384)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/templates.py 2010-11-12 20:00:31 UTC (rev 118385)
@@ -123,7 +123,7 @@
sys.exit(1)
except IOError, e:
# Some serious problem: no connect to server...
- print "Error: cannot download required %s" % version_info_url
+ print "Error: cannot download required %s" % url
print "Server may be down. Please try again later."
sys.exit(1)
return contents
Modified: grokproject/branches/janjaapdriessen-hurry.resource/grokproject/utils.py
===================================================================
--- grokproject/branches/janjaapdriessen-hurry.resource/grokproject/utils.py 2010-11-12 19:59:19 UTC (rev 118384)
+++ grokproject/branches/janjaapdriessen-hurry.resource/grokproject/utils.py 2010-11-12 20:00:31 UTC (rev 118385)
@@ -1,15 +1,11 @@
-from base64 import urlsafe_b64encode
-from paste.script.templates import var
-from random import randint
import subprocess
import codecs
-import logging
import os
-import pkg_resources
-import shutil
import sys
-import tempfile
+from base64 import urlsafe_b64encode
+from paste.script.templates import var
+
try:
from hashlib import sha1
except ImportError:
More information about the checkins
mailing list