Skip to content

Commit 6b7f7e4

Browse files
committed
Refactor prettyLevel.
Signed-off-by: Eric Wang <[email protected]>
1 parent c86884d commit 6b7f7e4

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

Diff for: lib/commands/list.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var _ = require('underscore');
2+
var sprintf = require('sprintf-js').sprintf;
23

34
var h = require('../helper');
45
var chalk = require('../chalk');
@@ -132,7 +133,7 @@ cmd.handler = function(argv) {
132133
h.prettyState(problem.state),
133134
problem.id,
134135
problem.name,
135-
h.prettyLevel(problem.level),
136+
h.prettyLevel(sprintf('%-6s', problem.level)),
136137
problem.percent);
137138
});
138139

Diff for: lib/helper.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ h.prettyTime = function(n) {
8989

9090
h.prettyLevel = function(level) {
9191
var chalk = require('./chalk');
92-
switch (level.toLowerCase()) {
93-
case 'easy': return chalk.green(level + ' ');
92+
switch (level.toLowerCase().trim()) {
93+
case 'easy': return chalk.green(level);
9494
case 'medium': return chalk.yellow(level);
95-
case 'hard': return chalk.red(level + ' ');
95+
case 'hard': return chalk.red(level);
9696
default: return level;
9797
}
9898
};

Diff for: test/test_helper.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ describe('helper', function() {
5050
it('should ok w/ color', function() {
5151
chalk.enabled = true;
5252

53-
assert.equal(h.prettyLevel('Easy'), chalk.green('Easy '));
53+
assert.equal(h.prettyLevel('Easy'), chalk.green('Easy'));
5454
assert.equal(h.prettyLevel('Medium'), chalk.yellow('Medium'));
55-
assert.equal(h.prettyLevel('Hard'), chalk.red('Hard '));
56-
assert.equal(h.prettyLevel('easy'), chalk.green('easy '));
55+
assert.equal(h.prettyLevel('Hard'), chalk.red('Hard'));
56+
assert.equal(h.prettyLevel('easy '), chalk.green('easy '));
5757
assert.equal(h.prettyLevel('medium'), chalk.yellow('medium'));
58-
assert.equal(h.prettyLevel('hard'), chalk.red('hard '));
58+
assert.equal(h.prettyLevel('hard '), chalk.red('hard '));
5959
assert.equal(h.prettyLevel('unknown'), 'unknown');
6060
});
6161
}); // #prettyLevel

0 commit comments

Comments
 (0)