Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

chore: add firebase project name to prompt #2743

Merged
merged 1 commit into from
Nov 4, 2016
Merged

chore: add firebase project name to prompt #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .firebaserc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"projects": {
"live": "angular-io",
"ngdocsdev": "ngdocsdev"
"ngdocsdev": "ngdocsdev",
"kw-dev": "kw-angular-io",
"dev": "angular-io-dev"
}
}
149 changes: 75 additions & 74 deletions firebase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,76 @@
{
"firebase": "angular-io",
"public": "www",
"rewrites": [
{
"source": "/docs/dart/latest/testing",
"destination":"/docs/dart/latest/guide/testing.html"
},
{
"source": "/docs/dart/latest/tutorial",
"destination": "/docs/dart/latest/index.html"
},
{
"source": "/docs/js/latest/testing",
"destination": "/docs/js/latest/guide/testing.html"
},
{
"source": "/docs/js/latest/tutorial",
"destination": "/docs/js/latest/index.html"
},
{
"source": "/docs/ts/latest/guide/setup.html",
"destination": "/docs/ts/latest/index.html"
},
{
"source": "/docs/ts/latest/testing",
"destination": "/docs/ts/latest/guide/testing.html"
},
{
"source": "/cheatsheet",
"destination": "/docs/ts/latest/guide/cheatsheet.html"
},
{
"source": "/cheatsheet.json",
"destination": "/docs/ts/latest/guide/cheatsheet.json"
},
{
"source": "/AngularCheatSheet_Letter.pdf",
"destination": "/docs/ts/latest/guide/AngularCheatSheet_Letter.pdf"
},
{
"source": "/AngularCheatSheet_Poster.pdf",
"destination": "/docs/ts/latest/guide/AngularCheatSheet_Poster.pdf"
},
{
"source": "/cardboard",
"destination": "/cardboard/index.html"
},
{
"source": "/license",
"destination": "/license.txt"
},
{
"source": "/events",
"destination": "/events.html"
},
{
"source": "/survey",
"destination": "/survey.html"
},
{
"source": "/dart",
"destination": "/docs/dart/latest/index.html"
},
{
"source": "/styleguide",
"destination": "/docs/ts/latest/guide/style-guide.html"
}
],
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
}
"hosting": {
"public": "www",
"rewrites": [
{
"source": "/docs/dart/latest/testing",
"destination": "/docs/dart/latest/guide/testing.html"
},
{
"source": "/docs/dart/latest/tutorial",
"destination": "/docs/dart/latest/index.html"
},
{
"source": "/docs/js/latest/testing",
"destination": "/docs/js/latest/guide/testing.html"
},
{
"source": "/docs/js/latest/tutorial",
"destination": "/docs/js/latest/index.html"
},
{
"source": "/docs/ts/latest/guide/setup.html",
"destination": "/docs/ts/latest/index.html"
},
{
"source": "/docs/ts/latest/testing",
"destination": "/docs/ts/latest/guide/testing.html"
},
{
"source": "/cheatsheet",
"destination": "/docs/ts/latest/guide/cheatsheet.html"
},
{
"source": "/cheatsheet.json",
"destination": "/docs/ts/latest/guide/cheatsheet.json"
},
{
"source": "/AngularCheatSheet_Letter.pdf",
"destination": "/docs/ts/latest/guide/AngularCheatSheet_Letter.pdf"
},
{
"source": "/AngularCheatSheet_Poster.pdf",
"destination": "/docs/ts/latest/guide/AngularCheatSheet_Poster.pdf"
},
{
"source": "/cardboard",
"destination": "/cardboard/index.html"
},
{
"source": "/license",
"destination": "/license.txt"
},
{
"source": "/events",
"destination": "/events.html"
},
{
"source": "/survey",
"destination": "/survey.html"
},
{
"source": "/dart",
"destination": "/docs/dart/latest/index.html"
},
{
"source": "/styleguide",
"destination": "/docs/ts/latest/guide/style-guide.html"
}
],
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
}
}
21 changes: 17 additions & 4 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var fsExtra = require('fs-extra');
var fs = fsExtra;
var exec = require('child_process').exec;
var execPromise = Q.denodeify(exec);
var execSync = require('child_process').execSync;
// cross platform version of spawn that also works on windows.
var xSpawn = require('cross-spawn');
var prompt = require('prompt');
Expand Down Expand Up @@ -744,7 +745,7 @@ gulp.task('build-compile', ['build-docs'], function() {
return harpCompile();
});

gulp.task('check-deploy', ['build-docs'], function() {
gulp.task('check-deploy', ['firebase-use-proj-check', 'build-docs'], () => {
return harpCompile().then(function() {
gutil.log('compile ok');
gutil.log('running live server ...');
Expand All @@ -753,7 +754,7 @@ gulp.task('check-deploy', ['build-docs'], function() {
}).then(function(shouldDeploy) {
if (shouldDeploy) {
gutil.log('deploying...');
return execPromise('firebase deploy');
return execPromise(`firebase deploy -p ${WWW}`);
} else {
return ['Not deploying'];
}
Expand All @@ -764,6 +765,17 @@ gulp.task('check-deploy', ['build-docs'], function() {
});
});

gulp.task('firebase-use-proj-check', cb => {
try {
execSync('firebase use');
} catch (e) {
// Rerun command so user gets project + alias info
execSync('firebase use', {stdio:[0,1,2]});
throw `\nAborting: no firebase project selected. Run:\n\n firebase use <project-or-alias-name>\n\n`;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a little help on how to get the project-or-alias-name? Or an example of a name?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what line 773 does. It generates output like:

No project is currently active.

Project aliases for /Users/chalin/git/angular.io:

  live (angular-io)
  ngdocsdev (ngdocsdev)
  kw-dev (kw-angular-io)
  dev (angular-io-dev)

Is that good enough?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's great.

}
return cb();
});

gulp.task('test-api-builder', function (cb) {
execCommands(['npm run test-api-builder'], {}, cb);
});
Expand Down Expand Up @@ -1071,7 +1083,6 @@ function backupApiHtmlFilesExist(folderName) {
}

function harpJsonSetJade2NgTo(v) {
const execSync = require('child_process').execSync;
const harpJsonPath = path.join(ANGULAR_IO_PROJECT_PATH, 'harp.json');
execSync(`perl -pi -e 's/("jade2ng": *)\\w+/$1${v}/' ${harpJsonPath}`);
const harpJson = require(harpJsonPath);
Expand Down Expand Up @@ -1204,10 +1215,12 @@ function watchAndSync(options, cb) {

// returns a promise;
function askDeploy() {
// Show user what the currently active firebase project is:
execSync('firebase use', {stdio:[0,1,2]});
prompt.start();
var schema = {
name: 'shouldDeploy',
description: 'Deploy to Firebase? (y/n)',
description: `Deploy ${WWW} to firebase? (y/n)`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

back ticks are really valid here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, its TS syntax for a string with interpolation (i.e., the ${WWW} inside the string).

type: 'string',
pattern: /Y|N|y|n/,
message: "Respond with either a 'y' or 'n'",
Expand Down