fix: a few minor tweaks to ruby template (googleapis#225)

Author: Benjamin E. Coe

__snapshots__/indent-commit.js

@@ -4,7 +4,7 @@ feat: my awesome commit message
   * testing second line
 `
 
-exports['indentCommit ignores empty lines 1'] = `
+exports['indentCommit only adds lines prefixed with * to CHANGELOG 1'] = `
 feat: my awesome commit message
   * testing one line
   * testing second line

src/release-pr.ts

@@ -181,7 +181,7 @@ export class ReleasePR {
     includePackageName = false
   ) {
     const title = includePackageName
-      ? `chore: release ${this.packageName}@${version}`
+      ? `Release ${this.packageName} ${version}`
       : `chore: release ${version}`;
     const body = `:robot: I have created a release \\*beep\\* \\*boop\\* \n---\n${changelogEntry}\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please).`;
     const pr: number = await this.gh.openPR({

src/util/indent-commit.ts

@@ -19,9 +19,11 @@ import { Commit } from '../graphql-to-commits';
 export function indentCommit(commit: Commit): string {
   const reduced: string[] = [];
   commit.message.split(/\r?\n/).forEach((line, i) => {
-    if (line.trim() === '') return;
     if (i !== 0) line = `  ${line}`;
-    reduced.push(line);
+    // to show up in CHANGELOG lines must start with '*'.
+    if (/^\s*\*/.test(line) || i === 0) {
+      reduced.push(line);
+    }
   });
   return reduced.join('\n');
 }

templates/commit.hbs

@@ -1,2 +1,2 @@
-* {{#if subject}} {{~subject}} {{~else}} {{~header}} {{~/if}}
-{{#if body}}{{body}}{{~/if}}
+* {{#if subject}} {{~subject}} {{~else}} {{~header}} {{~/if}}{{#if body}}
+{{body}}{{~/if}}

templates/template.hbs

@@ -16,6 +16,4 @@
 
 {{/if}}
 {{#each commits}}
-{{> commit root=@root}}{{/each}}
-
-{{/each}}
+{{> commit root=@root}}{{/each}}{{/each}}

test/util/indent-commit.ts

@@ -31,13 +31,15 @@ describe('indentCommit', () => {
     );
   });
 
-  it('ignores empty lines', () => {
+  it('only adds lines prefixed with * to CHANGELOG', () => {
     snapshot(
       indentCommit({
         message: `feat: my awesome commit message
+
 * testing one line
+* testing second line
 
-* testing second line`,
+[Fixes #32]`,
         sha: 'abc123',
         files: [],
       })