Merge lp:~mterry/quickly/yelp-depends into lp:quickly

[Michael Terry]

Projects should depend on yelp, now that we have mallard help for them. This is Tony's depend-on-yelp patch [1] plus some logic to fix projects on upgrade.

[1] http://launchpadlibrarian.net/60964440/depend_yelp.patch

[Tony Byrne (tony-badwolf)]

The upgrade logic is unhelpful. If you create an project with quickly version 0.6.1 then run it with quickly version 11.03.1 (yelp-depends), upgrade adds the yelp dependency. However the project does not call gnome-help. I suggest we do something like move the yelp depend logic from create and upgrade to package (obvious when you think about it) and have package check for the existence of a helpers.show_uri function before adding the dependency. I don't know whether release or share call package but they need consideration if they don't. From quickly-talk I think the consensus is to keep upgrade simple if we can.

********* begin test Makefile (use in empty directory and change WORK path)
WORK=/home/tony/projects/branches/yelp-depends
TRUNK = /home/tony/projects/trunk/quickly
TEMPLATE=ubuntu-application
DUT="test project"
PYTHON_NAME=test-project

all: version create

version:
 quickly --version

clean:
 rm -rf $(PYTHON_NAME)

create: clean
 quickly create $(TEMPLATE) $(DUT)

run:
 export PATH=$(WORK)/bin:$$PATH; cd $(PYTHON_NAME); quickly run -v

dot:
 cd $(PYTHON_NAME); cat .quickly

add:
 export PATH=$(WORK)/bin:$$PATH; cd $(PYTHON_NAME); quickly add help-guide index

*************** end test script

As a bonus it might be nice to have $quickly add help-guide and $quickly add help-topic inject the necessary functions into helpers and modify the project's help menu.

review: Needs Fixing

[lp:~mterry/quickly/yelp-depends]

580. By Michael Terry on 2011-01-04

undo previous commit and instead check for ghelp usage when packaging and insert yelp then

[Michael Terry (mterry)]

Good point. I've updated this to undo our previous code and instead add a check at packaging time (for any command that creates packages) to insert a yelp dependency if ghelp: urls are being used.

[Tony Byrne (tony-badwolf)]

Looks good, using "ghelp:" in the glade handlers is perfect for discovering the dependency. The previous commit does raise a point that needs addressing, probably in a tutorial or upgrade notes. When an old ubuntu-application project is worked on by the user in natty, (s)he gets a new command $quickly add help-topic "name" which adds the mallard file but not the code to access it.

review: Approve

=== modified file 'data/templates/ubuntu-application/internal/packaging.py'
--- data/templates/ubuntu-application/internal/packaging.py	2010-11-23 14:26:08 +0000
+++ data/templates/ubuntu-application/internal/packaging.py	2011-01-04 19:11:04 +0000
@@ -162,6 +162,15 @@
     version = proc.communicate()[0]
     return float(version)
 
+def get_forced_dependencies():
+    deps = []
+
+    # check for yelp usage
+    if subprocess.call(["grep", "-rq", "['\"]ghelp:", "."]) == 0:
+        deps.append("yelp")
+
+    return deps
+
 def updatepackaging(changelog=None, no_changelog=False, installopt=False):
     """create or update a package using python-mkdebian.
 
@@ -181,14 +190,15 @@
         command.extend(["--changelog", message])
     if not configurationhandler.project_config:
         configurationhandler.loadConfig()
+    dependencies = get_forced_dependencies()
     try:
-        dependencies = [elem.strip() for elem
-                        in configurationhandler.project_config['dependencies'].split(',')
-                        if elem]
-        for dep in dependencies:
-            command.extend(["--dependency", dep])
+        dependencies.extend([elem.strip() for elem
+                             in configurationhandler.project_config['dependencies'].split(',')
+                             if elem])
     except KeyError:
         pass
+    for dep in dependencies:
+        command.extend(["--dependency", dep])
     try:
         distribution = configurationhandler.project_config['target_distribution']
         command.extend(["--distribution", distribution])