Merge lp:~james-w/pkgme/add-path-to-desktop into lp:pkgme

[James Westby]

Add WorkingDirectory to use as Path in the .desktop file (for bug #1025174)

Hi,

In https://bugs.launchpad.net/pkgme-devportal/+bug/1025174 mvo says that we
should set Path in the .desktop file. This allows the backend to specify
a value if they want.

Thanks,

James

[Michael Vogt (mvo)]

Thanks, this looks fine to me.

review: Approve

=== modified file 'pkgme/info_elements.py'
--- pkgme/info_elements.py	2012-07-05 13:42:09 +0000
+++ pkgme/info_elements.py	2012-07-17 18:34:49 +0000
@@ -328,6 +328,12 @@
     description = "A short line describing the application."
 
 
+class WorkingDirectory(InfoElement):
+
+    name = 'working_directory'
+    description = "The working directory that should be set in the desktop file."
+
+
 class Icon(InfoElement):
 
     name = 'icon'
@@ -338,7 +344,7 @@
 
     name = 'license'
     default = 'unknown'
-    description = """The license of the files in the package. 
+    description = """The license of the files in the package.
 
     Note that this will only apply for "simple" cases where there
     is just a single license type. Otherwise it will just write

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-07-16 17:50:39 +0000
+++ pkgme/package_files.py	2012-07-17 18:34:49 +0000
@@ -27,6 +27,7 @@
     Section,
     TagLine,
     Version,
+    WorkingDirectory,
     )
 from pkgme.project_info import DictInfo
 from pkgme.template_file import TemplateFile
@@ -263,6 +264,7 @@
         Icon,
         PackageName,
         TagLine,
+        WorkingDirectory,
         ]
 
     template = 'desktop'

=== modified file 'pkgme/templates/desktop'
--- pkgme/templates/desktop	2012-03-30 16:04:51 +0000
+++ pkgme/templates/desktop	2012-07-17 18:34:49 +0000
@@ -6,3 +6,6 @@
 Categories=$categories
 Name=$application_name
 Comment=$tagline
+#if $working_directory
+Path=$working_directory
+#end if

=== modified file 'pkgme/tests/test_package_files.py'
--- pkgme/tests/test_package_files.py	2012-07-16 17:50:39 +0000
+++ pkgme/tests/test_package_files.py	2012-07-17 18:34:49 +0000
@@ -27,6 +27,7 @@
     Section,
     TagLine,
     Version,
+    WorkingDirectory,
     )
 from pkgme.package_files import (
     BasicFile,
@@ -485,6 +486,12 @@
         package_file = self.get_object({TagLine.name: tagline})
         self.assertThat({'Comment': tagline}, AreDesktopValuesFor(package_file))
 
+    def test_working_dir(self):
+        # The WorkingDirectory is set as Path in the desktop file
+        working_directory = self.getUniqueString()
+        package_file = self.get_object({WorkingDirectory.name: working_directory})
+        self.assertThat({'Path': working_directory}, AreDesktopValuesFor(package_file))
+
 
 class PackageFileGroupTests(TestCase):