Merge pull request #2092 from Utsav2/gzip

Decompress gzip files
bower · Dec 13, 2015 · 1e5122c · 1e5122c
2 parents 8b2fad3 + 4255d7d
commit 1e5122c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/lib/util/download.js b/lib/util/download.js
@@ -26,7 +26,8 @@ function download(url, file, options) {
         minTimeout: 1000,
         maxTimeout: 35000,
         randomize: true,
-        progressDelay: progressDelay
+        progressDelay: progressDelay,
+        gzip: true
     }, options || {});
 
     // Retry on network errors

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "p-throttler": "0.1.1",
     "promptly": "0.2.0",
     "q": "^1.1.2",
-    "request": "2.53.0",
+    "request": "2.67.0",
     "request-progress": "0.3.1",
     "retry": "0.6.1",
     "rimraf": "^2.2.8",

diff --git a/test/assets/test-gz.txt b/test/assets/test-gz.txt
diff --git a/test/assets/test-gz.txt.gz b/test/assets/test-gz.txt.gz
diff --git a/test/util/download.js b/test/util/download.js
@@ -22,7 +22,7 @@ describe('download', function () {
             nock('http://bower.io', opts.nockOpts)
         );
 
-        download('http://bower.io/package.tar.gz', destination, opts.downloadOpts)
+        download(opts.sourceUrl || 'http://bower.io/package.tar.gz', opts.destinationPath || destination, opts.downloadOpts)
             .then(function (result) {
                 if (opts.expect) {
                     opts.expect(result);
@@ -174,4 +174,36 @@ describe('download', function () {
             }
         });
     });
+
+    describe('gzipped files', function () {
+
+        function testGzip(sourceFilename) {
+            var sourceFile = path.resolve(__dirname, '../assets/' + sourceFilename);
+            var destinationPath = tempDir.getPath(sourceFilename);
+
+            return downloadTest({
+                response: function(nock) {
+                    nock
+                    .get('/' + sourceFilename)
+                    .replyWithFile(200, sourceFile, {
+                        'Content-Encoding' : 'gzip'
+                    });
+                },
+                expect: function() {
+                    expect(fs.readFileSync(destinationPath, 'ascii'))
+                    .to.be('Hello World!\n');
+                },
+                sourceUrl: 'http://bower.io/' + sourceFilename,
+                destinationPath: destinationPath
+            });
+        }
+
+        it('correctly decodes gzipped files without gz extension', function () {
+            return testGzip('test-gz.txt');
+        });
+
+        it('correctly decodes gzipped files with gz extension', function () {
+            return testGzip('test-gz.txt.gz');
+        });
+    });
 });