feat(calibrator): move to gemini-core

lib/browser-pool.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const BrowserPool = require('gemini-core').BrowserPool;
-const Calibrator = require('./calibrator');
+const {BrowserPool, Calibrator} = require('gemini-core');
 const Browser = require('./browser');
 const Events = require('./constants/events');
 

lib/browser/camera.js

@@ -63,12 +63,10 @@ module.exports = class Camera {
             return image;
         }
 
-        return image.crop({
-            left: this._calibration.left,
-            top: this._calibration.top,
-            width: image.getSize().width - this._calibration.left,
-            height: image.getSize().height - this._calibration.top
-        });
+        const {left, top} = this._calibration;
+        const {width, height} = image.getSize();
+
+        return image.crop({left, top, width: width - left, height: height - top});
     }
 
     _cropToViewport(image, page) {

package.json

@@ -19,14 +19,13 @@
     "debug": "^2.2.0",
     "fs-extra": "^0.30.0",
     "gemini-configparser": "^1.0.0",
-    "gemini-core": "^2.2.1",
+    "gemini-core": "^2.3.0",
     "gemini-coverage": "^1.0.0",
     "graceful-fs": "^4.1.11",
     "handlebars": "^4.0.5",
     "inherit": "~2.2.1",
     "js-yaml": "^3.2.5",
     "lodash": "^4.15.0",
-    "looks-same": "^3.0.0",
     "micromatch": "^2.3.11",
     "node-fetch": "^1.6.3",
     "plugins-loader": "^1.1.0",
@@ -35,7 +34,6 @@
     "sizzle": "^2.2.0",
     "source-map": "^0.5.3",
     "striptags": "2.1.1",
-    "uglify-js": "^2.7.3",
     "uglifyify": "^3.0.1",
     "wd": "^0.4.0",
     "worker-farm": "^1.3.1"
@@ -60,8 +58,6 @@
   },
   "scripts": {
     "test-unit": "istanbul test _mocha -- --recursive test/unit",
-    "prepublish": "npm run prepare-calibrate-script",
-    "prepare-calibrate-script": "uglifyjs ./lib/browser/client-scripts/gemini.calibrate.js -m > ./lib/browser/client-scripts/gemini.calibrate.min.js --support-ie8",
     "postpublish": "npm run publish-site",
     "test-func": "istanbul test _mocha test/functional",
     "test-browser": "istanbul test _mocha test/browser",

test/browser/calibrator.test.js

@@ -1,6 +1,7 @@
 'use strict';
-var eachSupportedBrowser = require('./util').eachSupportedBrowser,
-    Calibrator = require('lib/calibrator');
+
+const {eachSupportedBrowser} = require('./util');
+const {Calibrator} = require('gemini-core');
 
 describe('calibrator', function() {
     eachSupportedBrowser(function() {

test/unit/browser-pool.js

@@ -2,9 +2,8 @@
 
 const BrowserPool = require('lib/browser-pool');
 const BrowserFabric = require('lib/browser');
-const Calibrator = require('lib/calibrator');
 const RunnerEvents = require('lib/constants/events');
-const CoreBrowserPool = require('gemini-core').BrowserPool;
+const {BrowserPool: CoreBrowserPool, Calibrator} = require('gemini-core');
 const AsyncEmitter = require('gemini-core').events.AsyncEmitter;
 const _ = require('lodash');
 const Promise = require('bluebird');

test/unit/browser/new-browser.js

@@ -6,7 +6,7 @@ const _ = require('lodash');
 
 const Camera = require('lib/browser/camera');
 const ClientBridge = require('lib/browser/client-bridge');
-const Calibrator = require('lib/calibrator');
+const {Calibrator} = require('gemini-core');
 const WdErrors = require('lib/constants/wd-errors');
 const GeminiError = require('lib/errors/gemini-error');