Merge branch 'master' into feat/JLL/homoglyph_detector

* master:
  Add :
  Build
  Rework output
  Let finding wrapper jars be predictable
  Ignore IDEA files

__tests__/validate.test.ts

@@ -1,33 +1,71 @@
 import * as path from 'path'
 import * as validate from '../src/validate'
 
-test('validates wrapper jars', async () => {
-  const invalidWrapperJars = await validate.findInvalidWrapperJars(
-    path.resolve('.'),
-    3,
-    false,
-    []
+const baseDir = path.resolve('.')
+
+test('succeeds if all found wrapper jars are valid', async () => {
+  const result = await validate.findInvalidWrapperJars(baseDir, 3, false, [
+    'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+  ])
+
+  expect(result.isValid()).toBe(true)
+
+  expect(result.toDisplayString()).toBe(
+    '✓ Found known Gradle Wrapper JAR files:\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradle-wrapper.jar\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradlе-wrapper.jar\n' + // homoglyph
+      '  3888c76faa032ea8394b8a54e04ce2227ab1f4be64f65d450f8509fe112d38ce __tests__/data/valid/gradle-wrapper.jar'
   )
-  expect(invalidWrapperJars.length).toBe(2)
-  expect(invalidWrapperJars[0]).toEqual(
-    new validate.InvalidWrapperJar(
+})
+
+test('fails if invalid wrapper jars are found', async () => {
+  const result = await validate.findInvalidWrapperJars(baseDir, 3, false, [])
+
+  expect(result.isValid()).toBe(false)
+
+  expect(result.valid).toEqual([
+    new validate.WrapperJar(
+      '__tests__/data/valid/gradle-wrapper.jar',
+      '3888c76faa032ea8394b8a54e04ce2227ab1f4be64f65d450f8509fe112d38ce'
+    )
+  ])
+
+  expect(result.invalid).toEqual([
+    new validate.WrapperJar(
       '__tests__/data/invalid/gradle-wrapper.jar',
       'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+    ),
+    new validate.WrapperJar(
+      '__tests__/data/invalid/gradlе-wrapper.jar', // homoglyph
+      'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
     )
   ])
 
   expect(result.toDisplayString()).toBe(
     '✗ Found unknown Gradle Wrapper JAR files:\n' +
-      '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradle-wrapper.jar\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradle-wrapper.jar\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradlе-wrapper.jar\n' + // homoglyph
       '✓ Found known Gradle Wrapper JAR files:\n' +
       '  3888c76faa032ea8394b8a54e04ce2227ab1f4be64f65d450f8509fe112d38ce __tests__/data/valid/gradle-wrapper.jar'
   )
 })
 
 test('fails if not enough wrapper jars are found', async () => {
-  await expect(
-    validate.findInvalidWrapperJars(path.resolve('.'), 4, false, [])
-  ).rejects.toThrowError(
+  const result = await validate.findInvalidWrapperJars(baseDir, 4, false, [])
+
+  expect(result.isValid()).toBe(false)
+
+  expect(result.errors).toEqual([
     'Expected to find at least 4 Gradle Wrapper JARs but got only 3'
+  ])
+
+  expect(result.toDisplayString()).toBe(
+    '✗ Found unknown Gradle Wrapper JAR files:\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradle-wrapper.jar\n' +
+    '  e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 __tests__/data/invalid/gradlе-wrapper.jar\n' + // homoglyph
+      '✗ Other validation errors:\n' +
+      '  Expected to find at least 4 Gradle Wrapper JARs but got only 3\n' +
+      '✓ Found known Gradle Wrapper JAR files:\n' +
+      '  3888c76faa032ea8394b8a54e04ce2227ab1f4be64f65d450f8509fe112d38ce __tests__/data/valid/gradle-wrapper.jar'
   )
 })

dist/index.js

@@ -1104,7 +1104,8 @@ function findWrapperJars(baseDir) {
         const files = yield recursivelyListFiles(baseDir);
         return files
             .filter(file => unhomoglyph_1.default(file).endsWith('gradle-wrapper.jar'))
-            .map(wrapperJar => path.relative(baseDir, wrapperJar));
+            .map(wrapperJar => path.relative(baseDir, wrapperJar))
+            .sort((a, b) => a.localeCompare(b));
     });
 }
 exports.findWrapperJars = findWrapperJars;