improve fetchArchive error handling

adamdbradley · adamdbradley · commit 0b900432ad2f · 2014-09-12T11:47:45.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Set watchPatterns within ionic.project config file
 * Friendly EMFILE error when too many files are watched
 * Ensure config.xml content[src] gets reset after run/emulate
+* Improve fetchArchive error handling
 
 
 ### 1.2.4
diff --git a/lib/ionic.js b/lib/ionic.js
@@ -599,8 +599,18 @@ Ionic = {
     var proxy = process.env.PROXY || null;
     var request = require('request');
     request({ url: archiveUrl, encoding: null, proxy: proxy }, function(err, res, body) {
-      if(!res || res.statusCode !== 200) {
-        console.error('Unable to fetch:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
+      if(err) {
+        console.error('Error fetching:'.error.bold, archiveUrl, err);
+        q.reject(err);
+        return;
+      }
+      if(!res) {
+        console.error('Invalid response:'.error.bold, archiveUrl);
+        q.reject('Unable to fetch response: ' + archiveUrl);
+        return;
+      }
+      if(res.statusCode !== 200) {
+        console.error('Invalid response status:'.error.bold, archiveUrl, '(' + res.statusCode + ')');
         q.reject(res);
         return;
       }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ionic",
-  "version": "1.2.5-beta1",
+  "version": "1.2.5-beta2",
   "preferGlobal": true,
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "http://ionicframework.com/",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ionic",`
`3`		`- "version": "1.2.5-beta1",`
	`3`	`+ "version": "1.2.5-beta2",`
`4`	`4`	`"preferGlobal": true,`
`5`	`5`	`"description": "A tool for creating and developing Ionic Framework mobile apps.",`
`6`	`6`	`"homepage": "http://ionicframework.com/",`