move driver/ to gather/

rename gather/index.js to gather/gather-runner.js
rename DriverBase class to Driver

Author: brendankenny

lighthouse-core/config/index.js

@@ -18,9 +18,10 @@
 
 const defaultConfig = require('./default.json');
 const recordsFromLogs = require('../lib/network-recorder').recordsFromLogs;
-const CriticalRequestChainsGatherer = require('../driver/gatherers/critical-request-chains');
-const SpeedlineGatherer = require('../driver/gatherers/speedline');
-const Driver = require('../driver');
+const CriticalRequestChainsGatherer = require('../gather/gatherers/critical-request-chains');
+const SpeedlineGatherer = require('../gather/gatherers/speedline');
+
+const GatherRunner = require('../gather/gather-runner');
 const log = require('../lib/log');
 
 // cleanTrace is run to remove duplicate TracingStartedInPage events,
@@ -115,7 +116,7 @@ function filterPasses(passes, audits) {
 
     freshPass.gatherers = freshPass.gatherers.filter(gatherer => {
       try {
-        const GathererClass = Driver.getGathererClass(gatherer);
+        const GathererClass = GatherRunner.getGathererClass(gatherer);
         return requiredGatherers.has(GathererClass.name);
       } catch (requireError) {
         throw new Error(`Unable to locate gatherer: ${gatherer}`);

lighthouse-core/driver/drivers/cri.js lighthouse-core/gather/drivers/cri.jslighthouse-core/driver/drivers/cri.js renamed to lighthouse-core/gather/drivers/cri.js

@@ -20,14 +20,14 @@ const NetworkRecorder = require('../../lib/network-recorder');
 const emulation = require('../../lib/emulation');
 const Element = require('../../lib/element');
 
-class DriverBase {
+class Driver {
 
   constructor() {
     this._url = null;
     this.PAUSE_AFTER_LOAD = 500;
     this._chrome = null;
     this._traceEvents = [];
-    this._traceCategories = DriverBase.traceCategories;
+    this._traceCategories = Driver.traceCategories;
   }
 
   get url() {
@@ -363,5 +363,5 @@ class DriverBase {
   }
 }
 
-module.exports = DriverBase;
+module.exports = Driver;
 

lighthouse-core/driver/drivers/driver.js lighthouse-core/gather/drivers/driver.jslighthouse-core/driver/drivers/driver.js renamed to lighthouse-core/gather/drivers/driver.js

@@ -19,7 +19,7 @@
 const log = require('../lib/log.js');
 const Audit = require('../audits/audit');
 
-class Driver {
+class GatherRunner {
   static loadPage(driver, options) {
     // Since a Page.reload command does not let a service worker take over, we
     // navigate away and then come back to reload. We do not `waitForLoad` on
@@ -238,7 +238,7 @@ class Driver {
           return gatherer;
         }
 
-        const GathererClass = Driver.getGathererClass(gatherer);
+        const GathererClass = GatherRunner.getGathererClass(gatherer);
         return new GathererClass();
       });
 
@@ -247,4 +247,4 @@ class Driver {
   }
 }
 
-module.exports = Driver;
+module.exports = GatherRunner;