Merge branch 'develop' into livechat-do-not-use-users-collection

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.0-develop
+ENV RC_VERSION 0.61.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.meteor/packages

@@ -22,7 +22,6 @@ email@1.2.3
 fastclick@1.0.13
 http@1.3.0
 jquery@1.11.10
-less@2.7.11
 logging@1.1.19
 meteor-base@1.2.0
 mobile-experience@1.0.5
@@ -160,7 +159,7 @@ jparker:gravatar
 kadira:blaze-layout
 kadira:flow-router
 keepnox:perfect-scrollbar
-#kenton:accounts-sandstorm
+kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
 mrt:reactive-store

.meteor/versions

@@ -64,6 +64,7 @@ jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
 keepnox:perfect-scrollbar@0.6.8
+kenton:accounts-sandstorm@0.7.0
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
@@ -90,7 +91,7 @@ mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.0
+modules@0.11.2
 modules-runtime@0.9.1
 mongo@1.3.1
 mongo-dev-server@1.1.0

.postcssrc

@@ -6,7 +6,7 @@
 		},
 		"postcss-media-minmax": {},
 		"postcss-selector-not": {},
-		"postcss-nesting": {},
+		"postcss-nested": {},
 		"autoprefixer": {
 			"browsers": [
 				"ie > 10",

.sandstorm/build.sh

@@ -3,12 +3,12 @@ set -x
 set -euvo pipefail
 
 # Make meteor bundle
-export NODE_ENV=production
 sudo chown vagrant:vagrant /home/vagrant -R
 cd /opt/app
-meteor npm install --production
+meteor npm install
 meteor build --directory /home/vagrant/
 
+export NODE_ENV=production
 # Use npm and node from the Meteor dev bundle to install the bundle's dependencies.
 TOOL_VERSION=$(meteor show --ejson $(<.meteor/release) | grep '^ *"tool":' |
     sed -re 's/^.*"(meteor-tool@[^"]*)".*$/\1/g')

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.60.0-develop"),
+		appMarketingVersion = (defaultText = "0.61.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
@@ -106,6 +106,7 @@ const myCommand :Spk.Manifest.Command = (
 		# Note that this defines the *entire* environment seen by your app.
 		(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
 		(key = "SANDSTORM", value = "1"),
+		(key = "HOME", value = "/var"),
 		(key = "Statistics_reporting", value = "false"),
 		(key = "Accounts_AllowUserAvatarChange", value = "false"),
 		(key = "Accounts_AllowUserProfileChange", value = "false"),

.sandstorm/setup.sh

@@ -8,7 +8,7 @@ apt-get install build-essential git -y
 cd /opt/
 
 NODE_ENV=production
-PACKAGE=meteor-spk-0.3.1
+PACKAGE=meteor-spk-0.4.0
 PACKAGE_FILENAME="$PACKAGE.tar.xz"
 CACHE_TARGET="/host-dot-sandstorm/caches/${PACKAGE_FILENAME}"
 
@@ -32,7 +32,7 @@ cp -a /lib/x86_64-linux-gnu/libtinfo.so.* /opt/meteor-spk/meteor-spk.deps/lib/x8
 # Unfortunately, Meteor does not explicitly make it easy to cache packages, but
 # we know experimentally that the package is mostly directly extractable to a
 # user's $HOME/.meteor directory.
-METEOR_RELEASE=1.4.2
+METEOR_RELEASE=1.6.0.1
 METEOR_PLATFORM=os.linux.x86_64
 METEOR_TARBALL_FILENAME="meteor-bootstrap-${METEOR_PLATFORM}.tar.gz"
 METEOR_TARBALL_URL="https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/${METEOR_RELEASE}/${METEOR_TARBALL_FILENAME}"

.scripts/set-version.js

@@ -55,11 +55,11 @@ git.status()
 	if (status.current === 'release-candidate') {
 		return semver.inc(pkgJson.version, 'prerelease', 'rc');
 	}
-	if (status.current === 'master') {
+	if (/release-\d+\.\d+\.\d+/.test(status.current)) {
 		return semver.inc(pkgJson.version, 'patch');
 	}
-	if (status.current === 'develop') {
-		return semver.inc(semver.inc(pkgJson.version, 'minor'), 'minor')+'-develop';
+	if (status.current === 'develop-sync') {
+		return semver.inc(pkgJson.version, 'minor') + '-develop';
 	}
 	return Promise.reject(`No release action for branch ${ status.current }`);
 })

.snapcraft/snapcraft.yaml

@@ -46,8 +46,10 @@ parts:
             - build-essential
             - nodejs
     rocketchat-server:
+        build-packages:
+            - curl
         plugin: dump
-        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc@1.6.6; 
+        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc@1.6.6;
         after: [node]
         source: .
         stage-packages:

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.0-develop
+    RC_VERSION=0.61.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"