Merge pull request #13 from y0ung3r/b/8

(#8) Fix relative paths handling
y0ung3r · Nov 26, 2023 · 02737bb · 02737bb
2 parents c6c377c + 89d0a31
commit 02737bb
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 21 deletions.
diff --git a/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/HooksFolder.kt b/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/HooksFolder.kt
@@ -34,7 +34,7 @@ class HooksFolder(git: Git) {
         = hooks.isEmpty()
 
     init {
-        path = Path.of(git.getGlobalHooksPath())
+        path = git.getGlobalHooksPath()
 
         val files = try {
             Files.list(path)

diff --git a/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/extensions/GitExtensions.kt b/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/extensions/GitExtensions.kt
@@ -1,14 +1,31 @@
 package com.github.y0ung3r.gitglobalhookslocator.git.extensions
 
 import com.github.y0ung3r.gitglobalhookslocator.git.Git
+import com.github.y0ung3r.gitglobalhookslocator.git.utils.SystemPathUtils
+import java.nio.file.Path
 
-fun Git.getGlobalHooksPath(): String {
-    val path = executeCommand(
+private const val SLASHES_PATTERN = "[/\\\\]"
+private const val HOME_PATTERN = "^~$SLASHES_PATTERN"
+private const val CURRENT_DIR_PATTERN = "^.$SLASHES_PATTERN"
+
+fun Git.getGlobalHooksPath(): Path {
+    val rawPath = executeCommand(
         Git.GIT_CONFIG_COMMAND,
         Git.GIT_GLOBAL_COMMAND,
         Git.GIT_CONFIG_GET_COMMAND,
         Git.GIT_HOOKS_PATH_SECTION
     )
 
-    return path.value
+    val targetPath = rawPath.value
+        .replaceFirst(
+            Regex(HOME_PATTERN),
+            SystemPathUtils.getUserHomePath()
+        )
+        .replaceFirst(
+            Regex(CURRENT_DIR_PATTERN),
+            SystemPathUtils.getCurrentDirectoryPath()
+        )
+
+    return Path.of(targetPath)
+        .toAbsolutePath()
 }
diff --git a/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/utils/SystemPathUtils.kt b/src/main/kotlin/com/github/y0ung3r/gitglobalhookslocator/git/utils/SystemPathUtils.kt
@@ -0,0 +1,23 @@
+package com.github.y0ung3r.gitglobalhookslocator.git.utils
+
+object SystemPathUtils {
+	private const val USER_HOME_KEY = "user.home"
+	private const val USER_DIR_KEY = "user.dir"
+
+	@JvmStatic
+	private fun getSystemPath(key: String): String {
+		val systemPath = System
+			.getProperty(key)
+			.replace("\\", "/") // The replacement eliminates the need to escape the string
+
+		return "$systemPath/"
+	}
+
+	@JvmStatic
+	fun getUserHomePath(): String
+		= getSystemPath(USER_HOME_KEY)
+
+	@JvmStatic
+	fun getCurrentDirectoryPath(): String
+		= getSystemPath(USER_DIR_KEY)
+}
diff --git a/...lin/com/github/y0ung3r/gitglobalhookslocator/ui/toolWindow/GitGlobalHooksLocatorWindow.kt b/...lin/com/github/y0ung3r/gitglobalhookslocator/ui/toolWindow/GitGlobalHooksLocatorWindow.kt
@@ -8,10 +8,7 @@ import com.intellij.ide.wizard.withVisualPadding
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.Align
-import com.intellij.ui.dsl.builder.LabelPosition
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
-import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import javax.swing.JComponent
 
 class GitGlobalHooksLocatorWindow(toolWindow: ToolWindow) {

diff --git a/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/GetGlobalHooksPathTests.kt b/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/GetGlobalHooksPathTests.kt
@@ -4,18 +4,70 @@ import com.github.y0ung3r.gitglobalhookslocator.gitTests.testEngine.RespondInter
 import com.github.y0ung3r.gitglobalhookslocator.git.Git
 import com.github.y0ung3r.gitglobalhookslocator.git.cli.CliResponse
 import com.github.y0ung3r.gitglobalhookslocator.git.extensions.getGlobalHooksPath
+import com.github.y0ung3r.gitglobalhookslocator.git.utils.SystemPathUtils
 import org.junit.Assert.assertEquals
 import org.junit.Test
+import java.nio.file.Path
 
 class GetGlobalHooksPathTests {
     @Test
-    fun `Should returns global hooks path`() {
+    fun `Should returns absolute global hooks path using relative path`() {
         // Arrange
-        val expectedPath = "~/.git/hooks"
+        val relativePath = "/.git/hooks"
+        val expectedPath = Path
+            .of(relativePath)
+            .toAbsolutePath()
+
+        val sut = Git(
+            RespondInterchangeably(
+                CliResponse(Git.minRequiredVersion.toString()),
+                CliResponse(relativePath)
+            )
+        )
+
+        // Act
+        val actualPath = sut.getGlobalHooksPath()
+
+        // Assert
+        assertEquals(expectedPath, actualPath)
+    }
+
+    @Test
+    fun `Should resolve path using $HOME variable`() {
+        // Arrange
+        val expectedPath = Path.of(
+            SystemPathUtils.getUserHomePath(),
+            ".git",
+            "hooks"
+        )
+
+        val sut = Git(
+            RespondInterchangeably(
+                CliResponse(Git.minRequiredVersion.toString()),
+                CliResponse("~/.git/hooks")
+            )
+        )
+
+        // Act
+        val actualPath = sut.getGlobalHooksPath()
+
+        // Assert
+        assertEquals(expectedPath, actualPath)
+    }
+
+    @Test
+    fun `Should resolve path using $CURRENTDIR variable`() {
+        // Arrange
+        val expectedPath = Path.of(
+            SystemPathUtils.getCurrentDirectoryPath(),
+            ".git",
+            "hooks"
+        )
+
         val sut = Git(
             RespondInterchangeably(
                 CliResponse(Git.minRequiredVersion.toString()),
-                CliResponse(expectedPath)
+                CliResponse("./.git/hooks")
             )
         )
 

diff --git a/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/SemanticVersionTests.kt b/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/SemanticVersionTests.kt
@@ -1,11 +1,7 @@
 package com.github.y0ung3r.gitglobalhookslocator.gitTests
 
 import com.github.y0ung3r.gitglobalhookslocator.git.SemanticVersion
-import com.github.y0ung3r.gitglobalhookslocator.git.exceptions.ProvidedSemanticVersionIsInvalidException
 import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
 import org.junit.runners.Parameterized.Parameters
 
 //@RunWith(Parameterized::class)

diff --git a/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/testEngine/HookTestBase.kt b/src/test/kotlin/com/github/y0ung3r/gitglobalhookslocator/gitTests/testEngine/HookTestBase.kt
@@ -7,7 +7,7 @@ import java.nio.file.Path
 
 abstract class HookTestBase {
     companion object {
-        const val BASE_PATH = "src/test/testData/hooks"
+        private const val BASE_PATH = "src/test/testData/hooks"
         private const val DISABLED_HOOK = "disabled"
         private const val ENABLED_HOOK = "enabled"
 

diff --git a/src/test/testData/description.txt b/src/test/testData/description.txt
@@ -0,0 +1 @@
+The current folder is used to generate test data
diff --git a/src/test/testData/rename/foo.xml b/src/test/testData/rename/foo.xml
diff --git a/src/test/testData/rename/foo_after.xml b/src/test/testData/rename/foo_after.xml