sftp-promises - npm Package Compare versions

Comparing version 1.3.0 to 1.4.0

index.js

@@ -113,9 +113,7 @@ var Client = require('ssh2').Client
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.stat(location, function (err, stat) {
         if (err) {
-          reject(err)
-          return
+          return reject(err)
         }
@@ -152,9 +150,7 @@ var attrs = statToAttrs(stat)
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.stat(location, function (err, stat) {
         if (err) {
-          reject(err)
-          return
+          return reject(err)
         }
@@ -189,14 +185,11 @@ var attrs = statToAttrs(stat)
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.open(location, 'r', function (err, handle) {
         if (err) {
-          reject(err)
-          return
+          return reject(err)
         }
         sftp.fstat(handle, function (err, stat) {
           if (err) { 
-            reject(err)
-            return
+            return reject(err)
           }
@@ -206,4 +199,3 @@ var bytes = stat.size
           if (bytes === 0) {
-            resolve(buffer)
-            return
+            return resolve(buffer)
           }
@@ -213,4 +205,3 @@ buffer.fill(0)
             if (err) {
-              reject(err)
-              return
+              return reject(err)
             }
@@ -251,14 +242,11 @@ position = position + readBytes
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.open(location, 'w', function (err, handle) {
         if (err) {
-          reject(err)
-          return
+          return reject(err)
         }
         sftp.write(handle, buffer, 0, buffer.length, 0, function (err) {
           if (err) {
-            reject(err)
-            return
+            return reject(err)
           } else {
@@ -292,4 +280,3 @@ resolve(true)
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
@@ -319,4 +306,3 @@ sftp.fastGet(remote, local, function (err) {
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
@@ -371,4 +357,3 @@ sftp.fastPut(local, remote, function (err) {
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
@@ -397,10 +382,9 @@ sftp.rename(src, dest, function (err) {
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.rmdir(path, function (err) {
         if (err) {
-          reject(err)
+          return reject(err)
         } else {
-          resolve(true)
+          return resolve(true)
         }
@@ -423,10 +407,9 @@ })
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.mkdir(path, function (err) {
         if (err) {
-          reject(err)
+          return reject(err)
         } else {
-          resolve(true)
+          return resolve(true)
         }
@@ -450,13 +433,10 @@ })
       if (!writableStream.writable) {
-        reject(new Error('Stream must be a writable stream'))
-        return
+        return reject(new Error('Stream must be a writable stream'))
       }
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       sftp.stat(path, function (err, stat) {
         if (err) {
-          reject(err)
-          return
+          return reject(err)
         }
@@ -470,4 +450,3 @@ var bytes = stat.size
         } catch(err) {
-          reject(err)
-          return
+          return reject(err)
         }
@@ -498,8 +477,6 @@ stream.pipe(writableStream)
       if (!readableStream.readable) {
-        reject(new Error('Stream must be a readable stream'))
-        return
+        return reject(new Error('Stream must be a readable stream'))
       }
       if (err) {
-        reject(err)
-        return
+        return reject(err)
       }
@@ -509,11 +486,10 @@ try {
       } catch (err) {
-        reject(err)
-        return
+        return reject(err)
       }
       readableStream.pipe(stream)
       stream.on('finish', function () {
-        resolve(true)
+        return resolve(true)
       })
       stream.on('error', function (err) {
-        reject(err)
+        return reject(err)
       })
@@ -520,0 +496,0 @@ }

package.json

 {
   "name": "sftp-promises",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "SFTP Promise wrapper for ssh2 SFTP commands",
@@ -25,3 +25,4 @@ "main": "index.js",
   "dependencies": {
-    "ssh2": "^0.4.11"
+    "ssh2": "^0.5.1",
+    "ssh2-streams": "^0.1.8"
   },
@@ -31,4 +32,4 @@ "devDependencies": {
     "chai-as-promised": "^5.1.0",
-    "mocha": "^2.3.3"
+    "mocha": "^3.0.2"
   }
 }

test/test.js

@@ -24,2 +24,3 @@ var fs = require('fs')
 var buffer = fs.readFileSync('test/fixtures/test.dat');
+var zbuffer = fs.readFileSync('test/fixtures/zero.test');
 
@@ -59,17 +60,2 @@ describe('SFTPClient()', function () {
 
-describe('ls(path)', function () {
-  it('ls("/") should return a valid directroy object', function () {
-    return sftp.ls('./').should.eventually.contain({type: 'directory'})
-  })
-  it('should return a valid file object', function (){
-    return sftp.ls('./.bash_profile').should.eventually.contain({type: 'file'})
-  })
-  it('ls("/dev/null") should be of type other', function () {
-    return sftp.ls('/dev/null').should.eventually.contain({type: 'other'})
-  })
-  it('ls("./nonexistantfile") should reject', function() {
-    return sftp.ls('somenonexistant.file').should.be.rejected
-  })
-})
-
 describe('putBuffer(buffer, remote)', function(){
@@ -82,2 +68,5 @@ it('put(buffer, "/tmp/test.dat") should transfer buffer', function () {
   })
+  it('put(buffer, "/tmp/zero.test") should put zero byte buffer', function() {
+    return sftp.putBuffer(zbuffer, '/tmp/zero.test').should.eventually.be.true
+  })
 })
@@ -95,3 +84,3 @@
   it('getBuffer("zero.test") should tranfer zero byte file', function() {
-    return sftp.getBuffer('/home/vagrant/Projects/sftp-promises/test/fixtures/zero.test').then(function(rbuffer) {
+    return sftp.getBuffer('/tmp/zero.test').then(function(rbuffer) {
       return rbuffer.length
@@ -149,3 +138,3 @@ }).should.eventually.equal(0)
   it('getStream("/nonewritable/location", writableStream) should reject', function () {
-    var stream = fs.createWriteStream('test/fixtures/test.dat')
+    var stream = fs.createReadStream('test/fixtures/test.dat')
     return sftp.getStream('/cantwritehere', stream).should.be.rejected
@@ -167,9 +156,15 @@ })
 
-describe('rm(path)', function () {
-  it('should remove a remote file', function ( ){
-    return sftp.rm('/tmp/test.mv.dat').should.eventually.be.true
+describe('ls(path)', function () {
+  it('ls("/") should return a valid directroy object', function () {
+    return sftp.ls('./').should.eventually.contain({type: 'directory'})
   })
-  it('rm("/tmp") should reject', function () {
-    return sftp.rm('/tmp').should.eventually.rejected
+  it('ls("/tmp/zero.test") should return a valid file object', function (){
+    return sftp.ls('/tmp/zero.test').should.eventually.contain({type: 'file'})
   })
+  it('ls("/dev/null") should be of type other', function () {
+    return sftp.ls('/dev/null').should.eventually.contain({type: 'other'})
+  })
+  it('ls("./nonexistantfile") should reject', function() {
+    return sftp.ls('somenonexistant.file').should.be.rejected
+  })
 })
@@ -181,4 +176,4 @@
   })
-  it('stat("./.bash_profile") should be file', function () {
-    return sftp.stat('./.bash_profile').should.eventually.contain({type: 'file'})
+  it('stat("/tmp/zero.test") should be file', function () {
+    return sftp.stat('/tmp/zero.test').should.eventually.contain({type: 'file'})
   })
@@ -196,2 +191,14 @@ it('stat("/dev/null") should be type other', function () {
 
+describe('rm(path)', function () {
+  it('should remove a remote file', function ( ){
+    return sftp.rm('/tmp/test.mv.dat').should.eventually.be.true
+  })
+  it('should remove a remote file', function() {
+    return sftp.rm('/tmp/zero.test').should.eventually.be.true
+  })
+  it('rm("/tmp") should reject', function () {
+    return sftp.rm('/tmp').should.eventually.rejected
+  })
+})
+
 describe('mkdir(path)', function () {
@@ -198,0 +205,0 @@ it('mkdir("/tmp/testdir") should reslove', function () {

No alert changes

Improved metrics

Total package byte prevSize

436882

increased by1423.51%

Worsened metrics

Dependency count

2

increased by100%

Number of package files

9

decreased by-18.18%

Lines of code

658

decreased by-8.99%

Dependency changes

• + Addedssh2-streams@^0.1.8

• + Addedsemver@5.7.2(transitive)

• + Addedssh2@0.5.5(transitive)

• + Addedssh2-streams@0.1.20(transitive)

• - Removedcore-util-is@1.0.3(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedisarray@0.0.1(transitive)

• - Removedreadable-stream@1.0.34(transitive)

• - Removedssh2@0.4.15(transitive)

• - Removedssh2-streams@0.0.23(transitive)

• - Removedstring_decoder@0.10.31(transitive)

• Updatedssh2@^0.5.1