Skip to content

Commit fb6e2dd

Browse files
wraithgarwraithgar
committed
fix(log): pass in logger to more external modules
We missed two commands in the last PR. This should complete the task
1 parent b836d59 commit fb6e2dd

4 files changed

Lines changed: 51 additions & 29 deletions

File tree

‎lib/commands/org.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const liborg = require('libnpmorg')
22
const otplease = require('../utils/otplease.js')
33
const Table = require('cli-table3')
44
const BaseCommand = require('../base-command.js')
5+
const log = require('../utils/log-shim.js')
56

67
class Org extends BaseCommand {
78
static description = 'Manage orgs'
@@ -32,7 +33,10 @@ class Org extends BaseCommand {
3233
}
3334

3435
async exec ([cmd, orgname, username, role], cb) {
35-
return otplease(this.npm.flatOptions, opts => {
36+
return otplease({
37+
...this.npm.flatOptions,
38+
log,
39+
}, opts => {
3640
switch (cmd) {
3741
case 'add':
3842
case 'set':

‎lib/commands/unpublish.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class Unpublish extends BaseCommand {
8484
)
8585
}
8686

87-
const opts = this.npm.flatOptions
87+
const opts = { ...this.npm.flatOptions, log }
8888
if (!spec || path.resolve(spec.name) === this.npm.localPrefix) {
8989
// if there's a package.json in the current folder, then
9090
// read the package name and version out of that.

‎test/lib/commands/org.js‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ t.test('npm org add', async t => {
8383

8484
await org.exec(['add', 'orgname', 'username'])
8585

86-
t.strictSame(
86+
t.ok(orgSetArgs.opts.log, 'got passed a logger')
87+
t.match(
8788
orgSetArgs,
8889
{
8990
org: 'orgname',
@@ -148,7 +149,8 @@ t.test('npm org add - more users', async t => {
148149
})
149150

150151
await org.exec(['add', 'orgname', 'username'])
151-
t.strictSame(
152+
t.ok(orgSetArgs.opts.log, 'got passed a logger')
153+
t.match(
152154
orgSetArgs,
153155
{
154156
org: 'orgname',
@@ -175,7 +177,8 @@ t.test('npm org add - json output', async t => {
175177

176178
await org.exec(['add', 'orgname', 'username'])
177179

178-
t.strictSame(
180+
t.ok(orgSetArgs.opts.log, 'got passed a logger')
181+
t.match(
179182
orgSetArgs,
180183
{
181184
org: 'orgname',
@@ -209,7 +212,8 @@ t.test('npm org add - parseable output', async t => {
209212

210213
await org.exec(['add', 'orgname', 'username'])
211214

212-
t.strictSame(
215+
t.ok(orgSetArgs.opts.log, 'got passed a logger')
216+
t.match(
213217
orgSetArgs,
214218
{
215219
org: 'orgname',
@@ -239,7 +243,8 @@ t.test('npm org add - silent output', async t => {
239243

240244
await org.exec(['add', 'orgname', 'username'])
241245

242-
t.strictSame(
246+
t.ok(orgSetArgs.opts.log, 'got passed a logger')
247+
t.match(
243248
orgSetArgs,
244249
{
245250
org: 'orgname',
@@ -261,7 +266,8 @@ t.test('npm org rm', async t => {
261266

262267
await org.exec(['rm', 'orgname', 'username'])
263268

264-
t.strictSame(
269+
t.ok(orgRmArgs.opts.log, 'got passed a logger')
270+
t.match(
265271
orgRmArgs,
266272
{
267273
org: 'orgname',
@@ -270,7 +276,8 @@ t.test('npm org rm', async t => {
270276
},
271277
'libnpmorg.rm received the correct args'
272278
)
273-
t.strictSame(
279+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
280+
t.match(
274281
orgLsArgs,
275282
{
276283
org: 'orgname',
@@ -323,7 +330,8 @@ t.test('npm org rm - one user left', async t => {
323330

324331
await org.exec(['rm', 'orgname', 'username'])
325332

326-
t.strictSame(
333+
t.ok(orgRmArgs.opts.log, 'got passed a logger')
334+
t.match(
327335
orgRmArgs,
328336
{
329337
org: 'orgname',
@@ -332,7 +340,8 @@ t.test('npm org rm - one user left', async t => {
332340
},
333341
'libnpmorg.rm received the correct args'
334342
)
335-
t.strictSame(
343+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
344+
t.match(
336345
orgLsArgs,
337346
{
338347
org: 'orgname',
@@ -358,7 +367,8 @@ t.test('npm org rm - json output', async t => {
358367

359368
await org.exec(['rm', 'orgname', 'username'])
360369

361-
t.strictSame(
370+
t.ok(orgRmArgs.opts.log, 'got passed a logger')
371+
t.match(
362372
orgRmArgs,
363373
{
364374
org: 'orgname',
@@ -367,7 +377,8 @@ t.test('npm org rm - json output', async t => {
367377
},
368378
'libnpmorg.rm received the correct args'
369379
)
370-
t.strictSame(
380+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
381+
t.match(
371382
orgLsArgs,
372383
{
373384
org: 'orgname',
@@ -398,7 +409,8 @@ t.test('npm org rm - parseable output', async t => {
398409

399410
await org.exec(['rm', 'orgname', 'username'])
400411

401-
t.strictSame(
412+
t.ok(orgRmArgs.opts.log, 'got passed a logger')
413+
t.match(
402414
orgRmArgs,
403415
{
404416
org: 'orgname',
@@ -407,7 +419,8 @@ t.test('npm org rm - parseable output', async t => {
407419
},
408420
'libnpmorg.rm received the correct args'
409421
)
410-
t.strictSame(
422+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
423+
t.match(
411424
orgLsArgs,
412425
{
413426
org: 'orgname',
@@ -436,7 +449,8 @@ t.test('npm org rm - silent output', async t => {
436449

437450
await org.exec(['rm', 'orgname', 'username'])
438451

439-
t.strictSame(
452+
t.ok(orgRmArgs.opts.log, 'got passed a logger')
453+
t.match(
440454
orgRmArgs,
441455
{
442456
org: 'orgname',
@@ -445,7 +459,8 @@ t.test('npm org rm - silent output', async t => {
445459
},
446460
'libnpmorg.rm received the correct args'
447461
)
448-
t.strictSame(
462+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
463+
t.match(
449464
orgLsArgs,
450465
{
451466
org: 'orgname',
@@ -470,7 +485,8 @@ t.test('npm org ls', async t => {
470485

471486
await org.exec(['ls', 'orgname'])
472487

473-
t.strictSame(
488+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
489+
t.match(
474490
orgLsArgs,
475491
{
476492
org: 'orgname',
@@ -497,7 +513,8 @@ t.test('npm org ls - user filter', async t => {
497513

498514
await org.exec(['ls', 'orgname', 'username'])
499515

500-
t.strictSame(
516+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
517+
t.match(
501518
orgLsArgs,
502519
{
503520
org: 'orgname',
@@ -522,7 +539,8 @@ t.test('npm org ls - user filter, missing user', async t => {
522539

523540
await org.exec(['ls', 'orgname', 'username'])
524541

525-
t.strictSame(
542+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
543+
t.match(
526544
orgLsArgs,
527545
{
528546
org: 'orgname',
@@ -560,7 +578,8 @@ t.test('npm org ls - json output', async t => {
560578

561579
await org.exec(['ls', 'orgname'])
562580

563-
t.strictSame(
581+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
582+
t.match(
564583
orgLsArgs,
565584
{
566585
org: 'orgname',
@@ -587,7 +606,8 @@ t.test('npm org ls - parseable output', async t => {
587606

588607
await org.exec(['ls', 'orgname'])
589608

590-
t.strictSame(
609+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
610+
t.match(
591611
orgLsArgs,
592612
{
593613
org: 'orgname',
@@ -623,7 +643,8 @@ t.test('npm org ls - silent output', async t => {
623643

624644
await org.exec(['ls', 'orgname'])
625645

626-
t.strictSame(
646+
t.ok(orgLsArgs.opts.log, 'got passed a logger')
647+
t.match(
627648
orgLsArgs,
628649
{
629650
org: 'orgname',

‎test/lib/commands/unpublish.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ t.test('no args --force', async t => {
7676

7777
const libnpmpublish = {
7878
unpublish (spec, opts) {
79+
t.ok(opts.log, 'gets passed a logger')
7980
t.equal(spec.raw, 'pkg@1.0.0', 'should unpublish expected spec')
80-
t.same(
81+
t.match(
8182
opts,
8283
{
8384
publishConfig: undefined,
@@ -177,12 +178,8 @@ t.test('unpublish <pkg>@version', async t => {
177178

178179
const libnpmpublish = {
179180
unpublish (spec, opts) {
181+
t.ok(opts.log, 'gets passed a logger')
180182
t.equal(spec.raw, 'pkg@1.0.0', 'should unpublish expected parsed spec')
181-
t.same(
182-
opts,
183-
{},
184-
'should unpublish with expected opts'
185-
)
186183
},
187184
}
188185

0 commit comments

Comments
 (0)