intuit · hipstersmoothie · May 22, 2020 · May 22, 2020 · May 22, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -99,7 +99,7 @@ Thank you, G. Richard Bellamy ([@rbellamy](https://github.com/rbellamy)), for al
 #### 🚀 Enhancement
 
 - `@auto-it/core`, `@auto-it/gem`, `@auto-it/git-tag`
-  - 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+  - 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🔩 Dependency Updates
 
@@ -323,7 +323,7 @@ Thank you, Till Weisser ([@whynotzoidberg](https://github.com/whynotzoidberg)),
 
 # v9.30.1 (Wed Apr 22 2020)
 
-#### ⚠️  Pushed to `master`
+#### ⚠️ Pushed to `master`
 
 - add missing root devdep ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
@@ -1159,7 +1159,7 @@ Here is an example of a super light weight version of the `npm` and `gh-pages` p
 
 # v9.16.6 (Thu Mar 05 2020)
 
-#### ⚠️  Pushed to `master`
+#### ⚠️ Pushed to `master`
 
 - `@auto-it/core`
   - add dep for parse-github-url ([@hipstersmoothie](https://github.com/hipstersmoothie))
@@ -1172,7 +1172,7 @@ Here is an example of a super light weight version of the `npm` and `gh-pages` p
 
 # v9.16.5 (Thu Mar 05 2020)
 
-#### ⚠️  Pushed to `master`
+#### ⚠️ Pushed to `master`
 
 - `@auto-it/core`
   - add bot-list dep to core ([@hipstersmoothie](https://github.com/hipstersmoothie))
@@ -1211,7 +1211,7 @@ Here is an example of a super light weight version of the `npm` and `gh-pages` p
 
 # v9.16.2 (Thu Mar 05 2020)
 
-#### 🐛  Bug Fix
+#### 🐛 Bug Fix
 
 - `@auto-it/bot-list`, `@auto-it/core`, `@auto-it/all-contributors`
   - move botlist to package and use it in release notes exclusion [#1027](https://github.com/intuit/auto/pull/1027) ([@hipstersmoothie](https://github.com/hipstersmoothie))
@@ -1224,7 +1224,7 @@ Here is an example of a super light weight version of the `npm` and `gh-pages` p
 
 # v9.16.1 (Thu Mar 05 2020)
 
-#### 🐛  Bug Fix
+#### 🐛 Bug Fix
 
 - `@auto-it/npm`
   - npm: respect subPackageChangelogs false [#1025](https://github.com/intuit/auto/pull/1025) ([@hipstersmoothie](https://github.com/hipstersmoothie))
@@ -4005,7 +4005,7 @@ auto.hooks.onCreateChangelog.tapPromise('Giphy', changelog =>
 
 ```js
 auto.hooks.afterRelease.tap(
-  'MyPlugin',
+  "MyPlugin",
   async (version, commits, releaseNotes) => {
     // do something
   }

diff --git a/packages/bot-list/CHANGELOG.md b/packages/bot-list/CHANGELOG.md
@@ -136,4 +136,4 @@ Thank you, Till Weisser ([@whynotzoidberg](https://github.com/whynotzoidberg)),
 
 #### Authors: 1
 
-- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -31,7 +31,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/packages/core/src/__tests__/__snapshots__/changelog.test.ts.snap b/packages/core/src/__tests__/__snapshots__/changelog.test.ts.snap
@@ -76,7 +76,7 @@ exports[`generateReleaseNotes should add "Push to Next" 1`] = `
 
 - First Feature [#1235](https://github.custom.com/foobar/auto/pull/1235) (adam@dierkens.com)
 
-#### ⚠️  Pushed to \`next\`
+#### ⚠️ Pushed to \`next\`
 
 - I was a push to master (adam@dierkens.com)
 
@@ -183,7 +183,7 @@ exports[`generateReleaseNotes should include PR-less commits as patches 1`] = `
 
 - First Feature [#1235](https://github.custom.com/foobar/auto/pull/1235) (adam@dierkens.com)
 
-#### ⚠️  Pushed to \`master\`
+#### ⚠️ Pushed to \`master\`
 
 - I was a push to master (adam@dierkens.com)
 

diff --git a/packages/core/src/__tests__/__snapshots__/log-parse.test.ts.snap b/packages/core/src/__tests__/__snapshots__/log-parse.test.ts.snap
@@ -49,3 +49,38 @@ Array [
   },
 ]
 `;
+
+exports[`normalizeCommits should strip whitespace in subject 1`] = `
+Array [
+  Object {
+    "authorEmail": "adam@dierkens.com",
+    "authorName": "Adam Dierkens",
+    "authors": Array [
+      Object {
+        "email": "adam@dierkens.com",
+        "name": "Adam Dierkens",
+      },
+    ],
+    "files": Array [],
+    "hash": "foo",
+    "labels": Array [],
+    "pullRequest": undefined,
+    "subject": "First PR",
+  },
+  Object {
+    "authorEmail": "adam@dierkens.com",
+    "authorName": "Adam Dierkens",
+    "authors": Array [
+      Object {
+        "email": "adam@dierkens.com",
+        "name": "Adam Dierkens",
+      },
+    ],
+    "files": Array [],
+    "hash": "foo",
+    "labels": Array [],
+    "pullRequest": undefined,
+    "subject": "Second PR",
+  },
+]
+`;
diff --git a/packages/core/src/__tests__/__snapshots__/release.test.ts.snap b/packages/core/src/__tests__/__snapshots__/release.test.ts.snap
@@ -27,7 +27,7 @@ exports[`Release generateReleaseNotes should detect pre-release branches 1`] = `
 
 - Autobots roll out! (adam@dierkens.com)
 
-#### ⚠️  Pushed to \`next\`
+#### ⚠️ Pushed to \`next\`
 
 - Doom Patrol enabled (adam@dierkens.com)
 
@@ -76,7 +76,7 @@ exports[`Release generateReleaseNotes should include PR-less commits 1`] = `
 
 - First Feature [#1235](https://github.com/web/site/pull/1235) (adam@dierkens.com)
 
-#### ⚠️  Pushed to \`master\`
+#### ⚠️ Pushed to \`master\`
 
 - I should be included (adam@dierkens.com)
 
@@ -116,7 +116,7 @@ exports[`Release generateReleaseNotes should match rebased commits to PRs 1`] =
 - Feature [#124](https://github.com/web/site/pull/124) (adam@dierkens.com)
 - I was rebased [#123](https://github.com/web/site/pull/123) (adam@dierkens.com)
 
-#### ⚠️  Pushed to \`master\`
+#### ⚠️ Pushed to \`master\`
 
 - I am a commit to master (adam@dierkens.com)
 

diff --git a/packages/core/src/__tests__/log-parse.test.ts b/packages/core/src/__tests__/log-parse.test.ts
@@ -53,4 +53,14 @@ describe("normalizeCommits", () => {
 
     expect(await logParse.normalizeCommits(commits)).toMatchSnapshot();
   });
+
+  test("should strip whitespace in subject", async () => {
+    const logParse = new LogParse();
+    const commits = [
+      makeCommitFromMsg("First                     PR"),
+      makeCommitFromMsg("Second\t PR"),
+    ];
+
+    expect(await logParse.normalizeCommits(commits)).toMatchSnapshot();
+  });
 });
diff --git a/packages/core/src/changelog.ts b/packages/core/src/changelog.ts
@@ -99,7 +99,7 @@ export default class Changelog {
         ...this.options.labels,
         {
           name: "pushToBaseBranch",
-          changelogTitle: `⚠️  Pushed to \`${branch}\``,
+          changelogTitle: `⚠️ Pushed to \`${branch}\``,
           description: "N/A",
           releaseType: SEMVER.patch,
         },

diff --git a/packages/core/src/log-parse.ts b/packages/core/src/log-parse.ts
@@ -126,6 +126,19 @@ export default class LogParse {
 
     this.hooks.parseCommit.tap("Merge Commit", parsePR);
     this.hooks.parseCommit.tap("Squash Merge Commit", parseSquashPR);
+    this.hooks.parseCommit.tap(
+      "Strip consecutive white-space in Titles",
+      (commit) => {
+        const [firstLine, ...lines] = commit.subject.split("\n");
+
+        commit.subject = [
+          firstLine.replace(/[^\S\r\n]{2,}/g, " "),
+          ...lines,
+        ].join("\n");
+
+        return commit;
+      }
+    );
   }
 
   /** Run the log parser over a set of commits */

diff --git a/packages/core/src/release.ts b/packages/core/src/release.ts
@@ -317,6 +317,8 @@ export default class Release {
       this.logger.verbose.info("Old changelog exists, prepending changes.");
       const oldChangelog = await readFile(changelogPath, "utf8");
       newChangelog = `${newChangelog}\n\n---\n\n${oldChangelog}`;
+    } else {
+      newChangelog += "\n";
     }
 
     await writeFile(changelogPath, newChangelog);

diff --git a/plugins/all-contributors/CHANGELOG.md b/plugins/all-contributors/CHANGELOG.md
@@ -23,7 +23,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/brew/CHANGELOG.md b/plugins/brew/CHANGELOG.md
@@ -174,4 +174,4 @@ Thank you, Till Weisser ([@whynotzoidberg](https://github.com/whynotzoidberg)),
 
 #### Authors: 1
 
-- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
diff --git a/plugins/first-time-contributor/CHANGELOG.md b/plugins/first-time-contributor/CHANGELOG.md
@@ -23,7 +23,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/gem/CHANGELOG.md b/plugins/gem/CHANGELOG.md
@@ -23,7 +23,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 
@@ -37,4 +37,4 @@
 
 #### Authors: 1
 
-- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
diff --git a/plugins/git-tag/CHANGELOG.md b/plugins/git-tag/CHANGELOG.md
@@ -23,7 +23,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/npm/CHANGELOG.md b/plugins/npm/CHANGELOG.md
@@ -36,7 +36,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/released/CHANGELOG.md b/plugins/released/CHANGELOG.md
@@ -36,7 +36,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/slack/CHANGELOG.md b/plugins/slack/CHANGELOG.md
@@ -36,7 +36,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
 

diff --git a/plugins/upload-assets/CHANGELOG.md b/plugins/upload-assets/CHANGELOG.md
@@ -36,7 +36,7 @@
 
 #### 🚀 Enhancement
 
-- 💎 Ruby Gem  Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
+- 💎 Ruby Gem Plugin [#1217](https://github.com/intuit/auto/pull/1217) ([@hipstersmoothie](https://github.com/hipstersmoothie))
 
 #### 🐛 Bug Fix
Original file line number	Diff line number	Diff line change
Expand Up		@@ -136,4 +136,4 @@ Thank you, Till Weisser ([@whynotzoidberg](https://github.com/whynotzoidberg)),

		#### Authors: 1

		- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
		- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -174,4 +174,4 @@ Thank you, Till Weisser ([@whynotzoidberg](https://github.com/whynotzoidberg)),

		#### Authors: 1

		- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
		- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))