Merge pull request #90 from rspieldenner/travisbranches

Travisbranches

Author: rspieldenner

src/integTest/groovy/nebula/plugin/release/ReleasePluginIntegrationSpec.groovy

@@ -15,6 +15,7 @@
  */
 package nebula.plugin.release
 
+import com.github.zafarkhaja.semver.Version
 import nebula.plugin.bintray.NebulaBintrayPublishingPlugin
 import org.ajoberstar.grgit.Tag
 import org.gradle.api.plugins.JavaPlugin
@@ -237,6 +238,23 @@ class ReleasePluginIntegrationSpec extends GitVersioningIntegrationSpec {
         originGit.tag.list()*.name.contains('v2.0.0')
     }
 
+    def 'create release on git-flow style branch from within travis context'() {
+        def twoX = 'release/2.x'
+        git.tag.add(name: 'v1.0.0')
+        git.branch.add(name: twoX)
+        git.push(all: true, tags: true)
+        git.branch.change(name: twoX, startPoint: "origin/${twoX}".toString())
+        git.checkout(branch: twoX)
+        def commit = git.head()
+        git.checkout(branch: 'HEAD'/*commit.abbreviatedId*/, startPoint: commit.id, createBranch: true)
+
+        when:
+        Version version= inferredVersionForTask('snapshot', '-Prelease.travisci=true', '-Prelease.travisBranch=2.x')
+
+        then:
+        version.toString() == '2.0.0-SNAPSHOT'
+    }
+
     def 'create new major_minor release branch and have version respected'() {
         def oneThreeX = '1.3.x'
         git.tag.add(name: 'v1.2.2')

src/main/groovy/nebula/plugin/release/NetflixOssStrategies.groovy

@@ -20,9 +20,19 @@ import org.ajoberstar.gradle.git.release.semver.ChangeScope
 import org.ajoberstar.gradle.git.release.semver.PartialSemVerStrategy
 import org.ajoberstar.gradle.git.release.semver.SemVerStrategy
 import org.ajoberstar.gradle.git.release.semver.StrategyUtil
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+
+import java.util.regex.Pattern
+
+import static org.ajoberstar.gradle.git.release.semver.StrategyUtil.incrementNormalFromScope
+import static org.ajoberstar.gradle.git.release.semver.StrategyUtil.parseIntOrZero
 
 class NetflixOssStrategies {
+    static final PartialSemVerStrategy TRAVIS_BRANCH_MAJOR_X = fromTravisPropertyPattern(~/^(\d+)\.x$/)
+    static final PartialSemVerStrategy TRAVIS_BRANCH_MAJOR_MINOR_X = fromTravisPropertyPattern(~/^(\d+)\.(\d+)\.x$/)
     private static final scopes = StrategyUtil.one(Strategies.Normal.USE_SCOPE_PROP,
+            TRAVIS_BRANCH_MAJOR_X, TRAVIS_BRANCH_MAJOR_MINOR_X,
             Strategies.Normal.ENFORCE_GITFLOW_BRANCH_MAJOR_X, Strategies.Normal.ENFORCE_BRANCH_MAJOR_X,
             Strategies.Normal.ENFORCE_GITFLOW_BRANCH_MAJOR_MINOR_X, Strategies.Normal.ENFORCE_BRANCH_MAJOR_MINOR_X,
             Strategies.Normal.USE_NEAREST_ANY, Strategies.Normal.useScope(ChangeScope.MINOR))
@@ -50,4 +60,44 @@ class NetflixOssStrategies {
             state.copyWith(inferredBuildMetadata: metadata)
         }
     }
+
+    static Project project
+
+    static final String TRAVIS_BRANCH_PROP = 'release.travisBranch'
+
+    static PartialSemVerStrategy fromTravisPropertyPattern(Pattern pattern) {
+        return StrategyUtil.closure { state ->
+            println state
+            if (project.hasProperty(TRAVIS_BRANCH_PROP)) {
+                def branch = project.property(TRAVIS_BRANCH_PROP)
+                def m = branch =~ pattern
+                if (m) {
+                    def major = m.groupCount() >= 1 ? parseIntOrZero(m[0][1]) : -1
+                    def minor = m.groupCount() >= 2 ? parseIntOrZero(m[0][2]) : -1
+
+                    def normal = state.nearestVersion.normal
+                    def majorDiff = major - normal.majorVersion
+                    def minorDiff = minor - normal.minorVersion
+
+                    if (majorDiff == 1 && minor <= 0) {
+                        // major is off by one and minor is either 0 or not in the branch name
+                        return incrementNormalFromScope(state, ChangeScope.MAJOR)
+                    } else if (minorDiff == 1 && minor > 0) {
+                        // minor is off by one and specified in the branch name
+                        return incrementNormalFromScope(state, ChangeScope.MINOR)
+                    } else if (majorDiff == 0 && minorDiff == 0 && minor >= 0) {
+                        // major and minor match, both are specified in branch name
+                        return incrementNormalFromScope(state, ChangeScope.PATCH)
+                    } else if (majorDiff == 0 && minor < 0) {
+                        // only major specified in branch name and already matches
+                        return state
+                    } else {
+                        throw new GradleException("Invalid branch (${state.currentBranch.name}) for nearest normal (${normal}).")
+                    }
+                }
+            }
+
+            return state
+        }
+    }
 }

src/main/groovy/nebula/plugin/release/ReleasePlugin.groovy

@@ -57,6 +57,7 @@ class ReleasePlugin implements Plugin<Project> {
     @Override
     void apply(Project project) {
         this.project = project
+        NetflixOssStrategies.project = project
 
         def gitRoot = project.hasProperty('git.root') ? project.property('git.root') : project.rootProject.projectDir