Merge branch 'feature/renameProperty'

CHANGELOG

@@ -2,6 +2,7 @@ CHANGELOG
 
 Future Version
 =======
+-Breaking: FlexVersion object property 'tag' renamed to 'isTag'
 -Breaking: Since symlink support was added (jgit is fun), this will no longer work with Java 6
 
 0.5.0

README.md

@@ -133,7 +133,7 @@ class FlexVersion {
 	String gitHash // The git hash truncated to 12 characters
 	int commitCount // The number of commits in HEAD's history
 	boolean dirty // Is the dirty bit set?
-	boolean tag // Is the domain from a tag?
+	boolean isTag // Is the domain from a tag?
 	String toString() // The fully filled in version that Gradle would use
 }
 ```

src/main/groovy/com/palantir/gradle/versions/flexversioning/FlexVersion.groovy

@@ -26,14 +26,14 @@ class FlexVersion {
     final int commitCount;
 
     final boolean dirty;
-    final boolean tag;
+    final boolean isTag;
 
 
-    public FlexVersion (String domain, int commitCount, String gitHash, boolean tag, boolean dirty) {
+    public FlexVersion (String domain, int commitCount, String gitHash, boolean isTag, boolean dirty) {
         this.domain = domain;
         this.commitCount = commitCount;
         this.gitHash = gitHash;
-        this.tag = tag;
+        this.isTag = isTag;
         this.dirty = dirty;
 
         if (this.gitHash.length() > 12) {
@@ -44,7 +44,7 @@ class FlexVersion {
 
     public String toString() {
         String version = null;
-        if (this.tag) {
+        if (this.isTag) {
             version = "${this.domain}";
         } else {
             version = "${this.domain}-${this.commitCount}-g${this.gitHash}";

src/test/groovy/com/palantir/gradle/versions/flexversioning/FlexVersionTests.groovy

@@ -131,7 +131,7 @@ class FlexVersionTests {
         assert version.domain == "objecttest"
         assert version.commitCount == commits
         assert version.gitHash == headShaShort
-        assert version.tag == false
+        assert version.isTag == false
         assert version.toString() == "objecttest-${commits}-g${headShaShort}"
     }
 
@@ -142,7 +142,7 @@ class FlexVersionTests {
         assert version.domain == HEAD_TAG_NAME
         assert version.commitCount == commits
         assert version.gitHash == headShaShort
-        assert version.tag == true
+        assert version.isTag == true
         assert version.toString() == HEAD_TAG_NAME
     }
 }