Merge lp:~ehbello/gcs/trunk into lp:gcs

[Roberto C. Morano]

new merge from Enrique Bello's branch

new features, thx Enrique!

[Roberto C. Morano (rcmorano)]

review: Approve

=== modified file 'builder.py'
--- builder.py	2010-07-22 15:51:20 +0000
+++ builder.py	2013-04-15 10:51:18 +0000
@@ -21,6 +21,7 @@
 from generators.file import ConfigGenerator
 from generators.file import TemplatesGenerator
 from generators.file import CopyrightGenerator
+from generators.file import MenuGenerator
 
 
 class Builder(object):
@@ -30,14 +31,16 @@
     def __init__(self, path):
         config['source_path'] = path
         config['info'] = yaml.load(open(path + '/gcs/info').read())
-        extension = config['info'].get('config_extension', None)
-        if extension:
-            config['config_extension'] = extension
+        config['config_extension'] = config['info'].get('config_extension', None)
+        if not config['config_extension']:
+            config['config_extension'] = '.' + config['info'].get('name', None) + '.gcs'
 
 
     def make_package(self):
         """ Make the package. Use ScriptGenerator objects for this propouse.
         """
+        self.__delete_outputfiles()
+
         try:
             os.mkdir(config['source_path'] + '/debian')
         except OSError:
@@ -58,16 +61,11 @@
         ConfigGenerator().activate()
         TemplatesGenerator().activate()
         CopyrightGenerator().activate()
-
-        # FIXME: At the moment we need to keep the configuration files because
-        # the conversion doesn't transparently (dh_install rename problem)
-        #self.__delete_tmpfiles()
-
-
+        MenuGenerator().activate()
 
 
     def build_package(self):
-        """ Build the package. Use a simply debuild for this propouse.
+        """ Build the package. Use a simply debuild for this purpose.
         """
         try:
             os.system('debuild -us -uc')
@@ -93,8 +91,9 @@
                 copy_file, None)
 
 
-    def __delete_tmpfiles(self):
-        """ Add .gcs extension at all conffiles (making a copy)
+    def __delete_outputfiles(self):
+        """ Delete all files of conffiles with .gcs extension
+        and Debian directory if it exists.
         """
         def delete_file(arg, dirname, file_names):
 
@@ -106,4 +105,5 @@
 
         os.path.walk(config['source_path'] + '/gcs/conffiles_skel/',
                 delete_file, None)
+        shutil.rmtree(config['source_path'] + '/debian', True)
 

=== modified file 'config.py'
--- config.py	2010-07-16 10:26:35 +0000
+++ config.py	2013-04-15 10:51:18 +0000
@@ -14,6 +14,16 @@
     print "Can't read /etc/gcs.conf file."
     sys.exit(1)
 
+try:
+    userconf_path = os.path.join(os.getenv('HOME'), config['userconf_filename'])
+    userconfig = yaml.load(open(userconf_path).read())
+    for key in userconfig:
+       config[key] = userconfig[key]
+except (yaml.scanner.ScannerError):
+    print "Can't parse %s file. Ignoring..." % userconf_path
+except:
+    pass
+
 # Add default options
 config['source_path'] = './'
 config['info'] = {}

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-05 12:04:17 +0000
+++ debian/changelog	2013-04-15 10:51:18 +0000
@@ -1,4 +1,21 @@
-gcs (0.3.20+ehbello3) UNRELEASED; urgency=low
+gcs (0.3.20+ehbello5) UNRELEASED; urgency=low
+
+  * Added support for dh_installmenu to install a desktop menu entry.
+  * Added support for multiple diverts from different packages.
+
+ -- Enrique Hernández Bello <[e-mail]>  Mon, 31 Oct 2011 20:27:49 +0000
+
+gcs (0.3.20+ehbello4) maverick; urgency=low
+
+  * Resulting files are now deleted before a new build.
+  * Now catches the exception and notice if we are not placed near gcs source
+    when gcs_build.
+  * Added support for an override file of configuration located at HOME of gcs
+    users.
+
+ -- Enrique Hernández Bello <[e-mail]>  Tue, 14 Dec 2010 22:24:14 +0000
+
+gcs (0.3.20+ehbello3) maverick; urgency=low
 
   * Added a pseudo syntax check for package lists used in Debian control files.
     Now supports packages with version and multiple dependences.
@@ -6,8 +23,10 @@
     them.
   * Fixed the first template question of example skel removing non valid
     tabulators.
+  * Added lintian file to override warning messages.
+  * Update to Standards-Version 3.9.1
 
- -- Enrique Hernández Bello <[e-mail]>  Sat, 25 Sep 2010 23:42:53 +0100
+ -- Enrique Hernández Bello <[e-mail]>  Fri, 12 Nov 2010 11:16:41 +0000
 
 gcs (0.3.20+ehbello2) lucid; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-07-16 13:53:43 +0000
+++ debian/control	2013-04-15 10:51:18 +0000
@@ -4,7 +4,7 @@
 Maintainer: Junta de Andalucia <[e-mail]>
 Uploaders: Juanje Ojeda Croissier <[e-mail]>
 Build-Depends: debhelper (>= 7.0)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://launchpad.net/gcs
 Vcs-Browser: http://codebrowse.launchpad.net/~guadalinex-members/gcs/trunk/changes
 Vcs-Bzr: http://bazaar.launchpad.net/~guadalinex-members/gcs/trunk

=== added file 'debian/lintian-overrides'
--- debian/lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/lintian-overrides	2013-04-15 10:51:18 +0000
@@ -0,0 +1,17 @@
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/conffiles_skel/
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/install_scripts/pos/
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/install_scripts/pre/
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/newfiles_skel/
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/remove_scripts/pos/
+gcs: package-contains-empty-directory usr/share/gcs/skel/gcs/remove_scripts/pre/
+gcs: script-not-executable ./usr/share/gcs/templates/config.template
+gcs: script-not-executable ./usr/share/gcs/templates/postinst.template
+gcs: script-not-executable ./usr/share/gcs/templates/postrm.template
+gcs: script-not-executable ./usr/share/gcs/templates/preinst.template
+gcs: script-not-executable ./usr/share/gcs/templates/prerm.template
+gcs: script-not-executable ./usr/share/gcs/templates/rules.template
+gcs: shell-script-fails-syntax-check ./usr/share/gcs/templates/config.template
+gcs: shell-script-fails-syntax-check ./usr/share/gcs/templates/postinst.template
+gcs: shell-script-fails-syntax-check ./usr/share/gcs/templates/postrm.template
+gcs: shell-script-fails-syntax-check ./usr/share/gcs/templates/preinst.template
+gcs: shell-script-fails-syntax-check ./usr/share/gcs/templates/prerm.template

=== modified file 'gcs.conf'
--- gcs.conf	2010-10-05 12:04:17 +0000
+++ gcs.conf	2013-04-15 10:51:18 +0000
@@ -1,17 +1,24 @@
-control_template: /usr/share/gcs/templates/control.template
-rules_template: /usr/share/gcs/templates/rules.template
 changelog_template: /usr/share/gcs/templates/changelog.template
 compat_template: /usr/share/gcs/templates/compat.template
+config_template: /usr/share/gcs/templates/config.template
+control_template: /usr/share/gcs/templates/control.template
+copyright_template: /usr/share/gcs/templates/copyright.template
+menu_template: /usr/share/gcs/templates/menu.template
+postinst_template: /usr/share/gcs/templates/postinst.template
+postrm_template: /usr/share/gcs/templates/postrm.template
 preinst_template: /usr/share/gcs/templates/preinst.template
-postinst_template: /usr/share/gcs/templates/postinst.template
 prerm_template: /usr/share/gcs/templates/prerm.template
-postrm_template: /usr/share/gcs/templates/postrm.template
-config_template: /usr/share/gcs/templates/config.template
-copyright_template: /usr/share/gcs/templates/copyright.template
+rules_template: /usr/share/gcs/templates/rules.template
 sourceformat_template: /usr/share/gcs/templates/sourceformat.template
 
-## Final extension for the configuration files.
-config_extension: .gcs
+## Final extension for all configuration files.
+# (default: .[Package Name])
+# config_extension: .gcs
 
 ## This variable change the base path where you want to store the diversions.
+# (default: None)
 # diverts_basepath: /diverts
+
+## Users can override variables of above creating a file with this name.
+## If no path is specified, default path comes from HOME variable.
+userconf_filename: .gcs.conf

=== modified file 'gcs_build'
--- gcs_build	2010-07-16 15:59:10 +0000
+++ gcs_build	2013-04-15 10:51:18 +0000
@@ -19,6 +19,13 @@
             help="debian source only, don't build binary files"
             )
     (options, args) = parser.parse_args()
+    
+    if os.path.exists(os.getcwd() + '/../gcs/info'):
+        os.chdir('..')
+    if not os.path.isfile(os.getcwd() + '/gcs/info'):
+        print "cannot find readable gcs/info anywhere!"
+        print "Are you in the source code tree?"
+        sys.exit(1)
 
     builder = Builder(os.getcwd())
     builder.make_package()

=== modified file 'generators/file.py'
--- generators/file.py	2010-09-25 22:40:59 +0000
+++ generators/file.py	2013-04-15 10:51:18 +0000
@@ -146,7 +146,10 @@
 
 
     def __set_section(self):
-        section = config['info']['section']
+        try:
+            section = config['info']['package-section']
+        except:
+            section = config['info']['section']
         newcontent = self.template_content.replace('<SECTION>', section)
         self.template_content = newcontent
 
@@ -658,3 +661,74 @@
         author = "Copyright %s, %s" % (today.year, config['info']['author'])
         newcontent = self.template_content.replace('<AUTHOR>', author)
         self.template_content = newcontent
+
+class MenuGenerator(FileGenerator):
+    """ Generate debian/menu file from gcs/info file.
+    """
+    def activate(self):
+        """ Generate debian/menu file
+
+        Steps:
+
+        1) Obtain menu template
+        2) Set template properties (using tags) from gcs/info file.
+        3) Write debian/menu file
+        """
+        self.set_template_content('menu_template')
+
+        self.__set_name()
+        self.__set_title()
+        
+        initial_content = self.template_content
+        initial_content = initial_content.replace('<NEEDS>', '')
+        initial_content = initial_content.replace('<SECTION>', '')
+        initial_content = initial_content.replace('<COMMAND>', '')
+
+        self.__set_needs()
+        self.__set_section()
+        self.__set_command()
+
+        if initial_content != self.template_content:
+            self._write_file('debian/menu')
+        else:
+            try:
+                os.remove(config['source_path'] + '/menu')
+            except:
+                pass
+
+
+    def __set_name(self):
+        name = config['info']['name']
+        newcontent = self.template_content.replace('<NAME>', name)
+        self.template_content = newcontent
+
+    def __set_title(self):
+        name = config['info']['name']
+        shortdesc = config['info']['shortdesc']
+        title = name + ' - ' + shortdesc
+        newcontent = self.template_content.replace('<TITLE>', title)
+        self.template_content = newcontent
+
+    def __set_needs(self):
+        try:
+            needs = config['info']['menu-needs']
+        except:
+            needs = ""
+        newcontent = self.template_content.replace('<NEEDS>', needs)
+        self.template_content = newcontent
+
+    def __set_section(self):
+        try:
+            section = config['info']['menu-section']
+        except:
+            section = ""
+        newcontent = self.template_content.replace('<SECTION>', section)
+        self.template_content = newcontent
+
+    def __set_command(self):
+        try:
+            command = config['info']['menu-command']
+        except:
+            command = ""
+        newcontent = self.template_content.replace('<COMMAND>', command)
+        self.template_content = newcontent

=== modified file 'generators/part.py'
--- generators/part.py	2010-05-10 12:23:45 +0000
+++ generators/part.py	2013-04-15 10:51:18 +0000
@@ -70,28 +70,46 @@
     def __add_divert(self, dest_path):
         extlen = len(config['config_extension'])
         real_conf_path = dest_path[: -extlen]
+        divert_conf_path = os.path.join(config['diverts_basepath'],
+                dest_path[1:])
+        distrib_conf_path = os.path.join(config['diverts_basepath'],
+                real_conf_path[1:]) + '.' + config['info']['name'] + '.distrib'
 
         pkg_name = config['info']['name']
-        divert_command = '[ "%s" != "$(dpkg-divert --truename %s)" ] && rm -f %s && dpkg-divert --rename --remove %s\n' % (real_conf_path, real_conf_path, real_conf_path, real_conf_path)
-
-        divert_command += "dpkg-divert --package %s " % pkg_name
-        divert_command += "--divert %s.distrib " % os.path.join(config['diverts_basepath'], real_conf_path[1:])
-        divert_command += "--rename --quiet --add %s\n\n" % real_conf_path
-
-        divert_command += "ln -fs %s %s\n\n" % (os.path.join(config['diverts_basepath'], dest_path[1:]), real_conf_path)
-
+        divert_command = '\n\
+if [ "%s" != "$(dpkg-divert --truename %s)" ]; then\n\
+    mv %s %s\n\
+else\n\
+    dpkg-divert --package %s --divert %s --rename --quiet --add %s\n\
+fi\n\
+ln -sf %s %s\n\
+' % (real_conf_path, real_conf_path,
+        real_conf_path, distrib_conf_path,
+        pkg_name, distrib_conf_path, real_conf_path,
+        divert_conf_path, real_conf_path)
+        
         self.diverts.append(divert_command)
 
 
-
     def __rm_divert(self, dest_path):
         extlen = len(config['config_extension'])
         real_conf_path = dest_path[: -extlen]
+        divert_conf_path = os.path.join(config['diverts_basepath'],
+                dest_path[1:])
+        distrib_conf_path = os.path.join(config['diverts_basepath'],
+                real_conf_path[1:]) + '.' + config['info']['name'] + '.distrib'
 
         pkg_name = config['info']['name']
-        command = "rm -f %s\n" % real_conf_path
-        command += "dpkg-divert --package %s " % pkg_name
-        command += "--rename --quiet --remove %s\n" % real_conf_path
+        command = '\n\
+rm -f %s\n\
+if [ "%s" != "$(dpkg-divert --listpackage %s)" ]; then\n\
+    mv %s %s\n\
+else\n\
+    dpkg-divert --rename --quiet --remove %s\n\
+fi\n' % (real_conf_path,
+        pkg_name, real_conf_path,
+        distrib_conf_path, real_conf_path,
+        real_conf_path)
 
         # rm -f /etc/ejemplo.conf
         # dpkg-divert --package dummy-conf --rename --quiet --remove /etc/ejemplo.conf

=== modified file 'skel/gcs/info'
--- skel/gcs/info	2009-12-14 19:59:38 +0000
+++ skel/gcs/info	2013-04-15 10:51:18 +0000
@@ -11,7 +11,12 @@
 priority: optional
 
 # Section
-section: seccion_de_la_aplicacion
+package-section: seccion_de_la_aplicacion
+
+# Desktop menu entry (man menufile)
+#menu-needs="X11|text|vc|wm"
+#menu-section="Applications/see-menu-manual"
+#menu-command="/usr/bin/example"
 
 # Descripción corta
 shortdesc: "descripción corta"

=== added file 'templates/menu.template'
--- templates/menu.template	1970-01-01 00:00:00 +0000
+++ templates/menu.template	2013-04-15 10:51:18 +0000
@@ -0,0 +1,2 @@
+?package(<NAME>):needs="<NEEDS>" section="<SECTION>"\
+  title="<TITLE>" command="<COMMAND>"