Skip to content

Commit 99156e0

Browse files
zkatzkat
committed
team: stop using npm-registry-client
1 parent 8971ba1 commit 99156e0

2 files changed

Lines changed: 160 additions & 36 deletions

File tree

‎lib/team.js‎

Lines changed: 136 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
11
/* eslint-disable standard/no-callback-literal */
2-
var mapToRegistry = require('./utils/map-to-registry.js')
3-
var npm = require('./npm')
4-
var output = require('./utils/output.js')
2+
3+
const columns = require('cli-columns')
4+
const figgyPudding = require('figgy-pudding')
5+
const libteam = require('libnpm/team')
6+
const npmConfig = require('./config/figgy-config.js')
7+
const output = require('./utils/output.js')
8+
const otplease = require('./utils/otplease.js')
9+
const usage = require('./utils/usage')
510

611
module.exports = team
712

813
team.subcommands = ['create', 'destroy', 'add', 'rm', 'ls', 'edit']
914

10-
team.usage =
15+
team.usage = usage(
16+
'team',
1117
'npm team create <scope:team>\n' +
1218
'npm team destroy <scope:team>\n' +
1319
'npm team add <scope:team> <user>\n' +
1420
'npm team rm <scope:team> <user>\n' +
1521
'npm team ls <scope>|<scope:team>\n' +
1622
'npm team edit <scope:team>'
23+
)
24+
25+
const TeamConfig = figgyPudding({
26+
json: {},
27+
loglevel: {},
28+
parseable: {},
29+
silent: {}
30+
})
31+
32+
function UsageError () {
33+
throw Object.assign(new Error(team.usage), {code: 'EUSAGE'})
34+
}
1735

1836
team.completion = function (opts, cb) {
1937
var argv = opts.conf.argv.remain
@@ -33,24 +51,121 @@ team.completion = function (opts, cb) {
3351
}
3452
}
3553

36-
function team (args, cb) {
54+
function team ([cmd, entity = '', user = ''], cb) {
3755
// Entities are in the format <scope>:<team>
38-
var cmd = args.shift()
39-
var entity = (args.shift() || '').split(':')
40-
return mapToRegistry('/', npm.config, function (err, uri, auth) {
41-
if (err) { return cb(err) }
42-
try {
43-
return npm.registry.team(cmd, uri, {
44-
auth: auth,
45-
scope: entity[0].replace(/^@/, ''), // '@' prefix on scope is optional.
46-
team: entity[1],
47-
user: args.shift()
48-
}, function (err, data) {
49-
!err && data && output(JSON.stringify(data, undefined, 2))
50-
cb(err, data)
51-
})
52-
} catch (e) {
53-
cb(e.message + '\n\nUsage:\n' + team.usage)
56+
otplease(npmConfig(), opts => {
57+
opts = TeamConfig(opts).concat({description: null})
58+
entity = entity.replace(/^@/, '')
59+
switch (cmd) {
60+
case 'create': return teamCreate(entity, opts)
61+
case 'destroy': return teamDestroy(entity, opts)
62+
case 'add': return teamAdd(entity, user, opts)
63+
case 'rm': return teamRm(entity, user, opts)
64+
case 'ls': {
65+
const match = entity.match(/[^:]+:.+/)
66+
if (match) {
67+
return teamListUsers(entity, opts)
68+
} else {
69+
return teamListTeams(entity, opts)
70+
}
71+
}
72+
case 'edit':
73+
throw new Error('`npm team edit` is not implemented yet.')
74+
default:
75+
UsageError()
76+
}
77+
}).then(
78+
data => cb(null, data),
79+
err => err.code === 'EUSAGE' ? cb(err.message) : cb(err)
80+
)
81+
}
82+
83+
function teamCreate (entity, opts) {
84+
return libteam.create(entity, opts).then(() => {
85+
if (opts.json) {
86+
output(JSON.stringify({
87+
created: true,
88+
team: entity
89+
}))
90+
} else if (opts.parseable) {
91+
output(`${entity}\tcreated`)
92+
} else if (!opts.silent && opts.loglevel !== 'silent') {
93+
output(`+@${entity}`)
94+
}
95+
})
96+
}
97+
98+
function teamDestroy (entity, opts) {
99+
return libteam.destroy(entity, opts).then(() => {
100+
if (opts.json) {
101+
output(JSON.stringify({
102+
deleted: true,
103+
team: entity
104+
}))
105+
} else if (opts.parseable) {
106+
output(`${entity}\tdeleted`)
107+
} else if (!opts.silent && opts.loglevel !== 'silent') {
108+
output(`-@${entity}`)
109+
}
110+
})
111+
}
112+
113+
function teamAdd (entity, user, opts) {
114+
return libteam.add(user, entity, opts).then(() => {
115+
if (opts.json) {
116+
output(JSON.stringify({
117+
added: true,
118+
team: entity,
119+
user
120+
}))
121+
} else if (opts.parseable) {
122+
output(`${user}\t${entity}\tadded`)
123+
} else if (!opts.silent && opts.loglevel !== 'silent') {
124+
output(`${user} added to @${entity}`)
125+
}
126+
})
127+
}
128+
129+
function teamRm (entity, user, opts) {
130+
return libteam.rm(user, entity, opts).then(() => {
131+
if (opts.json) {
132+
output(JSON.stringify({
133+
removed: true,
134+
team: entity,
135+
user
136+
}))
137+
} else if (opts.parseable) {
138+
output(`${user}\t${entity}\tremoved`)
139+
} else if (!opts.silent && opts.loglevel !== 'silent') {
140+
output(`${user} removed from @${entity}`)
141+
}
142+
})
143+
}
144+
145+
function teamListUsers (entity, opts) {
146+
return libteam.lsUsers(entity, opts).then(users => {
147+
users = users.sort()
148+
if (opts.json) {
149+
output(JSON.stringify(users, null, 2))
150+
} else if (opts.parseable) {
151+
output(users.join('\n'))
152+
} else if (!opts.silent && opts.loglevel !== 'silent') {
153+
output(`\n@${entity} has ${users.length} user${users.length === 1 ? '' : 's'}:\n`)
154+
output(columns(users, {padding: 1}))
155+
}
156+
})
157+
}
158+
159+
function teamListTeams (entity, opts) {
160+
return libteam.lsTeams(entity, opts).then(teams => {
161+
teams = teams.sort()
162+
if (opts.json) {
163+
output(JSON.stringify(teams, null, 2))
164+
} else if (opts.parseable) {
165+
output(teams.join('\n'))
166+
} else if (!opts.silent && opts.loglevel !== 'silent') {
167+
output(`\n@${entity} has ${teams.length} team${teams.length === 1 ? '' : 's'}:\n`)
168+
output(columns(teams.map(t => `@${t}`), {padding: 1}))
54169
}
55170
})
56171
}

‎test/tap/team.js‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,19 @@ test('team create basic', function (t) {
2222
deleted: null
2323
}
2424
server.put('/-/org/myorg/team', JSON.stringify({
25-
name: teamData.name
25+
name: teamData.name,
26+
description: null
2627
})).reply(200, teamData)
2728
common.npm([
2829
'team', 'create', 'myorg:' + teamData.name,
2930
'--registry', common.registry,
30-
'--loglevel', 'silent'
31+
'--loglevel', 'error',
32+
'--json'
3133
], {}, function (err, code, stdout, stderr) {
3234
t.ifError(err, 'npm team')
3335
t.equal(code, 0, 'exited OK')
3436
t.equal(stderr, '', 'no error output')
35-
t.same(JSON.parse(stdout), teamData)
37+
t.same(JSON.parse(stdout), {created: true, team: `myorg:${teamData.name}`})
3638
t.end()
3739
})
3840
})
@@ -46,17 +48,19 @@ test('team create (allow optional @ prefix on scope)', function (t) {
4648
deleted: null
4749
}
4850
server.put('/-/org/myorg/team', JSON.stringify({
49-
name: teamData.name
51+
name: teamData.name,
52+
description: null
5053
})).reply(200, teamData)
5154
common.npm([
5255
'team', 'create', '@myorg:' + teamData.name,
5356
'--registry', common.registry,
54-
'--loglevel', 'silent'
57+
'--loglevel', 'silent',
58+
'--json'
5559
], {}, function (err, code, stdout, stderr) {
5660
t.ifError(err, 'npm team')
5761
t.equal(code, 0, 'exited OK')
5862
t.equal(stderr, '', 'no error output')
59-
t.same(JSON.parse(stdout), teamData)
63+
t.same(JSON.parse(stdout), {created: true, team: `myorg:${teamData.name}`})
6064
t.end()
6165
})
6266
})
@@ -73,12 +77,13 @@ test('team destroy', function (t) {
7377
common.npm([
7478
'team', 'destroy', 'myorg:' + teamData.name,
7579
'--registry', common.registry,
76-
'--loglevel', 'silent'
80+
'--loglevel', 'silent',
81+
'--json'
7782
], {}, function (err, code, stdout, stderr) {
7883
t.ifError(err, 'npm team')
7984
t.equal(code, 0, 'exited OK')
8085
t.equal(stderr, '', 'no error output')
81-
t.same(JSON.parse(stdout), teamData)
86+
t.same(JSON.parse(stdout), {deleted: true, team: `myorg:${teamData.name}`})
8287
t.end()
8388
})
8489
})
@@ -87,11 +92,12 @@ test('team add', function (t) {
8792
var user = 'zkat'
8893
server.put('/-/team/myorg/myteam/user', JSON.stringify({
8994
user: user
90-
})).reply(200)
95+
})).reply(200, {})
9196
common.npm([
9297
'team', 'add', 'myorg:myteam', user,
9398
'--registry', common.registry,
94-
'--loglevel', 'silent'
99+
'--loglevel', 'error',
100+
'--json'
95101
], {}, function (err, code, stdout, stderr) {
96102
t.ifError(err, 'npm team')
97103
t.equal(code, 0, 'exited OK')
@@ -104,11 +110,12 @@ test('team rm', function (t) {
104110
var user = 'zkat'
105111
server.delete('/-/team/myorg/myteam/user', JSON.stringify({
106112
user: user
107-
})).reply(200)
113+
})).reply(200, {})
108114
common.npm([
109115
'team', 'rm', 'myorg:myteam', user,
110116
'--registry', common.registry,
111-
'--loglevel', 'silent'
117+
'--loglevel', 'silent',
118+
'--json'
112119
], {}, function (err, code, stdout, stderr) {
113120
t.ifError(err, 'npm team')
114121
t.equal(code, 0, 'exited OK')
@@ -123,7 +130,8 @@ test('team ls (on org)', function (t) {
123130
common.npm([
124131
'team', 'ls', 'myorg',
125132
'--registry', common.registry,
126-
'--loglevel', 'silent'
133+
'--loglevel', 'silent',
134+
'--json'
127135
], {}, function (err, code, stdout, stderr) {
128136
t.ifError(err, 'npm team')
129137
t.equal(code, 0, 'exited OK')
@@ -139,12 +147,13 @@ test('team ls (on team)', function (t) {
139147
common.npm([
140148
'team', 'ls', 'myorg:myteam',
141149
'--registry', common.registry,
142-
'--loglevel', 'silent'
150+
'--loglevel', 'silent',
151+
'--json'
143152
], {}, function (err, code, stdout, stderr) {
144153
t.ifError(err, 'npm team')
145154
t.equal(code, 0, 'exited OK')
146155
t.equal(stderr, '', 'no error output')
147-
t.same(JSON.parse(stdout), users)
156+
t.same(JSON.parse(stdout).sort(), users.sort())
148157
t.end()
149158
})
150159
})

0 commit comments

Comments
 (0)
⚡