Merge pull request #13 from ilovemilk/feature/fix-branch-regex

fix number special case for branch regex
ilovemilk · Feb 13, 2020 · 92d7bde · 92d7bde
2 parents 1056c8c + 3e649be
commit 92d7bde
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.2]
+### Fixed
+- Branch parsing regex now supports numbers [0-9]
+
 ## [2.0.1]
 ### Fixed
 - Branch parsing regex now supports camelCase

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Gradle 2.1 and higher
 
 ```
 plugins {
-    id("io.wusa.semver-git-plugin").version("2.0.0")
+    id("io.wusa.semver-git-plugin").version("2.0.2")
 }
 ```
 
@@ -25,7 +25,7 @@ buildscript {
        }
    }
    dependencies {
-      classpath 'io.wusa:semver-git-plugin:2.0.0'
+      classpath 'io.wusa:semver-git-plugin:2.0.2'
    }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.wusa"
-version = "2.0.1"
+version = "2.0.2"
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))

diff --git a/src/main/kotlin/io/wusa/GitService.kt b/src/main/kotlin/io/wusa/GitService.kt
@@ -81,7 +81,7 @@ class GitService {
         }
 
         private fun filterCurrentBranch(branches: String) =
-                """(remotes)*/*(origin)*/*([a-zA-Z_-]*/?[a-zA-Z_-]+)\s+[0-9a-zA-Z]{40}""".toRegex().find(branches)!!.groupValues[3]
+                """(remotes)*/*(origin)*/*([a-zA-Z0-9_-]*/?[a-zA-Z0-9_-]+)\s+[0-9a-zA-Z]{40}""".toRegex().find(branches)!!.groupValues[3]
 
         private fun getAllBranches(project: Project): String {
             return GitCommandRunner.execute(project.projectDir, arrayOf("branch", "--all", "--verbose", "--no-abbrev", "--contains"))

diff --git a/src/test/kotlin/io/wusa/GitServiceTest.kt b/src/test/kotlin/io/wusa/GitServiceTest.kt
@@ -130,6 +130,13 @@ class GitServiceTest {
                 "  remotes/origin/hotfix/codePrefix a3b40aa8be599003c8656d5cc9a460ffd61fe1f9 escaping / in regex for branch detection"
         Assertions.assertEquals("hotfix/codePrefix", GitService.currentBranch(project))
     }
+    @Test
+    fun `get current branch feature-s-version-3 with origin`() {
+        every { GitCommandRunner.execute(projectDir = any(), args = any()) } returns
+                "* feature/s-version-3                9ea487bb167c89a6453fd2e72740a492c6782887 use kebab case\n" +
+                "  remotes/origin/feature/s-version-3 9ea487bb167c89a6453fd2e72740a492c6782887 use kebab case"
+        Assertions.assertEquals("feature/s-version-3", GitService.currentBranch(project))
+    }
 
     @Test
     fun `get current branch with null pointer exception`() {