bananareporter 0.4.2 → 0.4.4

package/README.md

@@ -103,7 +103,7 @@ $ npm install -g bananareporter
 $ bananareporter COMMAND
 running command...
 $ bananareporter (--version)
-bananareporter/0.4.2 linux-x64 node-v18.16.0
+bananareporter/0.4.4 linux-x64 node-v18.16.0
 $ bananareporter --help [COMMAND]
 USAGE
   $ bananareporter COMMAND
@@ -162,5 +162,5 @@ EXAMPLES
   report with 138 entries saved to ./bananareporter.json
 ```
 
-_See code: [dist/commands/run/index.ts](https://github.com/nya1/bananareporter/blob/v0.4.2/dist/commands/run/index.ts)_
+_See code: [dist/commands/run/index.ts](https://github.com/nya1/bananareporter/blob/v0.4.4/dist/commands/run/index.ts)_
 <!-- commandsstop -->

package/dist/integrations/git-cli.js

@@ -51,15 +51,31 @@ class GitCliIntegration extends base_1.IntegrationBase {
         // extract project name from directory
         const directory = path.basename(this.config.path);
         // execute git log
-        const gitLogCommand = shell.exec(`git -C ${this.config.path} --no-pager log --branches="*" --author="${this.config.authorUsername}" --reverse --no-merges --source --format='{"commit": "%H","author": "%an","dateUnix": %at,"commitMessage": "%s","branch": "%S"},' --after="${fromDate.toISOString()}" --before="${toDate.toISOString()}"`, {
+        const gitLogCommand = shell.exec(`git -C ${this.config.path} --no-pager log --branches="*" --author="${this.config.authorUsername
+        // hash - author - date unix - commit message - branch
+        }" --reverse --no-merges --source --format='%H~~~~~%an~~~~~%at~~~~~%s~~~~~%S>%n%n' --after="${fromDate.toISOString()}" --before="${toDate.toISOString()}"`, {
             silent: true,
         });
         if (gitLogCommand.code !== 0) {
             throw new Error(`unable to execute git log to ${this.config.path}, output: ${gitLogCommand.stderr}`);
         }
-        const parsedOutput = (gitLogCommand === null || gitLogCommand === void 0 ? void 0 : gitLogCommand.stdout) ? `[${gitLogCommand.stdout.slice(0, -2)}]` : '[]';
-        logger_1.logger.debug('git log parsed output', { parsedOutput });
-        const gitLogJson = JSON.parse(parsedOutput);
+        const gitLogJson = [];
+        if (gitLogCommand.stdout) {
+            for (const line of gitLogCommand.stdout.split('>\n\n')) {
+                const splitGit = line.split('~~~~~');
+                logger_1.logger.debug('git log', { splitGit });
+                if (splitGit.length !== 5) {
+                    continue;
+                }
+                gitLogJson.push({
+                    commit: splitGit[0].replace(/\n/g, ''),
+                    author: splitGit[1],
+                    dateUnix: Number(splitGit[2]),
+                    commitMessage: splitGit[3],
+                    branch: splitGit[4],
+                });
+            }
+        }
         return gitLogJson.map((e, i) => {
             // add project name
             e.projectName = directory;
@@ -67,10 +83,11 @@ class GitCliIntegration extends base_1.IntegrationBase {
         });
     }
     toBananaReporterObj(rawData, _index) {
+        const description = `${rawData.commitMessage} branch:${rawData.branch} git:${rawData.commit.slice(0, 7)}`;
         return {
             id: rawData.commit,
             date: dayjs.unix(rawData.dateUnix).toISOString(),
-            description: rawData.commitMessage,
+            description: description,
             projectName: rawData.projectName,
             type: GitCliIntegration.type,
             __raw: this.bananaReporterConfig.includeRawObject ? rawData : undefined,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.4.2",
+  "version": "0.4.4",
   "commands": {
     "run": {
       "id": "run",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bananareporter",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Easily generate a report from multiple sources",
   "author": "nya1",
   "bin": {