feat: add check for .dot file

archguard · Mar 24, 2022 · 75d3a80 · 75d3a80
1 parent d443ec3
commit 75d3a80
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/LanguageService.kt b/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/LanguageService.kt
@@ -21,17 +21,22 @@ class LanguageService {
         }
     }
 
-    fun detectLanguage(countFile: String): String {
+    fun detectLanguage(name: String): String {
         val language = ""
-        val dotCount = countFile.count { it == '.' }
-        if (dotCount == 0) {
-            val optFilenameLang = filenameToLanguage[countFile.lowercase()]
+        val dotCount = name.count { it == '.' }
+
+        // such as `.gitignore` file
+        val isDotFile = name[0] == '.' && dotCount == 1
+        val notExtensionName = dotCount == 0
+        val ifNeedToCheckFullName = notExtensionName || isDotFile
+        if (ifNeedToCheckFullName) {
+            val optFilenameLang = filenameToLanguage[name.lowercase()]
             if (optFilenameLang != null) {
                 return optFilenameLang.toString()
             }
         }
 
-        val dotSplit = countFile.split(".")
+        val dotSplit = name.split(".")
         val firstExt = dotSplit.last()
         val optLang = extToLanguage[firstExt.lowercase()]
         if (optLang != null) {

diff --git a/scan_git/src/test/kotlin/com/thoughtworks/archguard/git/scanner/LanguageServiceTest.kt b/scan_git/src/test/kotlin/com/thoughtworks/archguard/git/scanner/LanguageServiceTest.kt
@@ -11,4 +11,16 @@ internal class LanguageServiceTest {
         val lang = LanguageService()
         assertEquals("License", lang.detectLanguage("LICENSE"))
     }
+
+    @Test
+    fun should_check_gitignore() {
+        val lang = LanguageService()
+        assertEquals("gitignore", lang.detectLanguage(".gitignore"))
+    }
+
+//    @Test
+//    fun should_return_typescript_define_file() {
+//        val lang = LanguageService()
+//        assertEquals("TypeScript Typings", lang.detectLanguage("d.ts"))
+//    }
 }