Skip to content

Commit

Permalink
Merge pull request #453 from cycaoecw/master
Browse files Browse the repository at this point in the history 
Update for issue #440
  • Loading branch information
@zFernand0
zFernand0 committed Jun 18, 2019
2 parents e575849 + 699d059 commit bc0dd59
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions ...__/__integration__/cli/list/uss/__snapshots__/cli.files.list.uss.integration.test.ts.snap
View file
Expand Up @@ -132,20 +132,20 @@ exports[`List USS file should display the help 1`] = `
- Show the files and directories in path '/u/ibmuser
displaying only the file or directory name:
$ zowe zos-files list uss-files \\"/u/ibmuser --rff name\\"
$ zowe zos-files list uss-files \\"/u/ibmuser\\" --rff name
- Show the files and directories in path '/u/ibmuser'
displaying the headers associated with the file detail:
$ zowe zos-files list uss-files \\"/u/ibmuser --rfh\\"
$ zowe zos-files list uss-files \\"/u/ibmuser\\" --rfh
================Z/OS CFILES LIST DATA SET HELP WITH RFJ===========
{
\\"success\\": true,
\\"exitCode\\": 0,
\\"message\\": \\"The help was constructed for command: uss-files.\\",
\\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n uss-files | uss\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n List USS files and directories in a UNIX file path\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-files list uss-files <path> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n path\\\\t\\\\t (string)\\\\n\\\\n The directory containing the files and directories to be listed\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --max-length | --max (number)\\\\n\\\\n The option --max-length specifies the maximum number of items to return. Skip\\\\n this parameter to return all items. If you specify an incorrect value, the\\\\n parameter returns up to 1000 items.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Show the files and directories in path '/u/ibmuser':\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser\\\\n displaying only the file or directory name:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser --rff name\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser'\\\\n displaying the headers associated with the file detail:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser --rfh\\\\\\"\\\\n\\\\n\\",
\\"stdout\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n uss-files | uss\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n List USS files and directories in a UNIX file path\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-files list uss-files <path> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n path\\\\t\\\\t (string)\\\\n\\\\n The directory containing the files and directories to be listed\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --max-length | --max (number)\\\\n\\\\n The option --max-length specifies the maximum number of items to return. Skip\\\\n this parameter to return all items. If you specify an incorrect value, the\\\\n parameter returns up to 1000 items.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Show the files and directories in path '/u/ibmuser':\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser\\\\n displaying only the file or directory name:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\" --rff name\\\\n\\\\n - Show the files and directories in path '/u/ibmuser'\\\\n displaying the headers associated with the file detail:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\" --rfh\\\\n\\\\n\\",
\\"stderr\\": \\"\\",
\\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n uss-files | uss\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n List USS files and directories in a UNIX file path\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-files list uss-files <path> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n path\\\\t\\\\t (string)\\\\n\\\\n The directory containing the files and directories to be listed\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --max-length | --max (number)\\\\n\\\\n The option --max-length specifies the maximum number of items to return. Skip\\\\n this parameter to return all items. If you specify an incorrect value, the\\\\n parameter returns up to 1000 items.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Show the files and directories in path '/u/ibmuser':\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser\\\\n displaying only the file or directory name:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser --rff name\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser'\\\\n displaying the headers associated with the file detail:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser --rfh\\\\\\"\\\\n\\\\n\\"
\\"data\\": \\"\\\\n COMMAND NAME\\\\n ------------\\\\n\\\\n uss-files | uss\\\\n\\\\n DESCRIPTION\\\\n -----------\\\\n\\\\n List USS files and directories in a UNIX file path\\\\n\\\\n USAGE\\\\n -----\\\\n\\\\n zowe zos-files list uss-files <path> [options]\\\\n\\\\n POSITIONAL ARGUMENTS\\\\n --------------------\\\\n\\\\n path\\\\t\\\\t (string)\\\\n\\\\n The directory containing the files and directories to be listed\\\\n\\\\n OPTIONS\\\\n -------\\\\n\\\\n --max-length | --max (number)\\\\n\\\\n The option --max-length specifies the maximum number of items to return. Skip\\\\n this parameter to return all items. If you specify an incorrect value, the\\\\n parameter returns up to 1000 items.\\\\n\\\\n ZOSMF CONNECTION OPTIONS\\\\n ------------------------\\\\n\\\\n --host | -H (string)\\\\n\\\\n The z/OSMF server host name.\\\\n\\\\n --port | -P (number)\\\\n\\\\n The z/OSMF server port.\\\\n\\\\n Default value: 443\\\\n\\\\n --user | -u (string)\\\\n\\\\n Mainframe (z/OSMF) user name, which can be the same as your TSO login.\\\\n\\\\n --password | --pass | --pw (string)\\\\n\\\\n Mainframe (z/OSMF) password, which can be the same as your TSO password.\\\\n\\\\n --reject-unauthorized | --ru (boolean)\\\\n\\\\n Reject self-signed certificates.\\\\n\\\\n Default value: true\\\\n\\\\n --base-path | --bp (string)\\\\n\\\\n The base path for your API mediation layer instance. Specify this option to\\\\n prepend the base path to all z/OSMF resources when making REST requests. Do not\\\\n specify this option if you are not using an API mediation layer.\\\\n\\\\n PROFILE OPTIONS\\\\n ---------------\\\\n\\\\n --zosmf-profile | --zosmf-p (string)\\\\n\\\\n The name of a (zosmf) profile to load for this command execution.\\\\n\\\\n RESPONSE FORMAT OPTIONS\\\\n -----------------------\\\\n\\\\n --response-format-filter | --rff (array)\\\\n\\\\n Filter (include) fields in the response. Accepts an array of field/property\\\\n names to include in the output response. You can filter JSON objects properties\\\\n OR table columns/fields. In addition, you can use this option in conjunction\\\\n with '--response-format-type' to reduce the output of a command to a single\\\\n field/property or a list of a single field/property.\\\\n\\\\n --response-format-type | --rft (string)\\\\n\\\\n The command response output format type. Must be one of the following:\\\\n\\\\n table: Formats output data as a table. Use this option when the output data is\\\\n an array of homogeneous JSON objects. Each property of the object will become a\\\\n column in the table.\\\\n\\\\n list: Formats output data as a list of strings. Can be used on any data type\\\\n (JSON objects/arrays) are stringified and a new line is added after each entry\\\\n in an array.\\\\n\\\\n object: Formats output data as a list of prettified objects (or single object).\\\\n Can be used in place of \\\\\\"table\\\\\\" to change from tabular output to a list of\\\\n prettified objects.\\\\n\\\\n string: Formats output data as a string. JSON objects/arrays are stringified.\\\\n\\\\n Allowed values: table, list, object, string\\\\n\\\\n --response-format-header | --rfh (boolean)\\\\n\\\\n If \\\\\\"--response-format-type table\\\\\\" is specified, include the column headers in\\\\n the output.\\\\n\\\\n GLOBAL OPTIONS\\\\n --------------\\\\n\\\\n --response-format-json | --rfj (boolean)\\\\n\\\\n Produce JSON formatted data from a command\\\\n\\\\n --help | -h (boolean)\\\\n\\\\n Display help text\\\\n\\\\n\\\\n EXAMPLES\\\\n --------\\\\n\\\\n - Show the files and directories in path '/u/ibmuser':\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\"\\\\n\\\\n - Show the files and directories in path '/u/ibmuser\\\\n displaying only the file or directory name:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\" --rff name\\\\n\\\\n - Show the files and directories in path '/u/ibmuser'\\\\n displaying the headers associated with the file detail:\\\\n\\\\n $ zowe zos-files list uss-files \\\\\\"/u/ibmuser\\\\\\" --rfh\\\\n\\\\n\\"
}"
`;
4 changes: 2 additions & 2 deletions packages/zosfiles/__tests__/cli/list/uss/__snapshots__/Uss.definition.unit.test.ts.snap
View file
Expand Up @@ -21,11 +21,11 @@ Array [
},
Object {
"description": "Show the files and directories in path '/u/ibmuser displaying only the file or directory name",
"options": "\\"/u/ibmuser --rff name\\"",
"options": "\\"/u/ibmuser\\" --rff name",
},
Object {
"description": "Show the files and directories in path '/u/ibmuser' displaying the headers associated with the file detail",
"options": "\\"/u/ibmuser --rfh\\"",
"options": "\\"/u/ibmuser\\" --rfh",
},
]
`;
4 changes: 2 additions & 2 deletions packages/zosfiles/src/cli/list/uss/UssFile.definition.ts
View file
Expand Up @@ -50,11 +50,11 @@ export const USSFileDefinition: ICommandDefinition = {
},
{
description: strings.EXAMPLES.EX2,
options: `"/u/ibmuser --rff name"`
options: `"/u/ibmuser" --rff name`
},
{
description: strings.EXAMPLES.EX3,
options: `"/u/ibmuser --rfh"`
options: `"/u/ibmuser" --rfh`
}
]
};

0 comments on commit bc0dd59

Please sign in to comment.