[Checkins] SVN: Sandbox/philikon/zopeproject/trunk/ Make everything work :)

[Philipp von Weitershausen]

Log message for revision 77959:
  Make everything work :)
  

Changed:
  U   Sandbox/philikon/zopeproject/trunk/setup.py
  U   Sandbox/philikon/zopeproject/trunk/zopeproject/deploy/buildout.cfg_tmpl
  A   Sandbox/philikon/zopeproject/trunk/zopeproject/main.py
  U   Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py

-=-
Modified: Sandbox/philikon/zopeproject/trunk/setup.py
===================================================================
--- Sandbox/philikon/zopeproject/trunk/setup.py	2007-07-14 17:09:32 UTC (rev 77958)
+++ Sandbox/philikon/zopeproject/trunk/setup.py	2007-07-14 17:18:06 UTC (rev 77959)
@@ -3,7 +3,7 @@
 setup(
     name='zopeproject',
     version='0.3',
-    author='Grok Team',
+    author='Philipp von Weitershausen',
     author_email='philipp at weitershausen.de',
     url='http://cheeseshop.python.org/pypi/zopeproject',
     download_url='svn://svn.zope.org/repos/main/Sandbox/zopeproject/trunk#egg=zopeproject-dev',
@@ -17,8 +17,9 @@
     install_requires=['PasteScript>=1.3',],
     entry_points="""
     [console_scripts]
-    zopeproject = zopeproject:main
+    zopeproject = zopeproject.main:zopeproject
     [paste.paster_create_template]
-    zopeproject = zopeproject:ZopeProject
+    deploy = zopeproject.templates:Deploy
+    zope_app = zopeproject.templates:ZopeApp
     """,
 )

Modified: Sandbox/philikon/zopeproject/trunk/zopeproject/deploy/buildout.cfg_tmpl
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/deploy/buildout.cfg_tmpl	2007-07-14 17:09:32 UTC (rev 77958)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/deploy/buildout.cfg_tmpl	2007-07-14 17:18:06 UTC (rev 77959)
@@ -1,4 +1,5 @@
 [buildout]
+develop = .
 parts = app test
 
 [app]

Added: Sandbox/philikon/zopeproject/trunk/zopeproject/main.py
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/main.py	                        (rev 0)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/main.py	2007-07-14 17:18:06 UTC (rev 77959)
@@ -0,0 +1,4 @@
+from zopeproject.script import create_project
+
+def zopeproject():
+    create_project('zope_app')


Property changes on: Sandbox/philikon/zopeproject/trunk/zopeproject/main.py
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py	2007-07-14 17:09:32 UTC (rev 77958)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py	2007-07-14 17:18:06 UTC (rev 77959)
@@ -3,16 +3,9 @@
 import shutil
 from paste.script.templates import var, NoDefault, Template, BasicPackage
 
-class ZopeApp(BasicPackage):
-    _template_dir = 'zope_app'
-    summary = 'Package that contains a Zope application'
-    required_templates = []
-    vars = []
-
 class Deploy(Template):
     _template_dir = 'deploy'
     summary = "Deployment of a Zope application"
-    required_templates = ['zope_app']
 
     vars = [
         var('user', 'Name of an initial administrator user', default=NoDefault),
@@ -23,10 +16,15 @@
         ]
 
     def check_vars(self, vars, cmd):
-        vars = super(GrokProject, self).check_vars(vars, cmd)
+        vars = super(Deploy, self).check_vars(vars, cmd)
         vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
         return vars
 
+class ZopeApp(Template):
+    _template_dir = 'zope_app'
+    summary = 'Package that contains a Zope application'
+    required_templates = ['deploy']
+
 class GrokApp(Deploy):
 
     vars = [
@@ -35,7 +33,7 @@
         ] + Deploy.vars
 
     def check_vars(self, vars, cmd):
-        vars = super(GrokProject, self).check_vars(vars, cmd)
+        vars = super(GrokApp, self).check_vars(vars, cmd)
         module = vars['module']
         if '.' in module:
             if module.endswith('.py'):