Merge pull request #525 from M0ses/issue_520

FIXES: #520

Author: M0ses

TarSCM/archive.py

@@ -57,11 +57,18 @@ def filter_files(self, filelist, topdir, args):
         excludes  = r'$.'
         re_topdir = '(%s)/(%s)'
 
+        if args.include_re:
+            includes = re_topdir % (re.escape(topdir), args.include_re)
+
+        if args.exclude_re:
+            excludes = re_topdir % (re.escape(topdir), args.exclude_re)
+
         if args.include:
             incl_arr = [fnmatch.translate(x + '*') for x in args.include]
             includes = re_topdir % (re.escape(topdir), r'|'.join(incl_arr))
+
         if args.exclude:
-            excl_arr = [x for x in args.exclude]
+            excl_arr = [fnmatch.translate(x) for x in args.exclude]
             excludes = re_topdir % (re.escape(topdir), r'|'.join(excl_arr))
 
         # add topdir without filtering for now

TarSCM/cli.py

@@ -149,10 +149,18 @@ def parse_args(self, options):
                            default=[], metavar='REGEXP',
                            help='Specifies subset of files/subdirectories to '
                                 'pack in the tarball (can be repeated)')
+        group.add_argument('--include-re',
+                           metavar='REGEXP',
+                           help='Specifies a regex pattern to match '
+                                'files/subdirectories to pack in the archive')
         group.add_argument('--exclude', action='append',
                            default=[], metavar='REGEXP',
                            help='Specifies excludes when creating the '
                                 'tarball (can be repeated)')
+        group.add_argument('--exclude-re',
+                           metavar='REGEXP',
+                           help='Specifies a regex pattern to exclude matching'
+                                ' files from the archive')
         parser.add_argument('--package-meta',
                             choices=['yes', 'no'], default='no',
                             help='Package the meta data of SCM to allow the '

tar_scm.service.in

@@ -155,10 +155,16 @@
     <description>Specify suffix name of package, which is used together with filename to determine tarball name.</description>
   </parameter>
   <parameter name="exclude">
-    <description>Specify glob pattern to exclude when creating the tarball.</description>
+    <description>Specify glob pattern to exclude when creating the archive.</description>
+  </parameter>
+  <parameter name="exclude-re">
+    <description>Specify regex pattern to exclude when creating the archive.</description>
   </parameter>
   <parameter name="include">
-    <description>Specify subset of files/subdirectories to pack in the tarball.</description>
+    <description>Specify subset of files/subdirectories to pack in the archive.</description>
+  </parameter>
+  <parameter name="include-re">
+    <description>Specifies a regex pattern to match files/subdirectories to pack in the archive.</description>
   </parameter>
   <parameter name="extract">
     <description>Specify a file/glob to be exported directly. Useful for build descriptions like spec files

tests/commontests.py

@@ -63,7 +63,7 @@ def test_tar_exclude(self):
         self.assertTrue(tarents == expected)
 
     def test_tar_exclude_re(self):
-        self.tar_scm_std('--exclude', '(a|c)')
+        self.tar_scm_std('--exclude-re', '(a|c)')
         tar_file = os.path.join(self.outdir, self.basename()+'.tar')
         tar      = tarfile.open(tar_file)
         tarents  = tar.getnames()
@@ -82,6 +82,16 @@ def test_tar_include(self):
                     self.basename() + '/subdir/b']
         self.assertTrue(tarents == expected)
 
+    def test_tar_include_re(self):
+        self.tar_scm_std('--include-re', '(a|c)')
+        tar_file = os.path.join(self.outdir, self.basename()+'.tar')
+        tar      = tarfile.open(tar_file)
+        tarents = tar.getnames()
+        expected = [self.basename(),
+                    self.basename() + '/a',
+                    self.basename() + '/c']
+        self.assertTrue(tarents == expected)
+
     def test_obs_scm_exclude(self):
         self.tar_scm_std('--exclude', 'a', '--exclude', 'c', '--use-obs-scm', 'True')
         cpio    = os.path.join(self.outdir, self.basename()+'.obscpio')

tests/gitsvntests.py

@@ -91,12 +91,13 @@ def test_changesgenerate_new_commit_no_changes_file(self):  # pylint: disable=C0
         self._check_servicedata(revision=3)
 
     def _new_change_entry_regexp(self, author, changes):  # pylint: disable=R0201
-        return textwrap.dedent("""\
-          ^-------------------------------------------------------------------
-          \w{3} \w{3} [ \d]\d \d\d:\d\d:\d\d [A-Z]{3} 20\d\d - %s
-
-          %s
-          """) % (author, changes)
+        regex = \
+          r"^-+\n" \
+          r"\w{3} \w{3} [ \d]\d \d\d:\d\d:\d\d [A-Z]{3} 20\d\d - %s\n" \
+          r"\n" \
+          r"%s\n" % (author, changes)
+        print(regex)
+        return regex
 
     def _check_changes(self, orig_changes, expected_changes_regexp):
         new_changes_file = os.path.join(self.outdir, 'pkg.changes')
@@ -160,12 +161,11 @@ def _test_changesgenerate_new_commit_and_changes_file(self, changesauthor, expec
         print("XXXX 4")
         expected_changes_regexp = self._new_change_entry_regexp(
             expected_author,
-            textwrap.dedent("""\
-              - Update to version 0.6.%s:
-                \* 5
-                \* 4
-                \* 3
-              """) % rev
+            r"- Update to version 0.6.%s:\n"
+            r"  \* 5\n"
+            r"  \* 4\n"
+            r"  \* 3\n"
+             % rev
         )
         self._check_changes(orig_changes, expected_changes_regexp)
 
@@ -190,12 +190,11 @@ def test_changesgenerate_new_commit_and_changes_file_no_version(self):  # pylint
         expected_author = self.fixtures.user_email
         expected_changes_regexp = self._new_change_entry_regexp(
             expected_author,
-            textwrap.dedent("""\
-              - Update to version %s:
-                \* 5
-                \* 4
-                \* 3
-              """) % ver_regex
+            r"- Update to version %s:\n"
+            r"  \* 5\n"
+            r"  \* 4\n"
+            r"  \* 3\n"
+            % ver_regex
         )
         self._check_changes(orig_changes, expected_changes_regexp)
 
@@ -220,12 +219,11 @@ def test_changesgenerate_new_commit_and_changes_file_with_subdir(self):   # pyli
         expected_author = self.fixtures.user_email
         expected_changes_regexp = self._new_change_entry_regexp(
             expected_author,
-            textwrap.dedent("""\
-              - Update to version 0.6.%s:
-                \* 8
-                \* 7
-                \* 6
-              """) % self.changesrevision(rev, abbrev=True)
+            r"- Update to version 0.6.%s:\n"
+            r"  \* 8\n"
+            r"  \* 7\n"
+            r"  \* 6\n"
+            % self.changesrevision(rev, abbrev=True)
         )
         self._check_changes(orig_changes, expected_changes_regexp)
 
@@ -254,11 +252,10 @@ def test_changesgenerate_old_servicedata(self):   # pylint: disable=C0103
         expected_author = self.fixtures.user_email
         expected_changes_regexp = self._new_change_entry_regexp(
             expected_author,
-            textwrap.dedent("""\
-              - Update to version 0.6.%s:
-                \* 5
-                \* 4
-                \* 3
-              """) % self.changesrevision(rev, abbrev=True)
+            r"- Update to version 0.6.%s:\n"
+            r"  \* 5\n"
+            r"  \* 4\n"
+            r"  \* 3\n"
+            % self.changesrevision(rev, abbrev=True)
         )
         self._check_changes(orig_changes, expected_changes_regexp)

tests/gittests.py

@@ -84,7 +84,7 @@ def changesrevision(self, rev, abbrev=False):
         return self.sha1s('tag%d' % rev)
 
     def changesregex(self, rev):  # pylint: disable=R0201
-        return '\d{10}.%s' % rev  # noqa: W605, pylint: disable=W1401
+        return r'\d{10}.%s' % rev  # noqa: W605, pylint: disable=W1401
 
     def tar_scm_args(self):  # pylint: disable=R0201
         scm_args = [
@@ -245,7 +245,7 @@ def test_versionrewrite(self):
         fix = self.fixtures
         fix.create_commits(2)
         self.tar_scm_std("--revision", 'tag2',
-                         "--versionrewrite-pattern", 'tag(\d+)',  # noqa: W605,E501 pylint: disable=W1401
+                         "--versionrewrite-pattern", r'tag(\d+)',  # noqa: W605,E501 pylint: disable=W1401
                          "--versionrewrite-replacement", '\\1-test',
                          "--versionformat", "@PARENT_TAG@")
         self.assertTarOnly(self.basename(version="2-test"))