Fixed package name bug in debian generator

Also fixed up the rosdebian generator and some
tests.

Author: wjwwood

bloom/generators/debian/generate_cmd.py

@@ -76,7 +76,17 @@ def prepare_arguments(parser):
     return parser
 
 
-def main(args=None):
+def get_subs(pkg, os_name, os_version, ros_distro):
+    return generate_substitutions_from_package(
+        pkg,
+        os_name,
+        os_version,
+        ros_distro
+    )
+
+
+def main(args=None, get_subs_fn=None):
+    get_subs_fn = get_subs_fn or get_subs
     _place_template_files = True
     _process_template_files = True
     package_path = os.getcwd()
@@ -109,12 +119,7 @@ def main(args=None):
     for path, pkg in pkgs_dict.items():
         template_files = None
         try:
-            subs = generate_substitutions_from_package(
-                pkg,
-                os_name,
-                os_version,
-                ros_distro
-            )
+            subs = get_subs_fn(pkg, os_name, os_version, ros_distro)
             if _place_template_files:
                 # Place template files
                 place_template_files(path)

bloom/generators/debian/generator.py

@@ -195,7 +195,7 @@ def generate_substitutions_from_package(
     # Debian Increment Number
     data['DebianInc'] = deb_inc
     # Package name
-    data['Package'] = package.name
+    data['Package'] = sanitize_package_name(package.name)
     # Installation prefix
     data['InstallationPrefix'] = installation_prefix
     # Resolve dependencies
@@ -499,10 +499,8 @@ def place_template_files(self, debian_dir='debian'):
         execute_command('git add ' + debian_dir)
         execute_command('git commit -m "Placing debian template files"')
 
-    def generate_debian(self, package, debian_distro):
-        info("Generating debian for {0}...".format(debian_distro))
-        # Generate substitution values
-        subs = generate_substitutions_from_package(
+    def get_subs(self, package, debian_distro):
+        return generate_substitutions_from_package(
             package,
             self.os_name,
             debian_distro,
@@ -511,6 +509,11 @@ def generate_debian(self, package, debian_distro):
             self.debian_inc,
             [p.name for p in self.packages.values()]
         )
+
+    def generate_debian(self, package, debian_distro):
+        info("Generating debian for {0}...".format(debian_distro))
+        # Generate substitution values
+        subs = self.get_subs(package, debian_distro)
         # Handle gbp.conf
         subs['release_tag'] = self.get_release_tag(subs)
         # Template files

bloom/generators/rosdebian.py

@@ -1,10 +1,10 @@
 from __future__ import print_function
 
-import os
 import traceback
 
 from bloom.generators.debian import DebianGenerator
-from bloom.generators.debian import sanitize_package_name
+from bloom.generators.debian.generator import generate_substitutions_from_package
+from bloom.generators.debian.generate_cmd import main as debian_main
 
 from bloom.logging import debug
 from bloom.logging import error
@@ -41,10 +41,18 @@ def summarize(self):
         info("Releasing for rosdistro: " + self.rosdistro)
         return ret
 
-    def generate_tag_name(self, data):
-        tag_name = '{Package}_{Version}-{DebianInc}_{Distribution}'
-        tag_name = 'debian/' + tag_name.format(**data)
-        return tag_name
+    def get_subs(self, package, debian_distro):
+        subs = generate_substitutions_from_package(
+            package,
+            self.os_name,
+            debian_distro,
+            self.rosdistro,
+            self.install_prefix,
+            self.debian_inc,
+            [p.name for p in self.packages.values()]
+        )
+        subs['Package'] = rosify_package_name(subs['Package'], self.rosdistro)
+        return subs
 
     def generate_branching_arguments(self, package, branch):
         deb_branch = 'debian/' + self.rosdistro + '/' + package.name
@@ -70,29 +78,23 @@ def prepare_arguments(parser):
     return parser
 
 
+def rosify_package_name(name, rosdistro):
+    return 'ros-{0}-{1}'.format(rosdistro, name)
+
+
+def get_subs(pkg, os_name, os_version, ros_distro):
+    subs = generate_substitutions_from_package(
+        pkg,
+        os_name,
+        os_version,
+        ros_distro
+    )
+    subs['Package'] = rosify_package_name(subs['Package'])
+    return subs
+
+
 def main(args=None):
-    if args is None:
-        package_path = os.getcwd()
-        place_template_files = False
-        process_template_files = False
-    else:
-        package_path = args.package_path or os.getcwd()
-        place_template_files = args.place_template_files
-        process_template_files = args.process_template_files
-
-    if not place_template_files and not process_template_files:
-        # Do both
-        pass
-    elif place_template_files:
-        # Just place template files
-        pass
-    elif process_template_files:
-        # Just process existing template files
-        pass
-    else:
-        assert False, "This should not happen..."
-
-    print(package_path)
+    debian_main(args, get_subs)
 
 
 # This describes this command to the loader

setup.cfg

@@ -6,8 +6,8 @@ all_files  = 1
 [upload_sphinx]
 upload-dir = doc/build/html
 
-[nosetests]
-where=test
+# [nosetests]
+# where=test
 # with-coverage=0
 # cover-package=nose
 # debug=nose.loader

test/__init__.py

@@ -1,7 +0,0 @@
-# Add the scripts folder to the path
-
-import os
-if 'PATH' in os.environ:
-    scripts = os.path.join(os.path.dirname(__file__), '..', 'scripts')
-    scripts = os.path.abspath(scripts)
-    os.environ['PATH'] = scripts + ':' + os.environ['PATH']

test/system_tests/test_catkin_release.py

@@ -30,6 +30,8 @@
 from bloom.commands.git.patch import import_cmd
 from bloom.commands.git.patch import remove_cmd
 
+from bloom.generators.debian.generator import sanitize_package_name
+
 
 def create_upstream_repository(packages, directory=None):
     upstream_dir = 'upstream_repo_groovy'
@@ -115,8 +117,9 @@ def _test_unary_package_repository(release_dir, version, directory=None):
             "no patches/release/groovy/foo branch"
         # was the release tag created?
         ret, out, err = user('git tag', return_io=True)
-        assert out.count('release/groovy/foo/' + version + '-0') == 1, \
-            "no release tag created"
+        expected = 'release/groovy/foo/' + version + '-0'
+        assert out.count(expected) == 1, \
+            "no release tag created, expected: '{0}'".format(expected)
 
         ###
         ### Make patch
@@ -189,7 +192,7 @@ def test_multi_package_repository(directory=None):
     """
     directory = directory if directory is not None else os.getcwd()
     # Setup
-    pkgs = ['foo', 'bar', 'baz']
+    pkgs = ['foo', 'bar_ros', 'baz']
     upstream_dir = create_upstream_repository(pkgs, directory)
     upstream_url = 'file://' + upstream_dir
     release_url = create_release_repo(
@@ -289,17 +292,19 @@ def test_multi_package_repository(directory=None):
         ret, out, err = user('git tag', return_io=True)
         for pkg in pkgs:
             for distro in ['oneiric', 'precise', 'quantal']:
+                pkg_san = sanitize_package_name(pkg)
                 # Does the debian/distro/pkg branch exist?
                 assert branch_exists('debian/groovy/' + distro + '/' + pkg), \
-                    "no release/" + pkg + " branch"
+                    "no debian/groovy/" + pkg + " branch"
                 # Does the patches/debian/distro/pkg branch exist?
                 patches_branch = 'patches/debian/groovy/' + distro + '/' + pkg
                 assert branch_exists(patches_branch), \
-                    "no patches/release/" + pkg + " branch"
+                    "no " + patches_branch + " branch"
                 # Did the debian tag get created?
-                tag = 'debian/ros-groovy-' + pkg + '_0.1.0-0_' + distro
+                tag = 'debian/ros-groovy-' + pkg_san + '_0.1.0-0_' + distro
                 assert out.count(tag) == 1, \
-                    "no release tag created for '" + pkg + "': `" + out + "`"
+                    "no '" + tag + "'' tag created for '" + pkg + "': `\n" + \
+                    out + "\n`"
             # Is there a package.xml in the top level?
             with inbranch('debian/groovy/' + distro + '/' + pkg):
                 assert os.path.exists('package.xml'), "release branch invalid"