Adding hasIssue hasLink to readme doc #7

tomasbjerre · Nov 18, 2015 · fbb4559 · fbb4559
1 parent 5a857a9
commit fbb4559
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,25 @@ Changelog of Git Changelog.
 ## Next release
 ### Github [#7](https://github.com/tomasbjerre/git-changelog-lib/issues/7)
 
+[91bf70d3f2a90f7](https://github.com/tomasbjerre/git-changelog-lib/commit/91bf70d3f2a90f7) Tomas Bjerre *2015-11-18 19:21:41*
+
+Adding hasIssue hasLink to readme doc
+
+
+## 1.3
+### Github [#7](https://github.com/tomasbjerre/git-changelog-lib/issues/7)
+
 [210e963a07b8a7b](https://github.com/tomasbjerre/git-changelog-lib/commit/210e963a07b8a7b) Tomas Bjerre *2015-11-18 19:06:00*
 
 Adding booleans to check if link and/or issue exists in issue
 
 
 ### Other changes
 
+[467d126c87b734e](https://github.com/tomasbjerre/git-changelog-lib/commit/467d126c87b734e) Tomas Bjerre *2015-11-18 19:17:48*
+
+Adding new mediawiki screenshot
+
 [49afd799253a777](https://github.com/tomasbjerre/git-changelog-lib/commit/49afd799253a777) Tomas Bjerre *2015-11-18 06:55:50*
 
 Update README.md

diff --git a/README.md b/README.md
@@ -178,7 +178,9 @@ The template is supplied with a datastructure like:
    - commitTime
  * issues
   - name
+  - hasIssue
   - issue
+  - hasLink
   - link
   * commits
    - authorName
@@ -203,8 +205,10 @@ The template is supplied with a datastructure like:
   - commitTime
 * issues
  - name
- - issue
- - link
+  - hasIssue
+  - issue
+  - hasLink
+  - link
  * commits
   - authorName
   - authorEmailAddress

diff --git a/changelog.json b/changelog.json
@@ -14,8 +14,6 @@
  "jiraServer": "https://jiraserver/jira",
  "jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",
 
- "jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",
-
  "customIssues": [
   {"name": "Github", "pattern": "#([0-9]+)", "link": "https://github.com/tomasbjerre/git-changelog-lib/issues/${PATTERN_GROUP_1}" }
  ]

diff --git a/src/test/java/se/bjurr/gitchangelog/api/FakeRepo.java b/src/test/java/se/bjurr/gitchangelog/api/FakeRepo.java
@@ -50,7 +50,7 @@ public static FakeGitRepo fakeRepo() {
       new GitCommit("Tomas B", "tomas.b@example", new Date(DAY_ZERO + TIME_DAY * 9), "Adding stuff JIR-1234", hashes
         .get(8)))
     .withCommit(
-      new GitCommit("T B", "tomas.b@example", new Date(DAY_ZERO + TIME_DAY * 10), "More stuff", hashes.get(9)));
+      new GitCommit("T B", "tomas.b@example", new Date(DAY_ZERO + TIME_DAY * 10), "More stuff #bug", hashes.get(9)));
 
   fakeGitRepo.withTag(new GitTag("1.0", fakeGitRepo.getDiff(fromString(ZERO_COMMIT), fromString(hashes.get(5)))));
 

diff --git a/src/test/resources/assertions/testIssuesAuthorsCommits.md b/src/test/resources/assertions/testIssuesAuthorsCommits.md
@@ -2,6 +2,12 @@
 
 Changelog of Git Changelog.
 
+## Bugs
+### T B
+1970-01-11 00:00:00
+More stuff
+
+
 ## Github [#12](https://github.com/tomasbjerre/git-releasenotes-plugin/issues/12)
 ### Tomas B
 1970-01-06 00:00:00
@@ -33,17 +39,6 @@ Adding stuff
 
 
 ## No issue supplied
-### T B
-1970-01-11 00:00:00
-More stuff
-
-1970-01-07 00:00:00
-This is 1.0 tagged commit
-
-1970-01-05 00:00:00
-Adding stuff
-
-
 ### Tomas B
 1970-01-08 00:00:00
 Adding stuff
@@ -52,6 +47,14 @@ Adding stuff
 Adding stuff
 
 
+### T B
+1970-01-07 00:00:00
+This is 1.0 tagged commit
+
+1970-01-05 00:00:00
+Adding stuff
+
+
 ### authorName
 1970-01-01 00:00:00
 First commit!
diff --git a/src/test/resources/assertions/testIssuesCommits.md b/src/test/resources/assertions/testIssuesCommits.md
@@ -2,6 +2,10 @@
 
 Changelog of Git Changelog.
 
+## Bugs #bug
+### T B - 1970-01-11 00:00:00
+More stuff
+
 ## Github #12
 ### Tomas B - 1970-01-06 00:00:00
 Adding stuff
@@ -23,9 +27,6 @@ Adding stuff
 Adding stuff
 
 ## No issue supplied 
-### T B - 1970-01-11 00:00:00
-More stuff
-
 ### Tomas B - 1970-01-08 00:00:00
 Adding stuff
 

diff --git a/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md b/src/test/resources/assertions/testTagsIssuesAuthorsCommits.md
@@ -3,6 +3,12 @@
 Changelog of Git Changelog.
 
 ## No tag
+### Bugs #bug
+* T B
+1970-01-11 00:00:00
+More stuff
+
+
 ### Github #30
 * T B
 1970-01-09 00:00:00
@@ -16,11 +22,6 @@ Adding stuff
 
 
 ### No issue supplied 
-* T B
-1970-01-11 00:00:00
-More stuff
-
-
 * Tomas B
 1970-01-08 00:00:00
 Adding stuff

diff --git a/src/test/resources/assertions/testTagsIssuesCommits.md b/src/test/resources/assertions/testTagsIssuesCommits.md
@@ -3,6 +3,10 @@
 Changelog of Git Changelog.
 
 ## No tag
+### Bugs #bug
+1970-01-11 00:00:00
+More stuff
+
 ### Github #30
 1970-01-09 00:00:00
 Adding stuff
@@ -12,9 +16,6 @@ Adding stuff
 Adding stuff
 
 ### No issue supplied 
-1970-01-11 00:00:00
-More stuff
-
 1970-01-08 00:00:00
 Adding stuff
 

diff --git a/src/test/resources/assertions/testThatIssuesCanBeRemoved.md b/src/test/resources/assertions/testThatIssuesCanBeRemoved.md
@@ -2,6 +2,10 @@
 
 Changelog of Git Changelog.
 
+## Bugs #bug
+### T B - 1970-01-11 00:00:00
+More stuff
+
 ## Github #12
 ### Tomas B - 1970-01-06 00:00:00
 Adding stuff
@@ -23,9 +27,6 @@ Adding stuff
 Adding stuff
 
 ## No issue supplied 
-### T B - 1970-01-11 00:00:00
-More stuff
-
 ### Tomas B - 1970-01-08 00:00:00
 Adding stuff
 

diff --git a/src/test/resources/settings/git-changelog-test-settings.json b/src/test/resources/settings/git-changelog-test-settings.json
@@ -18,6 +18,7 @@
  "jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",
 
  "customIssues": [
-  {"name": "Github", "pattern": "#([0-9]+)", "link": "https://github.com/tomasbjerre/git-releasenotes-plugin/issues/${PATTERN_GROUP_1}" }
+  {"name": "Github", "pattern": "#([0-9]+)", "link": "https://github.com/tomasbjerre/git-releasenotes-plugin/issues/${PATTERN_GROUP_1}" },
+  { "name": "Bugs", "pattern": "#bug" }
  ]
 }
diff --git a/src/test/resources/templates/testIssuesAuthorsCommits.mustache b/src/test/resources/templates/testIssuesAuthorsCommits.mustache
@@ -3,12 +3,12 @@
 Changelog of Git Changelog.
 
 {{#issues}}
-{{#hasIssue}}
+{{#hasLink}}
 ## {{name}} [{{issue}}]({{link}})
-{{/hasIssue}}
-{{^hasIssue}}
+{{/hasLink}}
+{{^hasLink}}
 ## {{name}}
-{{/hasIssue}}
+{{/hasLink}}
   {{#authors}}
 ### {{authorName}}
    {{#commits}}