Merge lp:~quickly-committers/quickly/702153 into lp:quickly

[Michael Terry]

[Tony Byrne (tony-badwolf)]

Hi Michael
 I looked at this quite a while ago and couldn't make up my mind if is was a bug or not. We will agree it is a bug because it generates a false error message.

 If the derived template was produced by an earlier version of quickly we would like to call upgrade on the project. Quickly marks *all* projects for upgrade that are created from derived templates, probably because it is difficult to discover which version of quickly produced the template.

templatetools contains the comment
# initialize with an empty project version to force first upgrade

Calling upgrade fails for templates produced by version 11.04 because it expects old code to be present in the project. I added a patch to https://bugs.launchpad.net/quickly/+bug/702153 which seems to directly address the problem.

I've marked this branch as needs fixing because I suspect that it will skip upgrade for old templates in ~/quickly-templates. I don't have a codebase to be sure.

review: Needs Fixing

[Michael Terry (mterry)]

OK, I applied your patch from the bug. I guess that means this branch is no longer quite needed? I can close it out if so.

Unmerged revisions

622. By Michael Terry on 2011-07-06

when creating a project, record version of parent templates

=== modified file 'quickly/builtincommands.py'
--- quickly/builtincommands.py	2010-11-29 15:18:46 +0000
+++ quickly/builtincommands.py	2011-07-06 14:29:39 +0000
@@ -63,9 +63,18 @@
     os.mkdir(project_name)
 
     # creating quickly file
-    configurationhandler.project_config['version'] = quicklyconfig.__version__
     configurationhandler.project_config['project'] = project_name
     configurationhandler.project_config['template'] = project_template
+
+    # Set version for this template and all parent templates too
+    version = templatetools.get_template_version(project_template)
+    configurationhandler.project_config['version'] = version
+    parent = templatetools.get_parent_template(project_template)
+    while parent:
+        version = templatetools.get_template_version(parent)
+        configurationhandler.project_config['version_%s' % parent] = version
+        parent = templatetools.get_parent_template(parent)
+
     configurationhandler.saveConfig(config_file_path=project_name)
     
     os.chdir(project_name)
 
=== modified file 'quickly/templatetools.py'
--- quickly/templatetools.py	2011-06-06 10:14:40 +0000
+++ quickly/templatetools.py	2011-07-06 14:29:39 +0000
@@ -150,8 +150,22 @@
         return True
     return False
 
-def get_project_and_template_versions(template_name):
-    """Return project and template version"""
+def get_parent_template(template_name):
+    """Return name of parent template or None"""
+
+    try:
+        template_path = tools.get_template_directory(template_name)
+        config = file(os.path.join(template_path, 'commandsconfig'), 'rb').read()
+        re_result = re.search('^\[(.*)\]$', config, re.MULTILINE)
+        if re_result:
+            return re_result.group(1)
+        else:
+            return None
+    except Exception:
+        return None
+
+def get_template_version(template_name):
+    """Return template version"""
 
     # take template version. Default is current Quickly version
     template_version = quicklyconfig.__version__
@@ -167,6 +181,13 @@
             if targeted_property == 'TEMPLATE_VERSION':
                 template_version = value
                 break
+
+    return template_version
+
+def get_project_and_template_versions(template_name):
+    """Return project and template version"""
+
+    template_version = get_template_version(template_name)
     
     # get current project version for this template. Default is no migration (ie take current version)
     configurationhandler.loadConfig()
 
=== modified file 'quickly/test/quickly.sh'
--- quickly/test/quickly.sh	2011-03-02 22:59:32 +0000
+++ quickly/test/quickly.sh	2011-07-06 14:29:39 +0000
@@ -50,3 +50,18 @@
 diff -qr data/templates/ubuntu-application/store /tmp/quickly-test/quickly-templates/test-template/store
 
 diff -qr data/templates/ubuntu-application/test /tmp/quickly-test/quickly-templates/test-template/test
+
+cd /tmp/quickly-test
+
+export HOME=/tmp/quickly-test; quickly create test-template test-project
+# Creating bzr repository and committing
+# Congrats, your new project is setup! cd /tmp/quickly-test/test-project/ to start hacking.
+# Creating project directory test-project
+
+cd test-project
+
+cat .quickly | VER=$(quickly --version | head -n1 | cut -d' ' -f2-) sh -c 'sed "s/$VER/X.X.X/"'
+# project = test-project
+# version_ubuntu-application = X.X.X
+# version = X.X.X
+# template = test-template