Merge pull request #98 from allegro/development

merge development to master for 1.3.1

Author: adamdubiel

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         maven { url 'https://plugins.gradle.org/m2/'  }
     }
     dependencies {
-        classpath group: 'com.gradle.publish', name: 'plugin-publish-plugin', version: '0.9.0'
+        classpath group: 'com.gradle.publish', name: 'plugin-publish-plugin', version: '0.9.1'
     }
 }
 
@@ -64,7 +64,7 @@ jacocoTestReport {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
+    gradleVersion = '2.5'
 }
 
 pluginBundle {

docs/changelog.rst

@@ -1,5 +1,9 @@
 Changelog
 =========
+
+* **1.3.1** (16.08.2015)
+    * added option to treat uncommitted changes as repository change
+    * added ``push`` hook action
 * **1.3.0** (11.07.2015)
     * support for custom version incrementation rules - thanks to `vbuell <https://github.com/vbuell>`_ for contribution
     * ability to push only tags to remote repo - thanks to `erichsend <https://github.com/erichsend>`_ for contribution

docs/configuration/hooks.rst

@@ -60,6 +60,20 @@ current version and SCM position as arguments::
         }
     }
 
+push
+----
+
+Pushes all changes to the remote::
+
+    scmVersion {
+        hooks {
+            post 'push'
+        }
+    }
+
+There is no additional magic in this action. Use with care, only when you have some commits that need to be pushed for
+example as a `post` action. Remember, that push is always done during the release.
+
 Custom action
 -------------
 

docs/configuration/overview.rst

@@ -19,6 +19,9 @@ All ``axion-release-plugin`` configuration options:
 
         // :doc:`dry_run`
         localOnly = false // never connect to remote
+        
+        // :doc:`uncommitted_changes`
+        ignoreUncommittedChanges = true // should uncommitted changes force version bump
     
         // :ref:`version-sanitization`
         sanitizeVersion = true // should created version be sanitized, true by default

docs/configuration/uncommitted_changes.rst

@@ -0,0 +1,36 @@
+Uncommitted changes
+===================
+
+By default ``axion-release`` uses snapshot version only when there are some commits after tag. Sometimes it might
+be useful to scan for uncommitted changes and use snapshot version if they are present.
+
+In order to treat uncommitted changes as trigger for version increment, change setting::
+
+    scmVersion {
+        ignoreUncommittedChanges = false
+    }
+
+This changes behavior from::
+
+    # ./gradlew currentVersion
+    1.0.0
+    
+    # cat "hello" > some_uncommitted_file
+    
+    # ./gradlew currentVersion
+    1.0.0
+    
+to::
+
+    # ./gradlew currentVersion
+    1.0.0
+    
+    # cat "hello" > some_uncommitted_file
+    
+    # ./gradlew currentVersion
+    1.0.1-SNAPSHOT
+    
+You can always override this option using command line::
+
+    # ./gradlew currentVersion -Prelease.ignoreUncommittedChanges
+    1.0.0

docs/configuration/version.rst

@@ -165,7 +165,7 @@ incrementMinorIfNotOnRelease
 This rule uses additional parameter ``releaseBranchPattern`` (by default it's set to 'release/.+')::
 
     scmVersion {
-        versionIncrementingRule 'incrementMinorIfNotOnRelease', [releaseBranchPattern: 'release.*']
+        versionIncrementer 'incrementMinorIfNotOnRelease', [releaseBranchPattern: 'release.*']
     }
 
 branchSpecific
@@ -174,13 +174,13 @@ branchSpecific
 This rule accepts map of ``branch pattern -> incrementer name`` and uses first incrementer that matches branch pattern::
 
     scmVersion {
-        versionIncrementingRule 'branchSpecific', ['master': 'incrementPatch', 'feature/.*': 'incrementMinor']
+        versionIncrementer 'branchSpecific', ['master': 'incrementPatch', 'feature/.*': 'incrementMinor']
     }
 
 The arguments map will be passed on to called incrementer, so you can add some more parameters at the end of it::
 
     scmVersion {
-        versionIncrementingRule 'branchSpecific', ['master': 'incrementPatch', '.*': 'incrementMinorIfNotOnRelease', releaseBranchPattern: 'release.*']
+        versionIncrementer 'branchSpecific', ['master': 'incrementPatch', '.*': 'incrementMinorIfNotOnRelease', releaseBranchPattern: 'release.*']
     }
 
 .. _version-decorating:

docs/index.rst

@@ -24,6 +24,7 @@ Configuration
     configuration/authorization
     configuration/version
     configuration/force_version
+    configuration/uncommitted_changes
     configuration/next_version
     configuration/checks
     configuration/dry_run

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sat Jul 11 00:26:26 CEST 2015
+#Sat Jul 11 01:04:47 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -30,7 +30,7 @@ class Releaser {
         VersionWithPosition positionedVersion = versionConfig.getRawVersion()
         Version version = positionedVersion.version
 
-        if (notOnTagAlready(positionedVersion) || VersionReadOptions.fromProject(project).forceVersion) {
+        if (notOnTagAlready(positionedVersion) || VersionReadOptions.fromProject(project, versionConfig).forceVersion) {
             String tagName = versionConfig.tag.serialize(versionConfig.tag, version.toString())
 
             if (versionConfig.createReleaseCommit) {

src/main/groovy/pl/allegro/tech/build/axion/release/domain/Releaser.groovy

@@ -16,6 +16,8 @@ class VersionConfig {
 
     boolean dryRun
 
+    boolean ignoreUncommittedChanges = true
+    
     RepositoryConfig repository
 
     TagNameSerializationRules tag = new TagNameSerializationRules()
@@ -105,15 +107,15 @@ class VersionConfig {
     String getVersion() {
         if (resolvedVersion == null) {
             ensureVersionServiceExists()
-            resolvedVersion = versionService.currentDecoratedVersion(this, VersionReadOptions.fromProject(project))
+            resolvedVersion = versionService.currentDecoratedVersion(this, VersionReadOptions.fromProject(project, this))
         }
         return resolvedVersion
     }
 
     VersionWithPosition getRawVersion() {
         if (rawVersion == null) {
             ensureVersionServiceExists()
-            rawVersion = versionService.currentVersion(this, VersionReadOptions.fromProject(project))
+            rawVersion = versionService.currentVersion(this, VersionReadOptions.fromProject(project, this))
         }
         return rawVersion
     }

src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy

@@ -15,7 +15,11 @@ class VersionFactory {
                 version = Version.valueOf(initialVersion(config.tag, context.position))
             } else {
                 version = Version.valueOf(readVersionFromPosition(context, config))
-                if (!context.position.onTag && !context.nextVersionTag) {
+                
+                boolean hasUncommitedChanges = !options.ignoreUncommittedChanges && context.position.hasUncommittedChanges
+                boolean hasChanges = !context.position.onTag || hasUncommitedChanges
+                
+                if (hasChanges && !context.nextVersionTag) {
                     version = config.versionIncrementer(new VersionIncrementerContext(version, context.position))
                 }
             }

src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionFactory.groovy

@@ -6,21 +6,27 @@ class VersionReadOptions {
 
     private static final String FORCE_VERSION_PROPERTY = 'release.forceVersion'
 
+    private static final String IGNORE_UNCOMMITTED_CHANGES_PROPERTY = 'release.ignoreUncommittedChanges'
+    
     final boolean forceVersion
 
     final String forcedVersion
+    
+    final boolean ignoreUncommittedChanges
 
-    VersionReadOptions(String forcedVersion) {
+    VersionReadOptions(String forcedVersion, ignoreUncommittedChanges) {
         this.forceVersion = forcedVersion != null
         this.forcedVersion = forcedVersion
+        this.ignoreUncommittedChanges = ignoreUncommittedChanges
     }
 
-    static VersionReadOptions fromProject(Project project) {
+    static VersionReadOptions fromProject(Project project, VersionConfig config) {
         String forceVersionValue = project.hasProperty(FORCE_VERSION_PROPERTY) ? project.property(FORCE_VERSION_PROPERTY) : null
-        return new VersionReadOptions(forceVersionValue?.trim() ? forceVersionValue.trim() : null)
+        boolean ignoreUncommittedChanges = project.hasProperty(IGNORE_UNCOMMITTED_CHANGES_PROPERTY) ?: config.ignoreUncommittedChanges
+        return new VersionReadOptions(forceVersionValue?.trim() ? forceVersionValue.trim() : null, ignoreUncommittedChanges)
     }
 
     static VersionReadOptions defaultOptions() {
-        return new VersionReadOptions(null)
+        return new VersionReadOptions(null, true)
     }
 }

src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionReadOptions.groovy

@@ -19,7 +19,7 @@ class VersionService {
     VersionWithPosition currentVersion(VersionConfig versionConfig, VersionReadOptions options) {
         VersionWithPosition positionedVersion = versionResolver.resolveVersion(versionConfig, options)
 
-        if (!positionedVersion.position.onTag) {
+        if(isSnapshotVersion(positionedVersion, options)) {
             positionedVersion.asSnapshotVersion()
         }
 
@@ -34,10 +34,15 @@ class VersionService {
             version = sanitizer.sanitize(version)
         }
 
-        if (!positionedVersion.position.onTag) {
+        if(isSnapshotVersion(positionedVersion, options)) {
             version = version + '-' + SNAPSHOT
         }
 
         return version
     }
+    
+    private boolean isSnapshotVersion(VersionWithPosition positionedVersion, VersionReadOptions options) {
+        boolean hasUncommittedChanges = !options.ignoreUncommittedChanges && positionedVersion.position.hasUncommittedChanges
+        return !positionedVersion.position.onTag || hasUncommittedChanges
+    }
 }

src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionService.groovy

@@ -15,7 +15,7 @@ class HookContext {
 
     final String previousVersion
 
-    final String currentVersion
+    private String currentVersion
 
     final List<String> patternsToCommit = []
 
@@ -28,6 +28,14 @@ class HookContext {
         this.currentVersion = currentVersion.toString()
     }
 
+    String getCurrentVersion() {
+        return currentVersion
+    }
+    
+    void updateVersion(Version currentVersion) {
+       this.currentVersion = currentVersion.toString() 
+    }
+    
     void commit(List patterns, String message) {
         scmService.commit(patterns, message)
     }
@@ -39,4 +47,8 @@ class HookContext {
     void addCommitPattern(Collection patterns) {
         patternsToCommit.addAll(patterns)
     }
+
+    void push() {
+        scmService.push()
+    }
 }

src/main/groovy/pl/allegro/tech/build/axion/release/domain/hooks/HookContext.groovy

@@ -4,7 +4,8 @@ enum PredefinedReleaseHookAction {
 
     DEFAULT('default', new SimpleReleaseHookAction.Factory()),
     FILE_UPDATE('fileUpdate', new FileUpdateHookAction.Factory()),
-    COMMIT('commit', new CommitHookAction.Factory());
+    COMMIT('commit', new CommitHookAction.Factory()),
+    PUSH('push', new PushHookAction.Factory());
 
     private final String type
 

src/main/groovy/pl/allegro/tech/build/axion/release/domain/hooks/PredefinedReleaseHookAction.groovy

@@ -0,0 +1,22 @@
+package pl.allegro.tech.build.axion.release.domain.hooks
+
+class PushHookAction implements ReleaseHookAction {
+
+    @Override
+    void act(HookContext hookContext) {
+        hookContext.push()
+    }
+
+    static final class Factory extends DefaultReleaseHookFactory {
+
+        @Override
+        ReleaseHookAction create() {
+            return new PushHookAction()
+        }
+
+        @Override
+        ReleaseHookAction create(Closure customAction) {
+            return create()
+        }
+    }
+}

src/main/groovy/pl/allegro/tech/build/axion/release/domain/hooks/PushHookAction.groovy

@@ -7,31 +7,34 @@ class ScmPosition {
     final String latestTag
 
     final boolean onTag
+    
+    final boolean hasUncommittedChanges
 
-    ScmPosition(String branch, String latestTag, boolean onTag) {
+    ScmPosition(String branch, String latestTag, boolean onTag, boolean hasUncommittedChanges = false) {
         this.branch = branch
         this.latestTag = latestTag
         this.onTag = onTag
+        this.hasUncommittedChanges = hasUncommittedChanges
     }
 
     static ScmPosition defaultPosition() {
-        return new ScmPosition('master', null, false)
+        return new ScmPosition('master', null, false, false)
     }
 
     static ScmPosition onTag(String tagName) {
-        return new ScmPosition('master', tagName, true)
+        return new ScmPosition('master', tagName, true, false)
     }
 
     boolean tagless() {
         return latestTag == null
     }
 
     ScmPosition asOnTagPosition() {
-        return new ScmPosition(branch, latestTag, latestTag != null)
+        return new ScmPosition(branch, latestTag, latestTag != null, hasUncommittedChanges)
     }
 
     ScmPosition asNotOnTagPosition() {
-        return new ScmPosition(branch, latestTag, false)
+        return new ScmPosition(branch, latestTag, false, hasUncommittedChanges)
     }
 
     @Override

src/main/groovy/pl/allegro/tech/build/axion/release/domain/scm/ScmPosition.groovy

@@ -180,7 +180,7 @@ class GitRepository implements ScmRepository {
         walk.dispose()
 
         boolean onTag = (commit == null) ? null : commit.id.name() == headId.name()
-        return new ScmPosition(branch, tagName, onTag)
+        return new ScmPosition(branch, tagName, onTag, checkUncommittedChanges())
     }
 
     private boolean hasCommits() {