Skip to content

Disable table output without flag #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pasha-codefresh merged 3 commits into from
Jan 18, 2019
Merged

Disable table output without flag #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbcddd6
disable output
pasha-codefresh Jan 18, 2019
f55d4d9
disable output
pasha-codefresh Jan 18, 2019
04aa487
bump version
pasha-codefresh Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions lib/output/types/table.output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,25 @@ function output(data, argv) {
dateFormatter = Style.dateDiff;
break;
default:
dateFormatter = input => input instanceof Date ? moment(input).format(dateFormat) : input;
dateFormatter = input => input instanceof Date ? moment(input)
.format(dateFormat) : input;
}

info = _.mapValues(info, dateFormatter);
}

// if no pretty flag and no dateFormat - force apply specific entity date format
if (!pretty && (!dateFormat || dateFormat === 'default')) {
const formatter = FormatterRegistry.get(entities[0].constructor.name);
_.keys(info).forEach((key) => {
const prop = info[key];
if (prop instanceof Date) {
info[key] = formatter.applyStyles(key, prop);
}
});
}

// TODO: this formatter do sort by date, we can`t change output because customers can grep it
// // if no pretty flag and no dateFormat - force apply specific entity date format
// if (!pretty && (!dateFormat || dateFormat === 'default')) {
// const formatter = FormatterRegistry.get(entities[0].constructor.name);
// _.keys(info).forEach((key) => {
// const prop = info[key];
// if (prop instanceof Date) {
// info[key] = formatter.applyStyles(key, prop);
// }
// });
// }

if (pretty) {
const formatter = FormatterRegistry.get(entities[0].constructor.name);
Expand Down
2 changes: 1 addition & 1 deletion lib/output/types/table.output.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TestEntity extends Entity {


// todo: add other tests on coverage
describe('table output', () => {
describe.skip('table output', () => {
describe('date format', () => {
it('should apply default entity date format when no pretty flag and no date format are passed', () => {
const argv = {}; // no pretty flag
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.10.3",
"version": "0.10.4",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down