Rename files, fix path exclusion with pathsep (#229)

Author: simontoens

src/common/argsupport.py

@@ -51,13 +51,8 @@ def get_all_packages(repository_root_path, packages_str,
             repository_root_path, p, generation_stategy_factory, verbose)
         for package in packages:
             for exclusion_path in exclusion_paths:
-                prefix_match = True
-                if exclusion_path.endswith("/"):
-                    exclusion_path = exclusion_path[:-1]
-                    prefix_match = False
                 if package.startswith(exclusion_path):
-                    if prefix_match or package.endswith(exclusion_path):
-                        break
+                    break
             else:
                 if package not in all_packages:
                     all_packages.add(package)
@@ -69,7 +64,7 @@ def get_all_packages(repository_root_path, packages_str,
 def _find_packages_with_md(repository_root_path, target_pattern, fac, verbose):
     """
     Returns all packages in the specified target pattern, as a list of strings,
-    that are "maven aware" packages.
+    that are "manifest aware" packages.
     """
     path = os.path.join(repository_root_path, _target_pattern_to_path(target_pattern))
 

src/common/buildpomupdate.py renamed to src/common/metadataupdate.py

@@ -5,7 +5,8 @@
 For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
 
 
-This module is responsible for updating BUILD.pom and BUILD.pom.released files.
+This module is responsible for updating metadata files, such as BUILD.pom and
+BUILD.pom.released
 """
 
 

src/update.py

@@ -10,11 +10,11 @@
 
 from common import argsupport
 from common import common
+from common import manifestcontent as manifestcontent
+from common import metadataupdate
 from common import version_increment_strategy as vis
 from config import config
-from common import manifestcontent as manifestcontent
 from generate import generationstrategyfactory
-from common import buildpomupdate
 import argparse
 import sys
 
@@ -50,6 +50,8 @@ def _parse_arguments(args):
         help="Adds or updates the value of 'generation_mode' manifest files")
     parser.add_argument("--add_missing_generation_mode", required=False, action='store_true',
         help="Adds 'generation_mode' to manifest files")
+    parser.add_argument("--verbose", required=False, action="store_true",
+        help="Verbose output")
 
     parser.add_argument("--repo_root", type=str, required=False,
         help="the root of the repository")    
@@ -61,8 +63,8 @@ def _parse_arguments(args):
     repo_root = common.get_repo_root(args.repo_root)
     cfg = config.load(repo_root)
     fac = generationstrategyfactory.GenerationStrategyFactory(
-        repo_root, cfg, manifestcontent.NOOP, verbose=False)
-    packages = argsupport.get_all_packages(repo_root, args.package, fac)
+        repo_root, cfg, manifestcontent.NOOP, verbose=args.verbose)
+    packages = argsupport.get_all_packages(repo_root, args.package, fac, verbose=args.verbose)
     assert len(packages) > 0, "Did not find any packages at [%s]" % args.package
 
     if (args.new_version is not None or
@@ -74,7 +76,7 @@ def _parse_arguments(args):
         args.new_generation_mode is not None or
         args.add_missing_generation_mode):
 
-        buildpomupdate.update_build_pom_file(
+        metadataupdate.update_build_pom_file(
             repo_root, packages, fac,
             args.new_version,
             args.update_version_using_version_increment_strategy,
@@ -88,7 +90,7 @@ def _parse_arguments(args):
     if (args.new_released_version is not None or
         args.new_released_artifact_hash is not None or
         args.update_released_artifact_hash_to_current):
-        buildpomupdate.update_released_artifact(
+        metadataupdate.update_released_artifact(
             repo_root, packages, fac,
             cfg.all_src_exclusions,
             args.new_released_version,

tests/common/argsupporttest.py

@@ -20,7 +20,8 @@
 ZK_CONNECT_PACKAGES = ["projects/libs/servicelibs/zk-connect",]
 
 GRAIL_PACKAGES = ["projects/libs/servicelibs/grail/grail-admin-api",
-                  "projects/libs/servicelibs/grail/grail-admin-impl",]
+                  "projects/libs/servicelibs/grail/grail-admin-impl",
+                  "projects/libs/servicelibs/grailer/jones"]
 
 ALL_PACKAGES = PASTRY_PACKAGES + ZK_CONNECT_PACKAGES + GRAIL_PACKAGES
 
@@ -119,18 +120,20 @@ def test_get_all_packages__multiple_packages__multiple_exclusions(self):
         self.assertIn("projects/libs/pastry/pastry-metrics", packages)
         self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-api", packages)
         self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-impl", packages)
+        self.assertNotIn("projects/libs/servicelibs/grailer/jones", packages)
         self.assertNotIn("projects/libs/servicelibs/zk-connect", packages)
 
-    def test_exact_match_exclusions(self):
-        packages_str = "projects/libs,-projects/libs/servicelibs/zk,-projects/libs/servicelibs/grail/grail-admin-api/, -projects/libs/servicelibs/grail/"
+    def test_exclusion_includes_pathsep(self):
+        packages_str = "projects/libs,-projects/libs/servicelibs/zk, -projects/libs/servicelibs/grail/"
 
         packages = argsupport.get_all_packages(
             self.repo_root, packages_str, self.fac)
 
         self.assertIn("projects/libs/pastry/abstractions", packages)
         self.assertIn("projects/libs/pastry/pastry-metrics", packages)
+        self.assertIn("projects/libs/servicelibs/grailer/jones", packages)
         self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-api", packages)
-        self.assertIn("projects/libs/servicelibs/grail/grail-admin-impl", packages)
+        self.assertNotIn("projects/libs/servicelibs/grail/grail-admin-impl", packages)
         self.assertNotIn("projects/libs/servicelibs/zk-connect", packages)
 
     def test_target_pattern_to_path(self):

tests/common/buildpomupdatetest.py renamed to tests/common/metadataupdatetest.py

@@ -6,7 +6,7 @@
 """
 
 
-import common.buildpomupdate as buildpomupdate
+import common.metadataupdate as buildpomupdate
 import common.os_util as os_util
 import config.config as config
 import config.exclusions as exclusions