datadog-sdk-testing 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44e65983bc61091e09056f2a4c0915ef278bd26
-  data.tar.gz: ac179c9a1273e47e0224c21caa1de6762cd431fa
+  metadata.gz: 013c7b5b9ff3626e2f2924adb8ff35ce45bd5a21
+  data.tar.gz: e53a7fbbc1dcd7a43dc6f34fbbccc4af375df50e
 SHA512:
-  metadata.gz: d763f040338c25d0db5ad817055906dfff23f2103428b6ae322ef4b9b43829acadbab321fc29ef7dc3cb8f0a7494e6c171ee0efa9edf34795da45b7d83f13402
-  data.tar.gz: aacc3d99aeb93c3badb7564f10afbf47cd9352c7eb73fb2bdfa8d3541a30ce11c60c61fd1d5eeda1da8c86ba0d8bdba4ea96ce4bdf10540d91b32852d159ffd3
+  metadata.gz: a2d11c175dc4d8943e879056a6d718caa7ae1ff09594da070ea6cd97f7aded0c9439f689bdd8b2c415180d054b3cfea567f7b0687a008d7765e088cc281be280
+  data.tar.gz: f587725bbbf302383fc599875ff844a074cba08ab755a21d72c681bf41c73134624c225e0a3aa2faadaa3491144f13cc18791dca344268c8d0bdfb0b63a0a80d

data/lib/tasks/ci/hooks/pre-commit.py

@@ -31,12 +31,15 @@ def two_fa():
 
 class RequirementsAnalyzer(object):
     SPECIFIERS = ['==', '!=' '<=', '>=', '<', '>']
+    COMMENT = '#'
 
-    def __init__(self, remote, local, patterns=['requirements.txt'], verbose=False):
+    def __init__(self, remote, local, patterns=['requirements.txt'],
+                 ignorable=[], verbose=False):
         self.api = None
         self.remote_sources = remote
         self.local_sources = local
         self.req_patterns = patterns
+        self.req_ignore = ignorable
         self.verbose = verbose
 
         if github3:
@@ -69,28 +72,48 @@ class RequirementsAnalyzer(object):
                 files[content.name] = content
                 continue
 
-            req = gh_repo.file_contents("/{}/requirements.txt".format(entry))
-            reqs[entry] = req.decoded
+            req_file = "/{}/requirements.txt".format(entry)
+            if self.req_ignore:
+                for pattern in self.req_ignore:
+                    if not fnmatch.fnmatchcase(req_file, pattern):
+                        req = gh_repo.file_contents(req_file)
+                        reqs[entry] = req.decoded
+                        break
+            else:
+                req = gh_repo.file_contents(req_file)
+                reqs[entry] = req.decoded
 
         fmatches = []
         for pattern in self.req_patterns:
-            fmatches.extend(fnmatch.filter(files.keys(), pattern))
+            hits = fnmatch.filter(files.keys(), pattern)
+            fmatches.extend(hits)
 
+        fmatches = self.filter_matches(fmatches)  # filter/remove duplicates
         for match in fmatches:
             req = gh_repo.file_contents(files[match].path)
             reqs[match] = req.decoded
 
         return reqs
 
-    def get_local_files(self):
+    def get_local_files(self, src):
         matches = []
-        for src in self.local_sources:
+        for root, dirnames, filenames in os.walk(src):
             for pattern in self.req_patterns:
-                for root, dirnames, filenames in os.walk(src):
-                    for filename in fnmatch.filter(filenames, pattern):
-                        matches.append(os.path.join(root, filename))
+                hits = [os.path.join(root, hit) for hit in fnmatch.filter(filenames, pattern)]
+                hits = self.filter_matches(hits)
+                matches.extend(hits)
 
-        return matches
+        return list(set(matches))
+
+    def filter_matches(self, matches):
+        if not self.req_ignore:
+            return matches
+
+        excluded = []
+        for pattern in self.req_ignore:
+            excluded.extend(fnmatch.filter(matches, pattern))
+
+        return list(set(matches)-set(excluded))
 
     def get_local_contents(self, files):
         local_reqs = {}
@@ -116,7 +139,7 @@ class RequirementsAnalyzer(object):
             print 'No Github API set (missing creds?) cant crawl remotes.'
 
         for local in self.local_sources:
-            requirements = self.get_local_contents(self.get_local_files())
+            requirements = self.get_local_contents(self.get_local_files(local))
             reqs[local] = requirements
 
         return reqs
@@ -133,6 +156,14 @@ class RequirementsAnalyzer(object):
 
                 for line in mycontent:
                     line = "".join(line.split())
+                    comment_idx = line.find(self.COMMENT)
+                    if comment_idx >= 0:
+                        line = line[:comment_idx]
+
+                    if not any(sep in line for sep in self.SPECIFIERS):
+                        reqs[line] = ('unpinned', integration, source)
+                        continue
+
                     for specifier in self.SPECIFIERS:
                         idx = line.find(specifier)
                         if idx < 0:
@@ -143,11 +174,12 @@ class RequirementsAnalyzer(object):
 
                         if req in reqs and reqs[req][0] != specifier:
                             # version mismatch
-                            print "There's a version mismatch with {req} " \
-                                " {spec} and {prev_spec} defined in {src} " \
+                            print "There's a version mismatch with {req} {spec} " \
+                                "@ {offense} and {prev_spec} defined in {src} " \
                                 "@ {repo}.".format(
                                     req=req,
                                     spec=specifier,
+                                    offense=source,
                                     prev_spec=reqs[req][0],
                                     src=reqs[req][1],
                                     repo=reqs[req][2]
@@ -167,6 +199,14 @@ def str2bool(v):
 def main(args):
     remote = local = []
     verbose = str2bool(os.environ.get('VERBOSE', 'false'))
+    patterns = os.environ.get('REQ_PATTERNS', 'requirements*.txt')
+    if patterns:
+        patterns = patterns.split(',')
+
+    ignorable = os.environ.get('REQ_IGNORE_PATH', None)
+    if ignorable:
+        ignorable = ignorable.split(',')
+
     if not len(args):
         remote = [repo.strip() for repo in os.environ.get('REQ_REMOTES', '').split(',')]
         local = [repo.strip() for repo in os.environ.get('REQ_LOCALS', '').split(',')]
@@ -178,8 +218,10 @@ def main(args):
     else:
         local = ['.']
 
-    analyzer = RequirementsAnalyzer(
-        remote=remote, local=local, patterns=['requirements*.txt'], verbose=verbose)
+    analyzer = RequirementsAnalyzer(remote=remote, local=local,
+                                    patterns=patterns,
+                                    ignorable=ignorable,
+                                    verbose=verbose)
 
     err, reqs = analyzer.process_requirements(analyzer.get_all_requirements())
     if not err:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-sdk-testing
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jaime Fullaondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Datadog Integration SDK testing/scaffolding gem
 email: jaime.fullaondo@datadoghq.com