[Checkins] SVN: Sandbox/philikon/zopeproject/trunk/zopeproject/
Split __init__
Philipp von Weitershausen
philikon at philikon.de
Sat Jul 14 12:04:47 EDT 2007
Log message for revision 77944:
Split __init__
Changed:
D Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py
A Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py
A Sandbox/philikon/zopeproject/trunk/zopeproject/script.py
A Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py
-=-
Deleted: Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py 2007-07-14 15:43:38 UTC (rev 77943)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py 2007-07-14 16:04:47 UTC (rev 77944)
@@ -1,118 +0,0 @@
-import sys
-import os.path
-import optparse
-import shutil
-import tempfile
-import pkg_resources
-from paste.script import templates, command
-from paste.script.templates import var, NoDefault
-
-class GrokProject(templates.Template):
- _template_dir = 'template'
- summary = "A grok project"
- required_templates = []
-
- vars = [
- var('module', 'Name of a demo Python module placed into the package',
- default='app.py'),
- var('user', 'Name of an initial administrator user', default=NoDefault),
- var('passwd', 'Password for the initial administrator user',
- default=NoDefault),
- var('eggs_dir', 'Location where zc.buildout will look for and place '
- 'packages', default=os.path.expanduser('~/buildout-eggs'))
- ]
-
- def check_vars(self, vars, cmd):
- vars = super(GrokProject, self).check_vars(vars, cmd)
- module = vars['module']
- if '.' in module:
- if module.endswith('.py'):
- vars['module'] = module[:-3]
- else:
- raise command.BadCommand('Bad module name: %s' % module)
- if vars['package'] in ('grok', 'zope'):
- print
- print "Error: The chosen project name results in an invalid " \
- "package name: %s." % vars['package']
- print "Please choose a different project name."
- sys.exit(1)
- vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
- return vars
-
-def main():
- usage = "usage: %prog [options] PROJECT"
- parser = optparse.OptionParser(usage=usage)
- parser.add_option('--no-buildout', action="store_true", dest="no_buildout",
- default=False, help="Only create project area, do not "
- "bootstrap the buildout.")
- parser.add_option('--svn-repository', dest="repos", default=None,
- help="Import project to given repository location (this "
- "will also create the standard trunk/ tags/ branches/ "
- "hierarchy).")
- parser.add_option('--newer', action="store_true", dest="newest",
- default=False, help="Check for newer versions of packages.")
- parser.add_option('-v', '--verbose', action="store_true", dest="verbose",
- default=False, help="Be verbose.")
- options, args = parser.parse_args()
- if len(args) != 1:
- parser.print_usage()
- return 1
-
- # create sandbox using paste.script
- project = args[0]
- commands = command.get_commands()
- cmd = commands['create'].load()
- runner = cmd('create')
-
- option_args = []
- if options.repos is not None:
- option_args.extend(['--svn-repository', options.repos])
- if not options.verbose:
- option_args.append('-q')
-
- extra_args = []
- if options.newest:
- extra_args.append('newest=true')
- else:
- extra_args.append('newest=false')
-
- exit_code = runner.run(option_args + ['-t', 'grokproject', project]
- + extra_args)
- # TODO exit_code
-
- if options.no_buildout:
- return
-
- os.chdir(project)
-
- extra_args = []
- if not options.verbose:
- extra_args.append('-q')
-
- try:
- import zc.buildout.buildout
- except ImportError:
- print "Downloading zc.buildout..."
-
- # Install buildout into a temporary location
- import setuptools.command.easy_install
- tmpdir = tempfile.mkdtemp()
- sys.path.append(tmpdir)
- setuptools.command.easy_install.main(extra_args +
- ['-mNxd', tmpdir, 'zc.buildout'])
-
- # Add downloaded buildout to PYTHONPATH by requiring it
- # through setuptools (this dance is necessary because the
- # temporary installation was done as multi-version).
- ws = pkg_resources.working_set
- ws.add_entry(tmpdir)
- ws.require('zc.buildout')
-
- import zc.buildout.buildout
- zc.buildout.buildout.main(extra_args + ['bootstrap'])
- shutil.rmtree(tmpdir)
- else:
- zc.buildout.buildout.main(extra_args + ['bootstrap'])
-
- print "Invoking zc.buildout..."
- zc.buildout.buildout.main(['-q', 'install'])
Added: Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py (rev 0)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py 2007-07-14 16:04:47 UTC (rev 77944)
@@ -0,0 +1 @@
+# make this directory a package
Copied: Sandbox/philikon/zopeproject/trunk/zopeproject/script.py (from rev 77942, Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py)
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/script.py (rev 0)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/script.py 2007-07-14 16:04:47 UTC (rev 77944)
@@ -0,0 +1,85 @@
+import sys
+import os.path
+import optparse
+import shutil
+import tempfile
+import pkg_resources
+import paste.script.command
+
+def main():
+ usage = "usage: %prog [options] PROJECT"
+ parser = optparse.OptionParser(usage=usage)
+ parser.add_option('--no-buildout', action="store_true", dest="no_buildout",
+ default=False, help="Only create project area, do not "
+ "bootstrap the buildout.")
+ parser.add_option('--svn-repository', dest="repos", default=None,
+ help="Import project to given repository location (this "
+ "will also create the standard trunk/ tags/ branches/ "
+ "hierarchy).")
+ parser.add_option('--newer', action="store_true", dest="newest",
+ default=False, help="Check for newer versions of packages.")
+ parser.add_option('-v', '--verbose', action="store_true", dest="verbose",
+ default=False, help="Be verbose.")
+ options, args = parser.parse_args()
+ if len(args) != 1:
+ parser.print_usage()
+ return 1
+
+ # create sandbox using paste.script
+ project = args[0]
+ commands = paste.script.command.get_commands()
+ cmd = commands['create'].load()
+ runner = cmd('create')
+
+ option_args = []
+ if options.repos is not None:
+ option_args.extend(['--svn-repository', options.repos])
+ if not options.verbose:
+ option_args.append('-q')
+
+ extra_args = []
+ if options.newest:
+ extra_args.append('newest=true')
+ else:
+ extra_args.append('newest=false')
+
+ exit_code = runner.run(option_args + ['-t', 'grokproject', project]
+ + extra_args)
+ # TODO exit_code
+
+ if options.no_buildout:
+ return
+
+ os.chdir(project)
+
+ extra_args = []
+ if not options.verbose:
+ extra_args.append('-q')
+
+ try:
+ import zc.buildout.buildout
+ except ImportError:
+ print "Downloading zc.buildout..."
+
+ # Install buildout into a temporary location
+ import setuptools.command.easy_install
+ tmpdir = tempfile.mkdtemp()
+ sys.path.append(tmpdir)
+ setuptools.command.easy_install.main(extra_args +
+ ['-mNxd', tmpdir, 'zc.buildout'])
+
+ # Add downloaded buildout to PYTHONPATH by requiring it
+ # through setuptools (this dance is necessary because the
+ # temporary installation was done as multi-version).
+ ws = pkg_resources.working_set
+ ws.add_entry(tmpdir)
+ ws.require('zc.buildout')
+
+ import zc.buildout.buildout
+ zc.buildout.buildout.main(extra_args + ['bootstrap'])
+ shutil.rmtree(tmpdir)
+ else:
+ zc.buildout.buildout.main(extra_args + ['bootstrap'])
+
+ print "Invoking zc.buildout..."
+ zc.buildout.buildout.main(['-q', 'install'])
Copied: Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py (from rev 77942, Sandbox/philikon/zopeproject/trunk/zopeproject/__init__.py)
===================================================================
--- Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py (rev 0)
+++ Sandbox/philikon/zopeproject/trunk/zopeproject/templates.py 2007-07-14 16:04:47 UTC (rev 77944)
@@ -0,0 +1,36 @@
+import sys
+import os.path
+import shutil
+from paste.script.templates import var, NoDefault, Template
+
+class GrokProject(Template):
+ _template_dir = 'template'
+ summary = "A grok project"
+ required_templates = []
+
+ vars = [
+ var('module', 'Name of a demo Python module placed into the package',
+ default='app.py'),
+ var('user', 'Name of an initial administrator user', default=NoDefault),
+ var('passwd', 'Password for the initial administrator user',
+ default=NoDefault),
+ var('eggs_dir', 'Location where zc.buildout will look for and place '
+ 'packages', default=os.path.expanduser('~/buildout-eggs'))
+ ]
+
+ def check_vars(self, vars, cmd):
+ vars = super(GrokProject, self).check_vars(vars, cmd)
+ module = vars['module']
+ if '.' in module:
+ if module.endswith('.py'):
+ vars['module'] = module[:-3]
+ else:
+ raise command.BadCommand('Bad module name: %s' % module)
+ if vars['package'] in ('grok', 'zope'):
+ print
+ print "Error: The chosen project name results in an invalid " \
+ "package name: %s." % vars['package']
+ print "Please choose a different project name."
+ sys.exit(1)
+ vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
+ return vars
More information about the Checkins
mailing list