Deprecate uploaddir and replace it with datadir

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 pump.io follows [Semantic Versioning][semver].
 
-## 2.2.0 - Future
+## 3.0.0 - Future
 
 ### Improved
 
@@ -16,6 +16,10 @@ pump.io follows [Semantic Versioning][semver].
 
 * Incorrect and unnecessary 'plugin-types' Content Security Policy directives are no longer sent
 
+### Breaking
+
+* The `uploaddir` option is obsolete and should be migrated to the new `datadir` option (#1272)
+
 ## 2.1.1 - 2017-01-18
 
 ### Fixed

lib/app.js

@@ -112,6 +112,15 @@ var makeApp = function(configBase, callback) {
     hostname = config.hostname;
     address  = config.address || config.hostname;
 
+    // Throw on configs written for < 3.x
+
+    if (config.uploaddir) throw new Error("`uploaddir` is no longer supported; see the pump.io 3.x release notes");
+
+    if (config.uploadsEnabled) {
+        if (!config.datadir) throw new Error("Uploads enabled but no `datadir` specified");
+        config.uploaddir = path.join(config.datadir, "uploads");
+    }
+
     if (process.getuid) {
         if (port < 1024 && process.getuid() !== 0) {
             callback(new Error("Can't listen to ports lower than 1024 on POSIX systems unless you're root."), null);

lib/defaults.js

@@ -38,7 +38,8 @@ module.exports = {driver: "memory",
                   key: null,
                   cert: null,
                   hsts: false,
-                  uploaddir: null,
+                  datadir: null,
+                  uploadsEnabled: false,
                   debugClient: false,
                   firehose: "ofirehose.com",
                   spamhost: null,

package.json

@@ -2,7 +2,7 @@
   "name": "pump.io",
   "preferGlobal": "true",
   "homepage": "http://pump.io/",
-  "version": "2.2.0-alpha.0",
+  "version": "3.0.0-alpha.0",
   "author": "Evan Prodromou <evan@e14n.com>",
   "devDependencies": {
     "jscs": "^3.0.3",

test/upload-file-test.js

@@ -55,7 +55,7 @@ suite.addBatch({
                 dirname = path.join(os.tmpDir(),
                                     "upload-file-test",
                                     ""+Date.now());
-            mkdirp(dirname, function(err) {
+            mkdirp(path.join(dirname, "uploads"), function(err) {
                 if (err) {
                     callback(err, null);
                 } else {
@@ -73,7 +73,7 @@ suite.addBatch({
         },
         "and we set up the app": {
             topic: function(dir) {
-                setupAppConfig({uploaddir: dir},
+                setupAppConfig({datadir: dir, uploadsEnabled: true},
                                this.callback);
             },
             teardown: function(app) {