[RFC] Update node + dependencies

.gitignore

@@ -4,6 +4,5 @@ test/temp/
 vendor/
 composer.phar
 *.pyc
-
 .vimrc
-
+.browserData

.travis.yml

@@ -1,56 +1,79 @@
 sudo: required
 dist: trusty
 language: generic
+cache:
+  directories:
+  - $HOME/.rvm
+  - $HOME/.nvm
+  - $TRAVIS_BUILD_DIR/vendor
+  - $TRAVIS_BUILD_DIR/node_modules
 addons:
   hosts:
     - example.com
     - local.example.com
     - production.example.com
     - www.example.com
+  apt:
+    packages:
+      - xvfb
+      - libgconf2-dev
+env:
+  global:
+    # DEBUG: "nightmare:*,electron:*"
+    - DISPLAY: ":99.0"
+  matrix:
+    # ANSIBLE_VERSION: "2.0.2"
+    - ANSIBLE_VERSION: "2.1.3"
+    - ANSIBLE_VERSION: "2.2.0"
 before_install:
-  # node setup (for yeoman/bower)
-  - nvm install 0.10
-  - node --version
-  - npm --version
-  - nvm --version
-  - npm install -g bower
-  - npm install
   # ruby setup (for capistrano)
+  - rvm install 1.9.3
   - rvm use 1.9.3
   - gem install bundler
   - ruby --version
   - rvm --version
   - gem --version
   - bundle --version
+  # node setup (for yeoman)
+  - nvm install 4.0
+  - node --version
+  - npm --version
+  - nvm --version
+  - npm install -g yo@1.7.1
+  - yo --version
+  - npm install
   # python setup (for ansible)
-  - sudo pip install ansible==1.9.4
+  - sudo pip install urllib3 pyopenssl ndg-httpsclient pyasn1
+  - sudo pip install ansible==$ANSIBLE_VERSION
   - python --version
   - pip --version
   - ansible --version
   # mock up test project, and move to /vagrant for end-user tests
   - $PWD/bin/mock
   - sudo mv $PWD/temp /vagrant
   - ln -s /vagrant $PWD/temp
-  # copy our local evolution-wordpress as bower dependency
-  - rm -rf /vagrant/bower_components/evolution-wordpress
-  - cp -RP $PWD /vagrant/bower_components/evolution-wordpress/
-  # invoke local provision (as default user with elevated permissions)
+  # copy our local evolution-wordpress as npm dependency
+  - mkdir -p /vagrant/node_modules
+  - cp -RP $PWD /vagrant/node_modules/evolution-wordpress
+  # set up local provisioner
   - sudo cp $PWD/.travis.provision.bin $PWD/bin/provision
   - sudo chmod +x $PWD/bin/provision
-  - sudo $PWD/bin/provision
-  - sudo chown -Rf $USER:$USER $HOME/.ansible
   # mock vagrant binary (for parity with local/remote stages)
   - sudo cp $PWD/.travis.vagrant.bin /bin/vagrant
   - sudo chmod +x /bin/vagrant
   # ensure known ssh fingerprints for remote stages
   - ssh-keyscan -H production.example.com >> $HOME/.ssh/known_hosts
   - ssh-keyscan -H www.example.com >> $HOME/.ssh/known_hosts
   - ssh-keyscan -H example.com >> $HOME/.ssh/known_hosts
-  # install composer (for phpunit)
-  - curl -sS https://getcomposer.org/installer | php
+  # run xvfb as background service
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24"
 install:
+  - echo "Provision locally and fix permissions afterward"
+  - sudo $PWD/bin/provision
+  - sudo chown -Rf $USER:$USER $HOME/.ansible
   - echo "Install Composer dependencies"
-  - php composer.phar install --dev
+  - curl -sS https://getcomposer.org/installer | php
+  - php composer.phar install -n --dev -vv
 script:
   - ./vendor/bin/phpunit
-  - npm test
+  - ./bin/test

README.md

@@ -24,7 +24,9 @@ Evolution lets you generate an entirely versioned, multi-environment Wordpress s
 
 ## Project Status
 
-Evolution is _largely_ stable and usable at this point, but features are still being added and bugs being fixed. This documentation is also a work in progress.
+Evolution is stable and usable in a production environment, but features are still being added and bugs being fixed. Suggestions, bug reports, and pull requests are welcome.
+
+This and [futher documentation](./docs/) are a constant work in progress. Contributions to documentation are _always_ welcome.
 
 ## Quick Start
 
@@ -37,15 +39,15 @@ You will need:
 * [Vagrant](https://www.vagrantup.com/downloads.html) 1.8+
   * [VirtualBox](https://www.virtualbox.org/wiki/Downloads) 5+
   * [Hostmanager for Vagrant](https://github.com/smdahlen/vagrant-hostmanager#installation)
-* [npm](https://docs.npmjs.com/getting-started/installing-node)
+* [Node](https://nodejs.org/en/download/) 4.0+
 * [Bundler](http://bundler.io/)
-* [Ansible](http://docs.ansible.com/intro_installation.html) 1.6+
+* [Ansible](http://docs.ansible.com/intro_installation.html) 2.0+
 * [sshpass](https://gist.github.com/arunoda/7790979)
 
-You can then use npm to install Bower and the Yeoman generator:
+You can then use npm to install the Yeoman generator:
 
 ```
-npm install -g bower yo generator-evolve
+npm install -g yo generator-evolve
 ```
 
 ### Common Workflows

bin/import

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 
-var fs        = require('fs');
-var fsx       = require('fs-extra');
+'use strict'
+
+var fs        = require('fs-extra');
 var os        = require('os');
 var path      = require('path');
 var cp        = require('child_process');
 var util      = require('util');
 var chalk     = require('chalk');
 var deasync   = require('deasync');
 var inquirer  = require('inquirer');
-var replace   = require("replace");
+var replace   = require('replace');
 var yauzl     = require('yauzl');
 
 // Evolution site working directory
@@ -36,7 +37,7 @@ catch(e) {
 
 // extract zip to tmpdir
 var extractedPath = path.join(os.tmpdir(), path.basename(answers.zipfile, '.zip'));
-fsx.emptyDirSync(extractedPath);
+fs.emptyDirSync(extractedPath);
 
 console.log('Extracting', chalk.yellow(answers.zipfile), 'to', chalk.green(extractedPath));
 var extractedFiles = 0,
@@ -52,7 +53,7 @@ yauzl.open(answers.zipfile, {lazyEntries: true}, function(err, zipfile) {
     if (/\/$/.test(entry.fileName)) {
       // create directories (names ending in '/')
       extractedDirs++;
-      fsx.mkdirs(extractedName, function(err) {
+      fs.mkdirs(extractedName, function(err) {
         if (err) throw err;
         zipfile.readEntry();
       });
@@ -62,7 +63,7 @@ yauzl.open(answers.zipfile, {lazyEntries: true}, function(err, zipfile) {
       zipfile.openReadStream(entry, function(err, readStream) {
         if (err) throw err;
         // ensure parent directory exists
-        fsx.mkdirs(path.dirname(extractedName), function(err) {
+        fs.mkdirs(path.dirname(extractedName), function(err) {
           if (err) throw err;
           readStream.pipe(fs.createWriteStream(extractedName));
           readStream.on('end', function() {
@@ -163,21 +164,20 @@ function zipPostProcessing() {
   }
 
   // remove known host, only as necessary
-  var cpExec = deasync(cp.exec);
   var execMaxBuffer = 1024*1024*1024;
   var cpCmd = '(ssh-keygen -F ' + siteDomain + ' && ssh-keygen -R ' + siteDomain + ') || :';
   console.log('checking for (and removing) any existing known host:', chalk.cyan(cpCmd));
-  cpExec(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
+  cp.execSync(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
 
   // run sql against db
   cpCmd = 'bundle exec cap local evolve:db:exec[' + path.join(extractedPath, 'wordpress.sql') + ']';
   console.log('importing sql via:', chalk.cyan(cpCmd));
-  cpExec(cpCmd, {cwd: siteDirectory, env: util._extend(process.env, {evolution_non_interactive: 1}), stdio: 'inherit', maxBuffer: execMaxBuffer});
+  cp.execSync(cpCmd, {cwd: siteDirectory, env: util._extend(process.env, {evolution_non_interactive: 1}), stdio: 'inherit', maxBuffer: execMaxBuffer});
 
   // list all users via wp-cli
   cpCmd = 'bundle exec cap local wp:user:list:--fields=ID,user_login,roles:--format=json';
   console.log('listing users via:', chalk.cyan(cpCmd));
-  var capOut = cpExec(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
+  var capOut = cp.execSync(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
 
   // prompt for role of any users lacking one
   var existingUsers = capOut.match(/\s+(\[\{"ID":[^\r\n]+)/);
@@ -206,26 +206,26 @@ function zipPostProcessing() {
 
         cpCmd = 'bundle exec cap local wp:user:add-role:'+user.ID+':'+answers.role;
         console.log('assigning user role via:', chalk.cyan(cpCmd));
-        cpExec(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
+        cp.execSync(cpCmd, {cwd: siteDirectory, env: process.env, stdio: 'inherit', maxBuffer: execMaxBuffer});
       }
     });
   }
 
   // Copying Themes / Plugins / Uploads
   var pluginsPath = path.join(extractedPath, 'plugins');
   console.log('installing plugins from', chalk.cyan(pluginsPath));
-  fsx.copySync(pluginsPath, path.join(siteDirectory, 'web', 'wp-content', 'plugins'), {clobber: true});
+  fs.copySync(pluginsPath, path.join(siteDirectory, 'web', 'wp-content', 'plugins'), {clobber: true});
 
   var themesPath = path.join(extractedPath, 'themes');
   console.log('installing themes from', chalk.cyan(themesPath));
-  fsx.copySync(themesPath, path.join(siteDirectory, 'web', 'wp-content', 'themes'), {clobber: true});
+  fs.copySync(themesPath, path.join(siteDirectory, 'web', 'wp-content', 'themes'), {clobber: true});
 
   var uploadsPath = path.join(extractedPath, 'uploads');
   if (manifest.is_multisite) {
     uploadsPath = path.join(uploadsPath, 'sites', manifest.blogid);
   }
   console.log('installing uploads from', chalk.cyan(uploadsPath));
-  fsx.copySync(uploadsPath, path.join(siteDirectory, 'web', 'wp-content', 'uploads'), {clobber: true});
+  fs.copySync(uploadsPath, path.join(siteDirectory, 'web', 'wp-content', 'uploads'), {clobber: true});
 
   console.log(chalk.green('looks like we\'re done here!'));
 }

bin/mock

@@ -1,11 +1,14 @@
 #!/usr/bin/env node
 
+'use strict'
+
 var fs      = require('fs-extra');
-var exec    = require('child_process').exec;
-var helpers = require('yeoman-generator').test;
+var cp      = require('child_process');
+var helpers = require('yeoman-test');
 var path    = require('path');
 
-var outputDir     = path.join(__dirname, '..', 'temp');
+var libDir        = path.normalize(path.join(__dirname, '..'));
+var outputDir     = path.join(libDir, 'temp');
 var privatePath   = path.join(outputDir, '/lib/ansible/files/ssh/id_rsa');
 var privateKey    = fs.existsSync(privatePath) ? fs.readFileSync(privatePath) : null;
 var publicPath    = path.join(outputDir, '/lib/ansible/files/ssh/id_rsa.pub');
@@ -30,14 +33,14 @@ helpers.testDirectory(outputDir, function(err) {
   }
   else {
     var prep = [
-      'git clone git@github.com:evolution/wordpress-example.git ' + outputDir,
+      'git clone https://github.com/evolution/wordpress-example.git ' + outputDir,
       'cd ' + outputDir,
       'git rm -rf .',
     ];
   }
 
   console.log('Executing `%s`', prep.join(' && '));
-  exec(prep.join(' && '), function(err, stdout, stderr) {
+  cp.exec(prep.join(' && '), function(err, stdout, stderr) {
     if (err) {
       throw err;
     }
@@ -111,19 +114,39 @@ helpers.testDirectory(outputDir, function(err) {
 
       fs.writeFileSync(outputDir + '/Vagrantfile', vagrantFile);
 
+      var committish;
+      if (isCI) {
+        committish = process.env.TRAVIS_COMMIT;
+      } else {
+        committish = cp.execSync('git rev-parse --verify HEAD', { cwd: libDir })
+          .toString().trim();
+      }
+
+      var packageJson = fs.readFileSync(outputDir + '/package.json', 'utf8')
+        .replace(
+          new RegExp('("evolution-wordpress":[ ]*)"[^"]+"'),
+          [
+            '$1',
+            `"evolution/wordpress#${committish}"`,
+          ].join('')
+        )
+      ;
+
+      fs.writeFileSync(outputDir + '/package.json', packageJson);
+
       var wrap = [
         'git add .',
       ];
 
       if (isCI) {
         Array.prototype.push.apply(wrap, [
           'git commit -m "Something to deploy"',
-          'git remote add origin ' + outputDir + '/.git',
+          'git remote add origin /vagrant/.git',
         ]);
       }
 
       console.log('Executing `%s`', wrap.join(' && '));
-      exec(wrap.join(' && '), { cwd: outputDir });
+      cp.exec(wrap.join(' && '), { cwd: outputDir });
     });
   });
 });