Fix Go source excludes; Cleanup old filespec matching

contrib/go/src/python/pants/contrib/go/targets/go_local_source.py

@@ -67,8 +67,8 @@ def __init__(self, address=None, payload=None, **kwargs):
     #    for example via plain old filesystem access.
     globs = Globs(ParseContext(rel_path=address.spec_path, type_aliases={}))
     sources = globs('*', exclude=[globs('BUILD*'),
-                                  # This skips dirents.
-                                  globs('*/')])
+                                  # skip subdir contents
+                                  globs('*/**')])
 
     payload = payload or Payload()
     payload.add_fields({

src/python/pants/source/filespec.py

@@ -16,7 +16,7 @@ def glob_to_regex(pattern):
   :returns: A regex string that matches same paths as the input glob does.
   """
   out = ['^']
-  components = pattern.strip('/').replace('.', '[.]').split('/')
+  components = pattern.strip('/').replace('.', '[.]').replace('$', '[$]').split('/')
   doublestar = False
   for component in components:
     if len(out) == 1:

src/python/pants/source/payload_fields.py

@@ -64,7 +64,7 @@ def has_sources(self, extension=None):
 
   def relative_to_buildroot(self):
     """All sources joined with their relative paths."""
-    return list(self.sources.iter_relative_paths())
+    return list(path for path in self.sources.iter_relative_paths() if self.matches(path))
 
   def _compute_fingerprint(self):
     hasher = sha1()

src/python/pants/source/wrapped_globs.py

@@ -75,7 +75,7 @@ def __init__(self, rel_root, filespec, files, files_hash):
     """
     :param rel_root: The root for the given filespec, relative to the buildroot.
     :param filespec: A filespec as generated by `FilesetRelPathWrapper`, which represents
-      what globs or file list it came from.
+      what globs or file list it came from. Must be relative to buildroot.
     :param files: A list of matched files, with declared order and duplicates preserved.
     :param files_hash: A string fingerprint for all files in the fileset.
     """

tests/python/pants_test/source/test_filespec.py

@@ -23,6 +23,9 @@ def assert_rule_match(self, glob, expected_matches, negate=False):
       asserter(re.match(regex, expected), 'glob_to_regex(`{}`) -> `{}` {} path `{}`'
                                           .format(glob, regex, match_state, expected))
 
+  def test_glob_to_regex_with_dollar_sign(self):
+    self.assert_rule_match('a/b$abc*.py', ('a/b$abc.py', ))
+
   def test_glob_to_regex_single_star_0(self):
     self.assert_rule_match('a/b/*/f.py', ('a/b/c/f.py', 'a/b/q/f.py'))
 

tests/python/pants_test/source/test_payload_fields.py

@@ -71,7 +71,12 @@ def test_passes_lazy_fileset_with_spec_through(self):
   def test_passes_eager_fileset_with_spec_through(self):
     self.create_file('foo/a.txt', 'a_contents')
 
-    fileset = EagerFilesetWithSpec('foo', {'globs': ['foo/a.txt']}, ['foo/a.txt'], {'foo/a.txt': b'12345'})
+    fileset = EagerFilesetWithSpec(rel_root='foo',
+                                   # Glob spec is relative to build root
+                                   filespec={'globs': ['foo/foo/a.txt']},
+                                   # files are relative to `rel_root`
+                                   files=['foo/a.txt'],
+                                   files_hash={'foo/a.txt': b'12345'})
     sf = SourcesField(sources=fileset)
 
     self.assertIs(fileset, sf.sources)