Merge pull request #3 from pinanks/DOT-883

Author: pinanks

commands/utils/dom.js

@@ -4,6 +4,7 @@ const path = require('path')
 const formData = require('form-data');
 const { JSDOM } = require("jsdom");
 var { constants } = require('./constants');
+const { getLastCommit } = require('./git')
 
 async function sendDoM(storybookUrl, stories, storybookConfig, options) {
     const createBrowser = require('browserless')
@@ -38,16 +39,23 @@ async function sendDoM(storybookUrl, stories, storybookConfig, options) {
     }
     await browser.close()
 
-    // Send html files to the renderer API
+    // Create form
+    let commit = await getLastCommit();
     const form = new formData();
     for (const [storyId, storyInfo] of Object.entries(stories)) {
         const file = fs.readFileSync('doms/' + storyId + '.html');
-        form.append('html', file, storyInfo.kind + ': ' + storyInfo.name + '.html');
+        form.append('files', file, storyInfo.kind + ': ' + storyInfo.name + '.html');
     }
     form.append('resolution', storybookConfig.resolutions);
     form.append('browser', storybookConfig.browsers);
     form.append('projectToken', process.env.PROJECT_TOKEN);
     form.append('buildName', options.buildname);
+    form.append('branch', commit.branch);
+    form.append('commitId', commit.shortHash);
+    form.append('commitAuthor', commit.author.name);
+    form.append('commitMessage', commit.subject);
+
+    // Send DOM to render API
     axios.post(constants[options.env].RENDER_API_URL, form, {
         headers: {
             ...form.getHeaders()

commands/utils/git.js

@@ -0,0 +1,58 @@
+const cp = require('child_process');
+
+function executeCommand(command, options) {
+	let dst = process.cwd()
+
+  	if(!!options && options.dst) {
+    	dst = options.dst
+  	}
+
+	try {
+		return cp.execSync(command, {
+			cwd: dst,
+			stdio: ['ignore', 'pipe', 'ignore'],
+			encoding: 'utf-8'
+		});
+	} catch (error) {
+		return '';
+	}
+}  
+
+async function getLastCommit(options) {
+	const splitCharacter = '<##>';
+	const prettyFormat = ["%h", "%H", "%s", "%f", "%b", "%at", "%ct", "%an", "%ae", "%cn", "%ce", "%N", ""];
+	const command = 'git log -1 --pretty=format:"' + prettyFormat.join(splitCharacter) + '"' +
+		' && git rev-parse --abbrev-ref HEAD' +
+		' && git tag --contains HEAD'
+
+  	res = executeCommand(command, options);
+	res = res.split(splitCharacter);
+
+	// e.g. master\n or master\nv1.1\n or master\nv1.1\nv1.2\n
+	var branchAndTags = res[res.length-1].split('\n').filter(n => n);
+	var branch = branchAndTags[0];
+	var tags = branchAndTags.slice(1);
+
+ 	return {
+		shortHash: res[0] || '',
+		hash: res[1] || '',
+		subject: res[2] || '',
+		sanitizedSubject: res[3] || '',
+		body: res[4] || '',
+		authoredOn: res[5] || '',
+		committedOn: res[6] || '',
+		author: {
+			name: res[7] || '',
+			email: res[8] || '',
+		},
+		committer: {
+			name: res[9] || '',
+			email: res[10] || ''
+		},
+		notes: res[11] || '',
+		branch: branch || '',
+		tags: tags || []
+    };
+}
+
+module.exports = { getLastCommit }

index.js

@@ -25,7 +25,6 @@ configCommand.command('create')
 program.command('storybook')
     .description('Snapshot Storybook stories')
     .argument('<url>', 'Storybook url')
-    .requiredOption('--buildname <string>', 'Build name')
     .option('-c --config <file>', 'Config file path')
     // .option('--env <prod|stage>', 'Runtime environment option', 'prod')
     .action(async function(url, options) {