merge latest mb-pages + bump node-gdal

mapbox · Nov 11, 2015 · 81992b7 · 81992b7
2 parents 143e9fc + cd294ea
commit 81992b7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ Mapbox Studio Classic
 Desktop application for vector tile driven map design.
 
 [![Build Status](https://secure.travis-ci.org/mapbox/mapbox-studio-classic.svg)](http://travis-ci.org/mapbox/mapbox-studio-classic)
-[![Build status](https://ci.appveyor.com/api/projects/status/28kreaivb6nv6ju2?svg=true)](https://ci.appveyor.com/project/Mapbox/mapbox-studio)
-[![Dependencies](https://david-dm.org/mapbox/mapbox-studio.svg)](https://david-dm.org/mapbox/mapbox-studio)
+[![Build status](https://ci.appveyor.com/api/projects/status/vmvkol2diegfo7gc?svg=true)](https://ci.appveyor.com/project/Mapbox/mapbox-studio-classic)
+[![Dependencies](https://david-dm.org/mapbox/mapbox-studio-classic.svg)](https://david-dm.org/mapbox/mapbox-studio-classic)
 
 ### Install latest release
 

diff --git a/_config.mb-pages.yml b/_config.mb-pages.yml
@@ -18,4 +18,4 @@ defaults:
     date: 0000-01-01
 
 ### latest release
-release: v0.3.2
+release: v0.3.3
diff --git a/_config.yml b/_config.yml
@@ -18,4 +18,4 @@ defaults:
     date: 0000-01-01
 
 ### latest release
-release: v0.3.2
+release: v0.3.3
diff --git a/index-shell.js b/index-shell.js
@@ -45,11 +45,15 @@ var shellLog = path.join(process.env.HOME, '.mapbox-studio', 'shell.log');
 // set up shell.log and log rotation
 log(shellLog, 10e6, shellsetup);
 
-function shellsetup(err){
-
+function shellsetup(err) {
+    if(err) {
+      console.log('shellsetup:', err);
+      exit();
+      return;
+    }
     // Start the server child process.
     server = spawn(node, [script, '--shell=true'])
-        .on('error', function(error){
+        .on('error', function(error) {
             process.stdout.write('error spawning server process: ' + error + '\n');
         })
         .on('exit', exit);

diff --git a/lib/log.js b/lib/log.js
@@ -1,4 +1,5 @@
 var fs = require('fs');
+var path = require('path');
 var through = require('through');
 var rotate = require('log-rotate');
 
@@ -21,13 +22,25 @@ module.exports = function(filepath, maxsize, callback) {
 
 
     function setup(offset) {
+        var dir = path.dirname(filepath);
+        if(!fs.existsSync(dir)) {
+            try{
+                fs.mkdirSync(dir);
+            }
+            catch(err) {
+                var msg = 'Problem writing to logfile at ' + filepath;
+                //console.warn(msg);
+                return callback(msg);
+            }
+        }
         var logstream = fs.createWriteStream(filepath, {
             flags: offset ? 'r+' : 'w',
             start: offset
         });
         logstream.on('error', function (err) {
-            console.warn('Problem writing to logfile at ' + filepath);
-            return callback();
+            var msg = 'Problem writing to logfile at ' + filepath;
+            //console.warn(msg);
+            return callback(msg);
         })
         var pipeout = through();
         var pipeerr = through();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapbox-studio",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "main": "./index",
   "author": "Mapbox (https://www.mapbox.com)",
   "engines": {
@@ -39,7 +39,7 @@
     "tilelive-bridge": "~2.2.1",
     "tilelive-vector": "~3.5.0",
     "mapnik-omnivore": "~6.3.2",
-    "gdal": "0.7.0", 
+    "gdal": "~0.7.2", 
     "abaculus": "1.2.1",
     "mapbox-machine-styles": "2.3.1",
     "mapbox-studio-pro-fonts": "https://mapbox-npm.s3.amazonaws.com/package/mapbox-studio-pro-fonts-1.0.0-9870a90b713f307b9391829602f4d5857e419615.tgz",