Add mkdir (#45)

* Add makeDirectory() Signed-off-by: Qi Liang <[email protected]> * Bump up version to 1.0.6 Signed-off-by: Qi Liang <[email protected]> * Add makeDirectory() Signed-off-by: Qi Liang <[email protected]> * Fix typo in deleteJob() Signed-off-by: Qi Liang <[email protected]>
IBM · Jan 6, 2020 · 6d5f245 · 6d5f245
1 parent 522e337
commit 6d5f245
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ This accessor leverages z/OS FTP server to interact with z/OS, it requires `JESI
 * [Connection](#connection)
 * [MVS dataset or USS files](#mvs-dataset-or-uss-files)
   * [Allocate](#allocate)
+  * [Make directory](#make-directory)
   * [List](#list)
   * [Upload](#upload-mvs-dataset-or-uss-file)
   * [Read](#read-mvs-dataset-or-uss-file)
@@ -146,6 +147,30 @@ connection.allocateDataset('ABC.PDS', {'LRECL': 80, 'RECFM': 'FB', 'BLKSIZE': 32
   });
 ```
 
+#### Make directory
+
+`makeDirectory(directoryName)` - Make USS directory with the given directory name.
+
+##### Parameter
+
+* datasetName - _string_ -  Dataset name to allocate.
+
+##### Return
+
+A promise that resolves on success, rejects on error.
+
+##### Example
+
+```js
+connection.makeDirectory('/u/user/my_directory'})
+  .then(function() {
+    console.log('Success');
+  })
+  .catch(function(err) {
+    // handle error
+  });
+```
+
 #### List
 
 `listDataset(dsnOrDir)` - List MVS datasets or USS files

diff --git a/lib/zosAccessor.js b/lib/zosAccessor.js
@@ -1,6 +1,6 @@
 /****************************************************************************/
 /*                                                                          */
-/* Copyright (c) 2017,2018 IBM Corp.                                             */
+/* Copyright (c) 2017,2020 IBM Corp.                                        */
 /* All rights reserved. This program and the accompanying materials         */
 /* are made available under the terms of the Eclipse Public License v1.0    */
 /* which accompanies this distribution, and is available at                 */
@@ -93,6 +93,24 @@ function allocateParamsToString(allocateParams) {
     return params.join(' ');
 }
 
+/**
+ * Makes USS directory with the given directory name.
+ * 
+ * @param {string} directoryName - Directory name
+ */
+ZosAccessor.prototype.makeDirectory = function(directoryName) {
+    var ftpClient = this.client;
+    var deferred = Q.defer();
+    ftpClient.mkdir(directoryName, function (err) {
+        if (err) {
+            deferred.reject(err);
+        } else {
+            deferred.resolve();
+        }
+    });
+    return deferred.promise;
+}
+
 /**
  * Allocate sequential or partition (with the DCB attribut "DSORG=PO") dataset. 
  *
@@ -285,7 +303,18 @@ ZosAccessor.prototype.parseUSSDirList = function (dirList) {
         for(var i=0; i<headers.length; ++i) {
             entry[headers[i]] = fields[i];
         }
-        entry['lastModified'] = new Date(fields[7], monthText.indexOf(fields[5]), fields[6]);
+        if (entry['permissions'] && entry['permissions'].length > 0 && entry['permissions'][0]) {
+            // drwx------
+            entry['isDirectory'] = entry['permissions'][0] === 'd';
+        }
+        if (fields[7].indexOf(':') === -1) {
+            // May  8  2017
+            entry['lastModified'] = new Date(fields[7], monthText.indexOf(fields[5]), fields[6]);
+        } else {
+            // Oct  2 09:48
+            var now = new Date();
+            entry['lastModified'] = new Date(now.getFullYear(), monthText.indexOf(fields[5]), fields[6]);
+        }
         entry['name'] = fields.slice(8).join(' ');
         entries.push(entry);
     });
@@ -953,7 +982,7 @@ ZosAccessor.prototype.deleteJob = function (jobIdOrOption) {
     var option = {};
     if (typeof jobIdOrOption === 'string') {
         option = { jobId: jobIdOrOption, owner: this.username };
-    } else if (typeof jobNameOrOption === 'object') {
+    } else if (typeof jobIdOrOption === 'object') {
         option.jobId = option.jobId;
         option.owner = option.owner || this.username;
     } else {