[Checkins] SVN: bluebream/branches/ccomb-merge-templates/ merge from the trunk

[Christophe Combelles]

Log message for revision 110381:
  merge from the trunk
  

Changed:
  U   bluebream/branches/ccomb-merge-templates/CHANGES.txt
  U   bluebream/branches/ccomb-merge-templates/bootstrap.py
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/bootstrap.py
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py

-=-
Modified: bluebream/branches/ccomb-merge-templates/CHANGES.txt
===================================================================
--- bluebream/branches/ccomb-merge-templates/CHANGES.txt	2010-03-31 21:09:25 UTC (rev 110380)
+++ bluebream/branches/ccomb-merge-templates/CHANGES.txt	2010-03-31 23:50:44 UTC (rev 110381)
@@ -11,6 +11,8 @@
 - Merge the two templates into a single one by allowing to create a
   flat or nested namespace structure, depending on the project name.
 
+- Enabled Distribute by default instead of Setuptools
+
 1.0a5 (2010-03-28)
 ------------------
 

Modified: bluebream/branches/ccomb-merge-templates/bootstrap.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/bootstrap.py	2010-03-31 21:09:25 UTC (rev 110380)
+++ bluebream/branches/ccomb-merge-templates/bootstrap.py	2010-03-31 23:50:44 UTC (rev 110381)
@@ -31,10 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
+parser.add_option("--setuptools",
+                   action="store_true", dest="setuptools", default=False,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
+                   action="store_true", dest="distribute", default=True,
+                   help="For backward compatibility. "
+                        "Distribute is used by default.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -51,6 +54,8 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
+if options.setuptools:
+    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/bootstrap.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-03-31 21:09:25 UTC (rev 110380)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/bootstrap.py	2010-03-31 23:50:44 UTC (rev 110381)
@@ -31,10 +31,13 @@
 parser = OptionParser()
 parser.add_option("-v", "--version", dest="version",
                           help="use a specific zc.buildout version")
+parser.add_option("--setuptools",
+                   action="store_true", dest="setuptools", default=False,
+                   help="Use Setuptools rather than Distribute.")
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
+                   action="store_true", dest="distribute", default=True,
+                   help="For backward compatibility. "
+                        "Distribute is used by default.")
 parser.add_option("-c", None, action="store", dest="config_file",
                    help=("Specify the path to the buildout configuration "
                          "file to be used."))
@@ -51,6 +54,8 @@
     VERSION = ''
 
 USE_DISTRIBUTE = options.distribute
+if options.setuptools:
+    USE_DISTRIBUTE = False
 args = args + ['bootstrap']
 
 to_reload = False

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py	2010-03-31 21:09:25 UTC (rev 110380)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py	2010-03-31 23:50:44 UTC (rev 110381)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import re, os, sys, shutil
+import re, os, sys
 import pkg_resources
 from paste.script import templates
 from paste.script.templates import var
@@ -82,7 +82,8 @@
             main_package_dir = os.path.join(output_dir,
                                             'src',
                                             vars['main_package'])
-            shutil.move(main_package_dir, target_dir)
+            os.rename(main_package_dir,
+                      os.path.join(target_dir,
+                                   os.path.basename(main_package_dir,)))
 
 
-