Skip to content

Commit 092e029

Browse files
jamiebuildsjamiebuilds
committed
Format with prettier
1 parent 999b1ed commit 092e029

File tree

8 files changed

+246
-365
lines changed

8 files changed

+246
-365
lines changed

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"author": "James Kyle <[email protected]>",
77
"license": "BSD-2-Clause",
88
"scripts": {
9+
"format": "prettier --write src/**/*.js",
910
"build": "babel src -d lib",
1011
"start": "babel-node src/index.js",
1112
"prepublish": "yarn run build"
@@ -14,6 +15,7 @@
1415
"babel-cli": "^6.22.2",
1516
"babel-plugin-transform-es2015-modules-commonjs": "^6.22.0",
1617
"babel-plugin-transform-flow-strip-types": "^6.22.0",
17-
"flow-bin": "^0.38.0"
18+
"flow-bin": "^0.38.0",
19+
"prettier": "^0.15.0"
1820
}
1921
}

‎src/commands.js

Lines changed: 53 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
// @flow
2-
import {run, series} from './utils';
3-
import {NPM_BIN, YARN_BIN} from './constants';
4-
import type {Callback, ScenarioOptions} from './types';
2+
import { run, series } from "./utils";
3+
import { NPM_BIN, YARN_BIN } from "./constants";
4+
import type { Callback, ScenarioOptions } from "./types";
55

66
let maybe = (func, dir, callback: Callback<Error, number>, condition) =>
7-
condition
8-
? func(dir, callback)
9-
: callback(null, 0);
7+
condition ? func(dir, callback) : callback(null, 0);
108

119
// Runs
1210

1311
export let runNpmInstall = (dir: string, callback: Callback<Error, number>) =>
14-
run(NPM_BIN, ['install', '--silent'], dir, callback);
12+
run(NPM_BIN, ["install", "--silent"], dir, callback);
1513
export let runYarnInstall = (dir: string, callback: Callback<Error, number>) =>
16-
run(YARN_BIN, ['install'], dir, callback);
14+
run(YARN_BIN, ["install"], dir, callback);
1715

1816
let runNpmShrinkwrap = (dir, callback) =>
19-
run(NPM_BIN, ['shrinkwrap', '--silent'], dir, callback);
17+
run(NPM_BIN, ["shrinkwrap", "--silent"], dir, callback);
2018
let runNpmCacheClean = (dir, callback) =>
21-
run(NPM_BIN, ['cache', 'clean'], dir, callback);
19+
run(NPM_BIN, ["cache", "clean"], dir, callback);
2220
let runYarnCacheClean = (dir, callback) =>
23-
run(YARN_BIN, ['cache', 'clean'], dir, callback);
21+
run(YARN_BIN, ["cache", "clean"], dir, callback);
2422
let runRmRfNodeModules = (dir, callback) =>
25-
run('rm', ['-rf', 'node_modules'], dir, callback);
23+
run("rm", ["-rf", "node_modules"], dir, callback);
2624
let runRmNpmShrinkwrap = (dir, callback) =>
27-
run('rm', ['npm-shrinkwrap.json'], dir, callback);
28-
let runRmYarnLock = (dir, callback) =>
29-
run('rm', ['yarn.lock'], dir, callback);
25+
run("rm", ["npm-shrinkwrap.json"], dir, callback);
26+
let runRmYarnLock = (dir, callback) => run("rm", ["yarn.lock"], dir, callback);
3027

3128
// Maybes
3229

3330
let maybeRunNpmInstall = (dir, opts, callback) =>
34-
maybe(runNpmInstall, dir, callback, opts.warmCache || opts.nodeModules || opts.lockfile);
31+
maybe(
32+
runNpmInstall,
33+
dir,
34+
callback,
35+
opts.warmCache || opts.nodeModules || opts.lockfile
36+
);
3537
let maybeRunNpmShrinkwrap = (dir, opts, callback) =>
3638
maybe(runNpmShrinkwrap, dir, callback, opts.lockfile);
3739
let maybeRunNpmCacheClean = (dir, opts, callback) =>
3840
maybe(runNpmCacheClean, dir, callback, !opts.warmCache);
3941
let maybeRunYarnInstall = (dir, opts, callback) =>
40-
maybe(runYarnInstall, dir, callback, opts.warmCache || opts.nodeModules || opts.lockfile);
42+
maybe(
43+
runYarnInstall,
44+
dir,
45+
callback,
46+
opts.warmCache || opts.nodeModules || opts.lockfile
47+
);
4148
let maybeRunYarnCacheClean = (dir, opts, callback) =>
4249
maybe(runYarnCacheClean, dir, callback, !opts.warmCache);
4350
let maybeRunRmRfNodeModules = (dir, opts, callback) =>
@@ -49,21 +56,35 @@ let maybeRunRmYarnLock = (dir, opts, callback) =>
4956

5057
// Prepares
5158

52-
export let prepareNpm = (dir: string, opts: ScenarioOptions, callback: Callback<Error, null>) => {
53-
series([
54-
cb => maybeRunNpmInstall(dir, opts, cb),
55-
cb => maybeRunNpmShrinkwrap(dir, opts, cb),
56-
cb => maybeRunRmRfNodeModules(dir, opts, cb),
57-
cb => maybeRunNpmCacheClean(dir, opts, cb),
58-
cb => maybeRunRmNpmShrinkwrap(dir, opts, cb),
59-
], err => callback(err, null));
59+
export let prepareNpm = (
60+
dir: string,
61+
opts: ScenarioOptions,
62+
callback: Callback<Error, null>
63+
) => {
64+
series(
65+
[
66+
cb => maybeRunNpmInstall(dir, opts, cb),
67+
cb => maybeRunNpmShrinkwrap(dir, opts, cb),
68+
cb => maybeRunRmRfNodeModules(dir, opts, cb),
69+
cb => maybeRunNpmCacheClean(dir, opts, cb),
70+
cb => maybeRunRmNpmShrinkwrap(dir, opts, cb)
71+
],
72+
err => callback(err, null)
73+
);
6074
};
6175

62-
export let prepareYarn = (dir: string, opts: ScenarioOptions, callback: Callback<Error, null>) => {
63-
series([
64-
cb => maybeRunYarnInstall(dir, opts, cb),
65-
cb => maybeRunRmRfNodeModules(dir, opts, cb),
66-
cb => maybeRunYarnCacheClean(dir, opts, cb),
67-
cb => maybeRunRmYarnLock(dir, opts, cb),
68-
], err => callback(err, null));
76+
export let prepareYarn = (
77+
dir: string,
78+
opts: ScenarioOptions,
79+
callback: Callback<Error, null>
80+
) => {
81+
series(
82+
[
83+
cb => maybeRunYarnInstall(dir, opts, cb),
84+
cb => maybeRunRmRfNodeModules(dir, opts, cb),
85+
cb => maybeRunYarnCacheClean(dir, opts, cb),
86+
cb => maybeRunRmYarnLock(dir, opts, cb)
87+
],
88+
err => callback(err, null)
89+
);
6990
};

‎src/constants.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// @flow
2-
import path from 'path';
2+
import path from "path";
33

4-
export const NPM_BIN = path.join(__dirname, '../tools/npm.js');
5-
export const YARN_BIN = path.join(__dirname, '../tools/yarn.js');
4+
export const NPM_BIN = path.join(__dirname, "../tools/npm.js");
5+
export const YARN_BIN = path.join(__dirname, "../tools/yarn.js");
66

7-
export const NPM_REPO = path.join(__dirname, '../tools/npm');
8-
export const YARN_REPO = path.join(__dirname, '../tools/yarn');
7+
export const NPM_REPO = path.join(__dirname, "../tools/npm");
8+
export const YARN_REPO = path.join(__dirname, "../tools/yarn");
99

10-
export const PROJECTS = [
11-
'react-native',
12-
'ember-cli',
13-
];
10+
export const PROJECTS = ["react-native", "ember-cli"];

‎src/index.js

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,77 @@
11
// @flow
2-
import path from 'path';
3-
import * as log from './log';
4-
import {series, repeat, retry} from './utils';
5-
import type {Scenario} from './types';
6-
import {PROJECTS} from './constants';
7-
import {
8-
updateNpm,
9-
updateYarn
10-
} from './repos';
2+
import path from "path";
3+
import * as log from "./log";
4+
import { series, repeat, retry } from "./utils";
5+
import type { Scenario } from "./types";
6+
import { PROJECTS } from "./constants";
7+
import { updateNpm, updateYarn } from "./repos";
118
import {
129
prepareNpm,
1310
prepareYarn,
1411
runNpmInstall,
1512
runYarnInstall
16-
} from './commands';
13+
} from "./commands";
1714

18-
process.title = 'yarn-perf';
15+
process.title = "yarn-perf";
1916

20-
function runScenario(attempts, scenario: Scenario, callback) {
17+
let runScenario = (attempts, scenario: Scenario, callback) => {
2118
let command = scenario.command;
2219
let opts = scenario.opts;
2320
let dir = scenario.dir;
2421

25-
log.err(`running ${command} - warm cache: ${String(opts.warmCache)}, node_modules: ${String(opts.nodeModules)}, lockfile: ${String(opts.lockfile)}`);
22+
log.err(
23+
`running ${command} - warm cache: ${String(
24+
opts.warmCache
25+
)}, node_modules: ${String(opts.nodeModules)}, lockfile: ${String(
26+
opts.lockfile
27+
)}`
28+
);
2629

2730
let prepare;
2831
let execute;
2932

30-
if (command === 'npm') {
33+
if (command === "npm") {
3134
prepare = prepareNpm;
3235
execute = runNpmInstall;
33-
} else if (command === 'yarn') {
36+
} else if (command === "yarn") {
3437
prepare = prepareYarn;
3538
execute = runYarnInstall;
3639
} else {
37-
callback(new Error('Invalid scenario command: ' + command), null);
40+
callback(new Error("Invalid scenario command: " + command), null);
3841
}
3942

4043
let total = 0;
4144
let attemptNum = 0;
4245

43-
repeat(attempts, cb => {
44-
log.err(` attempt #${++attemptNum}`);
45-
46-
prepare(dir, opts, err => {
47-
execute(dir, (err, time) => {
48-
if (err) return cb(err, null);
49-
time = ((time: any): number);
50-
log.err(` time: ${time}`);
51-
total += time;
52-
cb(null, null);
46+
repeat(
47+
attempts,
48+
cb => {
49+
log.err(` attempt #${++attemptNum}`);
50+
51+
prepare(dir, opts, err => {
52+
execute(dir, (err, time) => {
53+
if (err) return cb(err, null);
54+
time = ((time: any): number);
55+
log.err(` time: ${time}`);
56+
total += time;
57+
cb(null, null);
58+
});
5359
});
54-
});
55-
}, err => {
56-
if (err) return callback(err, null);
57-
callback(null, total / attempts);
58-
});
59-
}
60+
},
61+
err => {
62+
if (err) return callback(err, null);
63+
callback(null, total / attempts);
64+
}
65+
);
66+
};
6067

61-
function runScenarios(scenarios, attempts, callback) {
68+
let runScenarios = (scenarios, attempts, callback) => {
6269
let results = [];
6370

6471
let next = index => {
6572
let scenario = scenarios[index];
6673

67-
retry(4, cb => {
68-
runScenario(attempts, scenario, cb);
69-
}, (err, averageTime) => {
74+
retry(4, cb => runScenario(attempts, scenario, cb), (err, averageTime) => {
7075
results.push({ averageTime, scenario });
7176
if (err) {
7277
callback(err, null);
@@ -76,42 +81,43 @@ function runScenarios(scenarios, attempts, callback) {
7681
next(index + 1);
7782
}
7883
});
79-
}
84+
};
8085

8186
next(0);
82-
}
87+
};
8388

84-
function createScenarios(): Array<Scenario> {
89+
let createScenarios = (): Array<Scenario> => {
8590
let scenarios = [];
8691

8792
for (let project of PROJECTS) {
88-
let dir = path.resolve(__dirname, '../fixtures', project);
93+
let dir = path.resolve(__dirname, "../fixtures", project);
8994
for (let warmCache of [true, false]) {
9095
for (let nodeModules of [true, false]) {
9196
for (let lockfile of [true, false]) {
92-
for (let command of ['npm', 'yarn']) {
93-
scenarios.push({ command, dir, opts: { warmCache, nodeModules, lockfile } });
97+
for (let command of ["npm", "yarn"]) {
98+
scenarios.push({
99+
command,
100+
dir,
101+
opts: { warmCache, nodeModules, lockfile }
102+
});
94103
}
95104
}
96105
}
97106
}
98107
}
99108

100109
return scenarios;
101-
}
110+
};
102111

103-
function main() {
112+
let main = () => {
104113
let scenarios = createScenarios();
105-
series([
106-
cb => updateNpm(cb),
107-
cb => updateYarn(cb),
108-
], (err) => {
114+
series([cb => updateNpm(cb), cb => updateYarn(cb)], err => {
109115
if (err) return log.err(err.toString());
110116
runScenarios(scenarios, 1, (err, results) => {
111117
if (err) log.err(err.toString());
112118
log.out(JSON.stringify(results, null, 2));
113119
});
114120
});
115-
}
121+
};
116122

117123
main();

‎src/log.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// @flow
2-
export let err = (str: string) => process.stderr.write(str + '\n');
3-
export let out = (str: string) => process.stdout.write(str + '\n');
2+
export let err = (str: string) => process.stderr.write(str + "\n");
3+
export let out = (str: string) => process.stdout.write(str + "\n");

‎src/repos.js

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
// @flow
2-
import {series, retry, run} from './utils';
3-
import {NPM_REPO, YARN_REPO} from './constants';
4-
import type {Callback} from './types';
2+
import { series, retry, run } from "./utils";
3+
import { NPM_REPO, YARN_REPO } from "./constants";
4+
import type { Callback } from "./types";
55

66
let updateCliRepo = (repo: string, callback: Callback<Error, null>) => {
7-
series([
8-
cb => run('git', ['pull', 'origin', 'master'], repo, cb),
9-
cb => run('npm', ['install'], repo, cb),
10-
], err => callback(err, null));
7+
series(
8+
[
9+
cb => run("git", ["pull", "origin", "master"], repo, cb),
10+
cb => run("npm", ["install"], repo, cb)
11+
],
12+
err => callback(err, null)
13+
);
1114
};
1215

1316
export let updateNpm = (callback: Callback<Error, null>) => {
14-
retry(4, retryCb => {
15-
series([
16-
cb => updateCliRepo(NPM_REPO, cb),
17-
], retryCb);
18-
}, err => callback(err, null));
17+
retry(
18+
4,
19+
retryCb => series([cb => updateCliRepo(NPM_REPO, cb)], retryCb),
20+
err => callback(err, null)
21+
);
1922
};
2023

2124
export let updateYarn = (callback: Callback<Error, null>) => {
22-
retry(4, retryCb => {
23-
series([
24-
cb => updateCliRepo(YARN_REPO, cb),
25-
cb => run('npm', ['run', 'build'], YARN_REPO, cb),
26-
], retryCb);
27-
}, err => callback(err, null));
25+
retry(
26+
4,
27+
retryCb => {
28+
series(
29+
[
30+
cb => updateCliRepo(YARN_REPO, cb),
31+
cb => run("npm", ["run", "build"], YARN_REPO, cb)
32+
],
33+
retryCb
34+
);
35+
},
36+
err => callback(err, null)
37+
);
2838
};

0 commit comments

Comments
 (0)