Merge branch 'master' into beta

Release: 2.1.0 beta 0

.gitignore

@@ -1,18 +1,52 @@
-lib-cov
-*.seed
+# Logs
+logs
 *.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
+npm-debug.log*
 
+# Runtime data
 pids
-logs
-results
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
 
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
 node_modules
-npm-debug.log
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# pump.io stuff
 
 config.js
 

.jshintrc

@@ -1,3 +1,4 @@
 {
+  "node": true,
   "sub": true
 }

.npmignore

@@ -1,7 +1,6 @@
 # Logs
 logs
 *.log
-npm-debug.log*
 
 # Runtime data
 pids
@@ -21,16 +20,9 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
-# node-waf configuration
-.lock-wscript
-
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
-# Dependency directories
-node_modules
-jspm_packages
-
 # Optional npm cache directory
 .npm
 

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 pump.io follows [Semantic Versioning][semver].
 
+## 2.1.0 beta 0 - 2016-12-11
+
+### Fixed
+
+* Files in bin/ are now properly validated by JSHint and JSCS
+
+### Improved
+
+* Enable strict mode for server-side JS (#1221)
+* Provide a more useful error message for invalid config JSON
+* A sample systemd service is now included
+
+## 2.0.5 - 2016-12-11
+
+### Fixed
+
+* Fix web UI YouTube embeds appearing in all subsequent posts (#1249)
+
 ## 2.0.4 - 2016-11-13
 
 ### Fixed

README.md

@@ -1,6 +1,6 @@
 # pump.io
 
-Version 2.0.4
+Version 2.1.0 beta 0
 
 This is pump.io. It's a stream server that does most of what people
 really want from a social network.
@@ -58,7 +58,7 @@ or clone it via the following command:
 
 You'll need four things to get started:
 
-* node.js 0.10 or 0.12
+* node.js 4.x or 6.x
 * npm 1.1.0 or higher
 * A database server (see below)
 * The `graphicsmagick` package with the `gm` command

bin/pump

@@ -20,6 +20,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+"use strict";
+
 var cluster = require("cluster"),
     os = require("os"),
     fs = require("fs"),
@@ -80,7 +82,8 @@ var getConfig = function(filename) {
                 parsed = JSON.parse(raw);
                 _.extend(config, parsed);
             } catch (err) {
-                console.log(err);
+                console.error("Error parsing JSON configuration:", err.toString());
+                console.error("Try using a JSON validator.");
                 process.exit(1);
             }
         }

bin/pump-authorize

@@ -23,14 +23,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+"use strict";
+
 var urlfmt = require("url").format,
     _ = require("underscore"),
     Step = require("step"),
     common = require("../lib/pumpclient"),
     clientCred = common.clientCred,
     setUserCred = common.setUserCred,
     OAuth = require("oauth-evanp").OAuth,
-    readline = require('readline'),
+    readline = require("readline"),
     argv = require("optimist")
         .usage("Usage: $0 -u <username>")
         .demand(["u"])

bin/pump-create-group

@@ -20,6 +20,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+"use strict";
+
 var _ = require("underscore"),
     Step = require("step"),
     url = require("url"),
@@ -54,8 +56,8 @@ Step(
         var activity = {
             "verb": "create",
             "object": {
-	        "objectType": "group",
-	        "displayName": note
+                "objectType": "group",
+                "displayName": note
             }
         };
         var endpoint = url.format({

bin/pump-delete

@@ -20,6 +20,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+"use strict";
+
 var _ = require("underscore"),
     Step = require("step"),
     url = require("url"),

bin/pump-follow

@@ -20,6 +20,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+"use strict";
+
 var _ = require("underscore"),
     Step = require("step"),
     url = require("url"),
@@ -60,13 +62,13 @@ Step(
     },
     function(err, cred) {
         if (err) throw err;
-	var activity = {
+        var activity = {
             "verb": "follow",
-	    "object": {
-		"objectType": "person",
-		id: otherId
-	    }
-	};
+            "object": {
+                "objectType": "person",
+                id: otherId
+            }
+        };
         var endpoint = url.format({
             protocol: ((port == 443) ? "https" : "http"),
             host: ((port == 80) ? server : server + ":" + port),