Update TBG fork from Foundation CLI Master

.gitignore

@@ -3,3 +3,4 @@ node_modules
 test
 npm-debug.log
 *.swp
+package-lock.json

bin/foundation.js

@@ -46,10 +46,7 @@ if (typeof cmd.args[0] === 'undefined') {
   else {
     foundation.help();
   }
-}
-
-// Arguments given
-else {
+} else {
   // If the command typed in doesn't exist, show the help screen
   if (typeof foundation[cmd.args[0]] == 'undefined') {
     foundation.help();

lib/commands/blocks.js

@@ -22,7 +22,7 @@ module.exports = function(args, options, callback) {
 }
 
 function listBuildingBlocks(args, options, callback) {
-  fetchUrl('foundation.zurb.com', '/building-blocks/data/building-blocks.json', function(blocksJson) {
+  fetchUrl('get.foundation', '/building-blocks/data/building-blocks.json', function(blocksJson) {
     var i = 0;
     var index = "";
     var blocks = JSON.parse(blocksJson);
@@ -131,7 +131,7 @@ function installFiles(name, callback) {
     var filename = name + filetype.name;
     var path = '/building-blocks/files/building-blocks/' + name + '/' + filename;
     fs.mkdir(filetype.directory, function() {
-      fetchUrl('foundation.zurb.com', path, function(file) {
+      fetchUrl('get.foundation', path, function(file) {
         if(file.length > 0) {
           fs.writeFile(filetype.directory + filetype.prefix + filename, file,  cb);
         } else {
@@ -145,7 +145,7 @@ function installFiles(name, callback) {
 function downloadZipFile(name, callback) {
   var filename = name + '.zip';
   var path = '/building-blocks/files/building-blocks/' + filename;
-  fetchUrl('foundation.zurb.com', path, function(file) {
+  fetchUrl('get.foundation', path, function(file) {
     if(file.length > 0) {
       fs.writeFile(filename, file,  callback);
     } else {

lib/commands/help.js

@@ -17,7 +17,7 @@ var helpText = {
     '',
     'To learn more about a specific command, type ' + 'foundation help <command>'.cyan,
     '',
-    'Need more help? Ask a question on the Foundation Forum: ' + 'foundation.zurb.com/forum'.cyan
+    'Need more help? Ask a question on the Foundation Forum: ' + 'https://github.com/foundation/foundation-sites/discussions'.cyan
   ],
   'new': [
     'Usage:',
@@ -29,7 +29,7 @@ var helpText = {
     'Creates a new Foundation project.',
     'Run the command without any flags to get an interactive setup prompt.',
     'You can also manually supply the framework and folder name using the ' + '--framework'.cyan + ' and ' + '--directory'.cyan + ' flags.',
-    '  If creating a ' + 'sites'.cyan + ' project, add the ' + '--template'.cyan + ' flag as well. The value can be ' + 'basic'.cyan + ' or ' + 'zurb'.cyan + '.'
+    '  If creating a ' + 'sites'.cyan + ' project, add the ' + '--template'.cyan + ' flag as well. The value can be ' + 'basic'.cyan + ' or ' + 'panini'.cyan + '.'
   ],
   'update': [
     'Usage:',

lib/commands/kits.js

@@ -37,7 +37,7 @@ function listKits(args, options, callback) {
 
 function getKitList(callback) {
   // For now until kits are implemented, use categories to test out build
-  fetchUrl('foundation.zurb.com', '/building-blocks/data/kits.json', function(kitJson) {
+  fetchUrl('get.foundation', '/building-blocks/data/kits.json', function(kitJson) {
     var kits = JSON.parse(kitJson);
     callback(kits);
   });
@@ -72,7 +72,7 @@ function installKit(args, options, callback) {
 function downloadZipFile(name, callback) {
   var filename = name + '.zip';
   var path = '/building-blocks/files/kits/' + filename;
-  fetchUrl('foundation.zurb.com', path, function(file) {
+  fetchUrl('get.foundation', path, function(file) {
     if(file.length > 0) {
       fs.writeFile(filename, file,  callback);
     } else {

lib/commands/new.js

@@ -1,6 +1,4 @@
 var async    = require('async');
-var bower    = require('bower');
-var colors   = require('colors');
 var exec     = require('child_process').exec;
 var fs       = require('fs');
 var inquirer = require('inquirer');
@@ -10,22 +8,21 @@ var path     = require('path');
 var rimraf   = require('rimraf');
 var which    = require('which');
 var util     = require('../util');
-var EventEmitter = require("events").EventEmitter;
 var format   = require('util').format;
+// var EventEmitter = require("events").EventEmitter;
 
 var repositories = {
   sites: {
-    basic: 'https://github.com/zurb/foundation-sites-template.git',
-    zurb: 'https://github.com/zurb/foundation-zurb-template.git'
+    basic: 'https://github.com/foundation/foundation-sites-template.git',
+    panini: 'https://github.com/foundation/foundation-zurb-template.git'
   },
-  apps: 'https://github.com/zurb/foundation-apps-template.git',
-  emails: 'https://github.com/zurb/foundation-emails-template.git'
+  emails: 'https://github.com/foundation/foundation-emails-template.git'
 }
 
 module.exports = function(args, options, callback, ee) {
   var projectName, projectFolder, framework, template, messages, directory;
   var tasks = [
-    preflight, prompt, gitClone, folderSetup, npmInstall, bowerInstall
+    preflight, prompt, gitClone, folderSetup, npmInstall
   ];
 
   // Each function below is executed in order
@@ -49,7 +46,7 @@ module.exports = function(args, options, callback, ee) {
 
   // 2. Find out what the user wants to do
   function prompt(cb) {
-    inquirer.prompt(util.questions(options), function(answers) {
+    inquirer.prompt(util.questions(options)).then(function(answers) {
       // The variables we need either came from the prompts, or the console arguments
       projectName = answers.directory || options.directory;
       framework = answers.framework || options.framework;
@@ -75,18 +72,16 @@ module.exports = function(args, options, callback, ee) {
 
     // [TODO] Change to spawn and check for errors on stderr
     if (repositories[framework] === undefined) {
-	console.log("error!".red + "\nFramework " + framework.cyan + " unknown.");
-	process.exit(1);
+      console.log("error!".red + "\nFramework " + framework.cyan + " unknown.");
+      process.exit(1);
     }
 
     exec(cmd, function(err) {
       if (err instanceof Error) {
         console.log(messages.gitCloneError);
         process.exit(1);
       }
-
       process.chdir(projectFolder);
-
       cb();
     });
 
@@ -100,53 +95,22 @@ module.exports = function(args, options, callback, ee) {
     rimraf('.git', function() {});
     console.log(messages.installingDependencies);
     cb();
-
-    // if (options.edge) {
-    //   util.changeVersion(directory, 'foundation-'+framework, 'master', cb);
-    // }
-    // else if (options.version) {
-    //   util.changeVersion(directory, 'foundation-'+framework, options.version, cb);
-    // }
-    // else {
-    //   cb();
-    // }
   }
 
   // 5. Install Node dependencies
   function npmInstall(cb) {
-    npm.load({ prefix: projectFolder, loglevel: 'error', loaded: false }, function(err) {
+    npm.load(function(err) {
       npm.commands.install([], function(err, data) {
         if (options.debug && err) console.log(err);
         var success = err === null;
+        console.log(ee);
         if(success && typeof(ee) !== 'undefined') ee.emit("npmInstallSuccess", projectName);
         else if(typeof(ee) !== 'undefined') ee.emit("npmInstallFailure", projectName);
         cb(null, success);
       });
     });
   }
 
-  // 6. Install Bower dependencies
-  function bowerInstall(cb) {
-    // Only run "bower install" if a bower.json is present
-    if (!fs.existsSync('bower.json')) {
-      cb(null, true)
-    }
-    else {
-      bower.commands.install(undefined, undefined, {
-        cwd: process.cwd(), silent: true, quiet: true, production: true })
-      .on('err', function(err) {
-        if (typeof ee !== 'undefined')
-          ee.emit("bowerInstallFailure", projectName);
-        cb(null, false);
-      })
-      .on('end', function(data) {
-        if (typeof ee !== 'undefined')
-          ee.emit("bowerInstallSuccess", projectName);
-        cb(null, true);
-      });
-    }
-  }
-
   // 7. Finish the process with a status report
   function finish(err, results) {
     // Indexes 4 and 5 of results are the npm/Bower statuses
@@ -175,7 +139,7 @@ module.exports = function(args, options, callback, ee) {
     else
       console.log(messages.installFailFinal);
 
-    if (typeof(callback)!=='undefined') callback();
+    if (typeof callback === 'function') callback();
   }
 }
 

lib/commands/watch.js

@@ -1,15 +1,28 @@
 var fs = require('fs');
 var npm = require('npm');
 var path = require('path');
+var os = require('os');
+//
+var platform = os.platform();
+var platformResponse = function() {
+  var r = "";
+  if (["darwin","freebsd","linux","openbsd","sunos"].indexOf(platform) > -1)
+    r = "pwd";
+  if (["win32"].indexOf(platform) > -1)
+    r = "chdir";
+  if (r === "")
+    r = "the appropriate command";
+  return "\nYou don't appear to be in a Foundation project folder.\n\nUse " + r.cyan + " to see what folder you're in.\n";
+}
 
 module.exports = function(args, options) {
   // Check if the user is inside a project folder, by looking for a package.json
   if (!fs.existsSync(path.join(process.cwd(), 'package.json'))) {
-    console.log("\nYou don't appear to be in a Foundation project folder.\n\nUse " + "pwd".cyan + " (or " + "chdir".cyan + " on Windows) to see what folder you're in.\n");
+    console.log(platformResponse());
     process.exit(0);
   }
 
-  npm.load({ prefix: process.cwd(), loaded: false }, function(err) {
+  npm.load(function(err) {
     npm.commands.start.apply(this, []);
   });
 }

lib/util/assert-installable-repo.js

@@ -8,8 +8,8 @@ module.exports = function assertInstallableRepo(callback) {
                   choices: [{name: 'Yes', value: 'y'}, {name: 'No', value: 'n'}]};
   for(var i = 0; i < paths.length; i++) {
     if(!fs.existsSync(paths[i])) {
-      console.log("You don't appear to be in a ZURB stack project, so we can't automatically install building blocks");
-      inquirer.prompt(question, function(answer) {
+      console.log("You don't appear to be in a Foundation project, so we can't automatically install building blocks");
+      inquirer.prompt(question).then(function(answer) {
         if(answer.zip === 'y') {
           callback('zip');
         } else {

lib/util/fetch-url.js

@@ -1,4 +1,4 @@
-var http = require('http');
+var https = require('https');
 
 module.exports = function fetchUrl(host, path, done) {
   var options = {
@@ -22,5 +22,5 @@ module.exports = function fetchUrl(host, path, done) {
       }
     });
   };
-  http.request(options, callback).end();
+  https.request(options, callback).end();
 }

lib/util/index.js

@@ -1,6 +1,4 @@
 module.exports = {
-  changeVersion: require('./changeVersion'),
-  copySettings: require('./copySettings'),
   mascot: require('./mascot'),
   messages: require('./messages'),
   questions: require('./questions')

lib/util/messages.js

@@ -3,7 +3,7 @@ var colors = require('colors');
 module.exports = function(projectName,messageFramework,messageTemplate) {
   return {
     helloYeti: [
-      'Thanks for using ZURB Foundation for %s!',
+      'Thanks for using Foundation for %s!',
       '-------------------------------------------',
       'Let\'s set up a new project.',
       'It shouldn\'t take more than a minute.'
@@ -16,7 +16,7 @@ module.exports = function(projectName,messageFramework,messageTemplate) {
     installSuccess: "\nYou're all set!\n".cyan,
     installFail: "\nThere were some problems during the installation.\n".cyan,
     npmSuccess: " \u2713 Node modules installed.".green,
-    npmFail: " \u2717 Node modules not installed.".red + " Try running " + "npm install".cyan + " manually.",
+    npmFail: " \u2717 Node modules not installed.".red + " Try running " + "yarn install".cyan + " manually.",
     bowerSuccess: " \u2713 Bower components installed.".green,
     bowerFail: " \u2717 Bower components not installed.".red + " Try running " + "bower install".cyan + " manually.",
     installSuccessFinal: "\nNow run " + "foundation watch ".cyan + "while inside the " + projectName.cyan + " folder.\n",

lib/util/questions.js

@@ -12,9 +12,6 @@ module.exports = function(options) {
     choices: [{
       name: 'A website (Foundation for Sites)',
       value: 'sites'
-    }, {
-      name: 'A web app (Foundation for Apps)',
-      value: 'apps'
     }, {
       name: 'An email (Foundation for Emails)',
       value: 'emails'
@@ -55,8 +52,8 @@ module.exports = function(options) {
       name: 'Basic Template: includes a Sass compiler',
       value: 'basic'
     }, {
-      name: 'ZURB Template: includes Handlebars templates and Sass/JS compilers',
-      value: 'zurb'
+      name: 'Panini Template: includes Handlebars templates and Sass/JS compilers',
+      value: 'panini'
     }],
     when: function(answers) {
       if (!options.template && (answers.framework === 'sites' || options.framework === 'sites'))