Address feedback

Author: devversion

tools/gulp/tasks/publish.ts

@@ -25,6 +25,7 @@ const argv = minimist(process.argv.slice(3));
 task('publish', sequenceTask(
   ':publish:whoami',
   ':publish:build-releases',
+  'validate-release:check-remote-tag',
   'validate-release:check-bundles',
   ':publish',
   ':publish:logout',

tools/gulp/tasks/validate-release.ts

@@ -4,10 +4,16 @@ import {join} from 'path';
 import {green, red} from 'chalk';
 import {releasePackages} from './publish';
 import {sync as glob} from 'glob';
+import {spawnSync} from 'child_process';
 import {buildConfig, sequenceTask} from 'material2-build-tools';
 
+const {projectDir, projectVersion, outputDir} = buildConfig;
+
+/** Git repository URL that has been read out from the package.json file. */
+const repositoryGitUrl = require('../../../package.json').repository.url;
+
 /** Path to the directory where all releases are created. */
-const releasesDir = join(buildConfig.outputDir, 'releases');
+const releasesDir = join(outputDir, 'releases');
 
 /** RegExp that matches Angular component inline styles that contain a sourcemap reference. */
 const inlineStylesSourcemapRegex = /styles: ?\[["'].*sourceMappingURL=.*["']/;
@@ -17,6 +23,18 @@ const externalReferencesRegex = /(templateUrl|styleUrls): *["'[]/;
 
 task('validate-release', sequenceTask(':publish:build-releases', 'validate-release:check-bundles'));
 
+task('validate-release:check-remote-tag', () => {
+  // Since we cannot assume that every developer uses `origin` as the default name for the upstream
+  // remote, we just pass in the Git URL that refers to angular/material2 repository on Github.
+  const tagCommitSha = spawnSync('git', ['ls-remote', '--tags', repositoryGitUrl, projectVersion],
+    {cwd: projectDir}).stdout.toString().trim();
+
+  if (!tagCommitSha) {
+    throw Error(red(`Cannot publish v${projectVersion} because the release is not ` +
+    `tagged on upstream yet. Please tag the release before publishing to NPM.`));
+  }
+});
+
 /** Task that checks the release bundles for any common mistakes before releasing to the public. */
 task('validate-release:check-bundles', () => {
   const releaseFailures = releasePackages

tools/package-tools/package-version-stamp.ts

@@ -11,8 +11,9 @@ import {buildConfig} from './build-config';
 export function insertPackageJsonVersionStamp(packageJsonPath: string) {
   const packageJson = require(packageJsonPath);
 
-  packageJson['_gitCommitStamp'] = getCurrentCommitSha();
-  packageJson['_gitBranchStamp'] = getCurrentBranchName();
+  packageJson['releaseGitCommitSha'] = getCurrentCommitSha();
+  packageJson['releaseGitBranch'] = getCurrentBranchName();
+  packageJson['releaseGitUser'] = getCurrentGitUser();
 
   writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
@@ -28,3 +29,14 @@ function getCurrentBranchName(): string {
   return spawnSync('git', ['symbolic-ref', '--short', 'HEAD'], {cwd: buildConfig.projectDir})
     .stdout.toString().trim();
 }
+
+/** Returns the name and email of the Git user that creates this release build. */
+function getCurrentGitUser() {
+  const userName = spawnSync('git', ['config', 'user.name'], {cwd: buildConfig.projectDir})
+    .stdout.toString().trim();
+
+  const userEmail = spawnSync('git', ['config', 'user.email'], {cwd: buildConfig.projectDir})
+    .stdout.toString().trim();
+
+  return `${userName} <${userEmail}>`;
+}