Use stable module version

Using stable version of node modules. 
Using '*' or 'latest' in node modules version could cause unexpected results and could break your code.

.gitignore

@@ -1,7 +1,8 @@
 node_modules
 npm-debug.log
 domain.json
-
+dist
+config.gypi
 
 // osx garbage
 *.DS_Store

.travis.yml

@@ -1,3 +1,24 @@
+sudo: required
+dist: trusty
+
+os:
+- osx
+- linux
+
 language: node_js
 node_js:
-  - 'node'
+- '6'
+
+before_install:
+- npm install -g gulp
+- npm install
+
+cache:
+  directories:
+  - node_modules
+  - app/node_modules
+  - $HOME/.electron
+  - $HOME/.cache
+
+script:
+- npm run travis

README.md

@@ -1,4 +1,7 @@
-# Zulip Desktop Client
+# Zulip Desktop Client 
+[![Build Status](https://travis-ci.org/zulip/zulip-electron.svg?branch=master)](https://travis-ci.org/zulip/zulip-electron)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-electron?branch=master&svg=true)](https://ci.appveyor.com/project/akashnimare/zulip-electron/branch/master)
+[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
 
 This is an experimental replacement for the [Zulip Desktop
 app](https://github.com/zulip/zulip-desktop) implemented in
@@ -8,6 +11,15 @@ The goal is to achieve feature-compatibility with the old desktop app
 and then start adding cool features like easy support for
 multi-account, auto-updates etc.
 
+## Prerequisites
+* node >= v6.3.1
+* npm >= 3.10.3
+* If you're on Debian or Ubuntu, you'll also need to install
+`nodejs-legacy`:
+```sh
+$ sudo apt-get install nodejs-legacy
+```
+
 ## Installation
 
 Clone the source locally:
@@ -16,14 +28,6 @@ Clone the source locally:
 $ git clone https://github.com/zulip/zulip-electron
 $ cd zulip-electron
 ```
-If you're on Debian or Ubuntu, you'll also need to install
-`nodejs-legacy`:
-
-Use your package manager to install `npm`.
-
-```sh
-$ sudo apt-get install npm nodejs-legacy
-```
 
 Install project dependencies:
 
@@ -41,19 +45,32 @@ Start and watch changes
 ```sh
 $ npm run dev
 ```
+# Making a release
+
+To package app into an installer use command:
+```
+npm run dist
+```
+It will start the packaging process for operating system you are running this command on. Ready for distribution file (e.g. dmg, windows installer, deb package) will be outputted to `dist` directory.
+
+You can create Windows installer only when running on Windows, the same is true for Linux and OSX. So to generate all three installers you need all three operating systems.
+
 
 ## Features
 
 - [x] Native Notifications
-- [x] Spell Checker
+- [x] SpellChecker
-- [x] Keyboard Shortcuts
+- [x] OSX/Win/Linux installer
-- Default shortcuts - <kbd>cmdOrctrl + k </kbd>
+- [x] Automatic Updates (macOS/Windows)
-- Change Zulip Server: <kbd>cmdOrctrl + ,</kbd>
+- [x] Keyboard shortcuts
-- Back: <kbd>cmdOrctrl + [</kbd>
+
-- Forward: <kbd>cmdOrctrl + ]</kbd>
+Description            | Keys
-- [ ] OSX/Win/Linux installer
+-----------------------| -----------------------
-- [ ] Launch on OS startup
+Default shortcuts      | <kbd>Cmd/Ctrl</kbd> <kbd>k</kbd>
-- [ ] Automatic Updates
+Change Zulip Server    | <kbd>Cmd/Ctrl</kbd> <kbd>,</kbd>
+Back                   | <kbd>Cmd/Ctrl</kbd> <kbd>[</kbd>
+Forward                | <kbd>Cmd/Ctrl</kbd> <kbd>]</kbd>
+
 
 ## Contribute
 

app/main/autoupdater.js

@@ -0,0 +1,50 @@
+'use strict';
+const os = require('os');
+const {app, autoUpdater, dialog} = require('electron');
+
+const version = app.getVersion();
+const platform = os.platform() + '_' + os.arch();  // usually returns darwin_64
+
+const updaterFeedURL = 'http://zulipdesktop.herokuapp.com/update/' + platform + '/' + version;
+
+function appUpdater() {
+	autoUpdater.setFeedURL(updaterFeedURL);
+
+	// Log whats happening
+	// TODO send autoUpdater events to renderer so that we could
+	// it could console log in developer tools
+	autoUpdater.on('error', err => console.log(err));
+	autoUpdater.on('checking-for-update', () => console.log('checking-for-update'));
+	autoUpdater.on('update-available', () => console.log('update-available'));
+	autoUpdater.on('update-not-available', () => console.log('update-not-available'));
+
+	// Ask the user if update is available
+	autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
+		let message = app.getName() + ' ' + releaseName + ' is now available. It will be installed the next time you restart the application.';
+		if (releaseNotes) {
+			const splitNotes = releaseNotes.split(/[^\r]\n/);
+			message += '\n\nRelease notes:\n';
+			splitNotes.forEach(notes => {
+				message += notes + '\n\n';
+			});
+		}
+		// Ask user to update the app
+		dialog.showMessageBox({
+			type: 'question',
+			buttons: ['Install and Relaunch', 'Later'],
+			defaultId: 0,
+			message: 'A new version of ' + app.getName() + ' has been downloaded',
+			detail: message
+		}, response => {
+			if (response === 0) {
+				setTimeout(() => autoUpdater.quitAndInstall(), 1);
+			}
+		});
+	});
+	// init for updates
+	autoUpdater.checkForUpdates();
+}
+
+exports = module.exports = {
+	appUpdater
+};

app/main/domain.js

@@ -1,12 +1,19 @@
-/* global app */
+const {app} = require('electron').remote;
-// eslint-disable-next-line no-unused-vars
+const ipcRenderer = require('electron').ipcRenderer;
-function addDomain() {
+const JsonDB = require('node-json-db');
-	const request = require('request');
+const request = require('request');
-	const ipcRenderer = require('electron').ipcRenderer;
-	const JsonDB = require('node-json-db');
 
-	const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
+const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
+const data = db.getData('/');
 
+console.log(data.domain);
+
+// if (data.domain && window.location.href.indexOf(data.domain) === -1) {
+// 	window.location.href = data.domain
+// }
+// require('electron-connect').client.create();
+
+window.addDomain = function () {
 	document.getElementById('main').innerHTML = 'checking...';
 
 	let newDomain = document.getElementById('url').value;
@@ -20,11 +27,10 @@ function addDomain() {
 			document.getElementById('main').innerHTML = 'Connect';
 			db.push('/domain', domain);
 			ipcRenderer.send('new-domain', domain);
-			// window.location.href = domain;
 		} else {
 			document.getElementById('main').innerHTML = 'Connect';
 			document.getElementById('server-status').innerHTML = 'Not a vaild Zulip Server.';
 		}
 	});
-}
+};
 

app/main/index.js

@@ -1,36 +1,58 @@
 'use strict';
 const path = require('path');
+const fs = require('fs');
 const electron = require('electron');
 const {app} = require('electron');
-const electronLocalshortcut = require('electron-localshortcut');
 const ipc = require('electron').ipcMain;
+const electronLocalshortcut = require('electron-localshortcut');
 const Configstore = require('configstore');
 const JsonDB = require('node-json-db');
-const SpellChecker = require('simple-spellchecker');
+const isDev = require('electron-is-dev');
 const tray = require('./tray');
 const appMenu = require('./menu');
-const link = require('./link-helper');
+const {linkIsInternal, skipImages} = require('./link-helper');
-
+const {appUpdater} = require('./autoupdater');
-const {linkIsInternal} = link;
 
 const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
 const data = db.getData('/');
 
+// Handling squirrel.windows events on windows
+if (require('electron-squirrel-startup')) {
+	app.quit();
+}
+
 // adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
-require('electron-context-menu')();
 
 const conf = new Configstore('Zulip-Desktop');
 
-// spellchecker enabled
-let myDictionary = null;
-
 // prevent window being garbage collected
 let mainWindow;
 let targetLink;
 
 // Load this url in main window
-const targetUrl = 'file://' + path.join(__dirname, '../renderer', 'index.html');
+const staticURL = 'file://' + path.join(__dirname, '../renderer', 'index.html');
+
+const targetURL = function () {
+	if (data.domain === undefined) {
+		return staticURL;
+	}
+	return data.domain;
+};
+
+const isAlreadyRunning = app.makeSingleInstance(() => {
+	if (mainWindow) {
+		if (mainWindow.isMinimized()) {
+			mainWindow.restore();
+		}
+
+		mainWindow.show();
+	}
+});
+
+if (isAlreadyRunning) {
+	app.quit();
+}
 
 function checkWindowURL() {
 	if (data.domain !== undefined) {
@@ -39,9 +61,11 @@ function checkWindowURL() {
 	return targetLink;
 }
 
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+function isWindowsOrmacOS() {
+	return process.platform === 'darwin' || process.platform === 'win32';
+}
 
-const spellDict = path.join(__dirname, '../../node_modules/simple-spellchecker/dict');
+const APP_ICON = path.join(__dirname, '../resources', 'Icon');
 
 const iconPath = () => {
 	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
@@ -77,12 +101,13 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			preload: path.join(__dirname, 'preload.js'),
-			nodeIntegration: true,
+			plugins: true,
-			plugins: true
+			allowDisplayingInsecureContent: true,
+			nodeIntegration: false
 		}
 	});
 
-	win.loadURL(targetUrl);
+	win.loadURL(targetURL());
 	win.on('closed', onClosed);
 	win.setTitle('Zulip');
 
@@ -134,6 +159,8 @@ function createMainWindow() {
 app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
 
 app.on('window-all-closed', () => {
+	// unregister all the shortcuts so that they don't interfare with other apps
+	electronLocalshortcut.unregisterAll(mainWindow);
 	if (process.platform !== 'darwin') {
 		app.quit();
 	}
@@ -152,20 +179,6 @@ app.on('ready', () => {
 
 	const page = mainWindow.webContents;
 
-	// Add spellcheck dictionary
-	SpellChecker.getDictionary('en-US', spellDict, (err, result) => {
-		if (!err) {
-			myDictionary = result;
-		}
-	});
-
-	// Define function for consult the dictionary.
-	ipc.on('checkspell', (event, word) => {
-		if (myDictionary !== null && word !== null) {
-			event.returnValue = myDictionary.spellCheck(word);
-		}
-	});
-
 	// TODO - use global shortcut instead
 	electronLocalshortcut.register(mainWindow, 'CommandOrControl+R', () => {
 		mainWindow.reload();
@@ -183,33 +196,44 @@ app.on('ready', () => {
 		}
 	});
 
-	// electronLocalshortcut.register(mainWindow, 'CommandOrControl+=', () => {
+	page.on('dom-ready', () => {
-	// 	page.send('zoomIn');
+		page.insertCSS(fs.readFileSync(path.join(__dirname, 'preload.css'), 'utf8'));
-	// });
+		mainWindow.show();
-
+	});
-	// electronLocalshortcut.register(mainWindow, 'CommandOrControl+-', () => {
-	// 	page.send('zoomOut');
-	// });
-
-	// electronLocalshortcut.register(mainWindow, 'CommandOrControl+0', () => {
-	// 	page.send('zoomActualSize');
-	// });
 
 	page.on('new-window', (event, url) => {
-		if (mainWindow.useDefaultWindowBehaviour) {
+		if (linkIsInternal(checkWindowURL(), url) && url.match(skipImages) === null) {
-			mainWindow.useDefaultWindowBehaviour = false;
-			return;
-		}
-		if (linkIsInternal(checkWindowURL(), url)) {
 			event.preventDefault();
 			return mainWindow.loadURL(url);
 		}
 		event.preventDefault();
 		electron.shell.openExternal(url);
 	});
+
+	page.once('did-frame-finish-load', () => {
+		const checkOS = isWindowsOrmacOS();
+		if (checkOS && !isDev) {
+			// Initate auto-updates on macOs and windows
+			appUpdater();
+		}
+	});
+});
+
+app.on('will-quit', () => {
+	// unregister all the shortcuts so that they don't interfare with other apps
+	electronLocalshortcut.unregisterAll(mainWindow);
 });
 
 ipc.on('new-domain', (e, domain) => {
-	mainWindow.loadURL(domain);
+	// mainWindow.loadURL(domain);
+	if (!mainWindow) {
+		mainWindow = createMainWindow();
+		mainWindow.loadURL(domain);
+	} else if (mainWindow.isMinimized()) {
+		mainWindow.loadURL(domain);
+		mainWindow.show();
+	} else {
+		mainWindow.loadURL(domain);
+	}
 	targetLink = domain;
 });

app/main/link-helper.js

@@ -2,11 +2,14 @@ const wurl = require('wurl');
 
 // Check link if it's internal/external
 function linkIsInternal(currentUrl, newUrl) {
-	const currentDomain = wurl('domain', currentUrl);
+	const currentDomain = wurl('hostname', currentUrl);
-	const newDomain = wurl('domain', newUrl);
+	const newDomain = wurl('hostname', newUrl);
 	return currentDomain === newDomain;
 }
 
+// We'll be needing this to open images in default browser
+const skipImages = '.jpg|.gif|.png|.jpeg|.JPG|.PNG';
+
 exports = module.exports = {
-	linkIsInternal
+	linkIsInternal, skipImages
 };

app/main/menu.js

@@ -22,7 +22,6 @@ function sendAction(action) {
 const viewSubmenu = [
 	{
 		label: 'Reload',
-		accelerator: 'CmdOrCtrl+R',
 		click(item, focusedWindow) {
 			if (focusedWindow) {
 				focusedWindow.reload();
@@ -119,10 +118,8 @@ const darwinTpl = [
 			{
 				label: 'Change Zulip Server',
 				accelerator: 'Cmd+,',
-				click(item, focusedWindow) {
+				click() {
-					if (focusedWindow) {
+					addDomain();
-						addDomain();
-					}
 				}
 			},
 			{
@@ -247,10 +244,8 @@ const otherTpl = [
 			{
 				label: 'Change Zulip Server',
 				accelerator: 'Ctrl+,',
-				click(item, focusedWindow) {
+				click() {
-					if (focusedWindow) {
+					addDomain();
-						addDomain();
-					}
 				}
 			},
 			{

app/main/preload.css

@@ -0,0 +1 @@
+/* We'll be overriding default styling so that app look more native * / 

app/main/preload.js

@@ -1,18 +1,11 @@
 'use strict';
 const ipcRenderer = require('electron').ipcRenderer;
-const webFrame = require('electron').webFrame;
+const {webFrame} = require('electron');
+const {spellChecker} = require('./spellchecker');
 
-// Implement spellcheck using electron api
+require('./domain');
-
-webFrame.setSpellCheckProvider('en-US', false, {
-	spellCheck: text => {
-		const res = ipcRenderer.sendSync('checkspell', text);
-		return res === null ? true : res;
-	}
-});
-
-// Handle zooming functionality
 
+// handle zooming functionality
 const zoomIn = () => {
 	webFrame.setZoomFactor(webFrame.getZoomFactor() + 0.1);
 };
@@ -25,7 +18,7 @@ const zoomActualSize = () => {
 	webFrame.setZoomFactor(1);
 };
 
-// Get zooming actions from main process
+// get zooming actions from main process
 ipcRenderer.on('zoomIn', () => {
 	zoomIn();
 });
@@ -53,3 +46,9 @@ ipcRenderer.on('shortcut', () => {
 	const nodes = document.querySelectorAll('.dropdown-menu li:nth-child(4) a');
 	nodes[nodes.length - 1].click();
 });
+
+// To prevent failing this script on linux we need to load it after the document loaded
+document.addEventListener('DOMContentLoaded', () => {
+	// init spellchecker
+	spellChecker();
+});

app/main/spellchecker.js

@@ -0,0 +1,27 @@
+const {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} = require('electron-spellchecker');
+
+function spellChecker() {
+	// Implement spellcheck using electron api
+	window.spellCheckHandler = new SpellCheckHandler();
+	window.spellCheckHandler.attachToInput();
+
+	// Start off as US English
+	window.spellCheckHandler.switchLanguage('en-US');
+
+	const contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
+	const contextMenuListener = new ContextMenuListener(info => {
+		contextMenuBuilder.showPopupMenu(info);
+	});
+
+	// Clean up events after you navigate away from this page;
+	// otherwise, you may experience errors
+	window.addEventListener('beforeunload', () => {
+	// eslint-disable-next-line no-undef
+		spellCheckHandler.unsubscribe();
+		contextMenuListener.unsubscribe();
+	});
+}
+
+exports = module.exports = {
+	spellChecker
+};

app/main/tray.js

@@ -6,21 +6,16 @@ const {addDomain, about} = require('./windowmanager');
 
 let tray = null;
 
-const APP_ICON = path.join(__dirname, '../resources', 'Icon');
+const APP_ICON = path.join(__dirname, '../resources/tray', 'tray');
 
 const iconPath = () => {
-	return APP_ICON + (process.platform === 'win32' ? '.ico' : '.png');
+	if (process.platform === 'linux') {
+		return APP_ICON + 'linux.png';
+	}
+	return APP_ICON + (process.platform === 'win32' ? 'win.ico' : 'osx.png');
 };
 
 exports.create = () => {
-	// Noone is using this feature. so let's hide it for now.
-	// const toggleWin = () => {
-	// 	if (win.isVisible()) {
-	// 		win.hide();
-	// 	} else {
-	// 		win.show();
-	// 	}
-	// };
 	const contextMenu = electron.Menu.buildFromTemplate([
 		{
 			label: 'About',
@@ -33,10 +28,8 @@ exports.create = () => {
 		},
 		{
 			label: 'Change Zulip server',
-			click(item, focusedWindow) {
+			click() {
-				if (focusedWindow) {
+				addDomain();
-					addDomain();
-				}
 			}
 		},
 		{

app/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "zulip",
+  "productName": "Zulip",
+  "version": "0.5.4",
+  "description": "Zulip Desktop App",
+  "license": "Apache-2.0",
+  "email":"<svnitakash@gmail.com>",
+  "copyright": "©2016 Kandra Labs, Inc.",
+  "author": {
+    "name": "Akash Nimare",
+    "email": "svnitakash@gmail.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/zulip/zulip-electron.git"
+  },
+  "bugs": {
+    "url": "https://github.com/zulip/zulip-electron/issues"
+  },
+  "main": "main/index.js",
+  "keywords": [
+    "Zulip",
+    "Group Chat app",
+    "electron-app",
+    "electron",
+    "Desktop app",
+    "InstantMessaging"
+  ],
+  "dependencies": {
+    "electron-is-dev": "0.1.2",
+    "electron-squirrel-startup": "1.0.0",
+    "configstore": "2.1.0",
+    "dialogs": "1.1.14",
+    "electron-debug": "1.1.0",
+    "electron-localshortcut": "0.6.1",
+    "node-json-db": "0.7.3",
+    "request": "2.79.0",
+    "electron-spellchecker": "0.7.0",
+    "wurl": "2.1.0"
+  }
+}

app/renderer/about.html

@@ -7,13 +7,17 @@
 	<body>
 	<div class="about">
 		<center><img src="../resources/zulip.png"></center>
-		<center><p class="detail"> Version : 0.0.1 </p>
+		<center><p class="detail" id="version"> Version : ?.?.? </p>
 		<center><p class="detail"> License : Apache </p>
 		<center><p class="detail"> Maintainer : Zulip </p>
 		<p class="left"><a class="bug" onclick="linkInBrowser()" href="#">Found bug?</a></p>
 	</div>
 	<script>
 
+	const app = require('electron').remote.app;
+	const version_tag = document.getElementById('version');
+	version_tag.innerHTML = ' Version : ' + app.getVersion() + ' ';
+
 	function linkInBrowser(event) {
 
 		const shell = require('electron').shell;
@@ -24,4 +28,4 @@
 	}
 	</script>
 	</body>
-</html>
+</html>

app/renderer/index.html

@@ -6,17 +6,6 @@
     <meta name="viewport" content="width=device-width">
     <title>Login - Zulip</title>
     <link rel="stylesheet" href="css/main.css" type="text/css" media="screen">
-    <script type="text/javascript">
-    const JsonDB = require('node-json-db');
-    const {app} = require('electron').remote;
-    const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
-    const data = db.getData('/');
-
-    if (data.domain) {
-        window.location.href = data.domain;
-    }
-    </script>
-    <script>require('electron-connect').client.create()</script>
   </head>
   <body class="container-layout">
     <div class="section-main">
@@ -34,7 +23,7 @@
               <fieldset>
                 <div class="control-group control-required">
                   <div class="control-field">
-                    <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="zulip.tabbott.net">
+                    <input type="text" id="url"  autofocus="autofocus" spellcheck="false" placeholder="chat.zulip.org">
                   </div>
                 </div>
                 <div class="control-group">
@@ -49,6 +38,5 @@
         </section>
       </section>
     </div>
-    <script src="js/main.js"></script>
   </body>
 </html>

app/renderer/js/pref.js

@@ -1,4 +1,5 @@
 'use strict';
+// eslint-disable-next-line import/no-extraneous-dependencies
 const {remote} = require('electron');
 
 const prefWindow = remote.getCurrentWindow();
@@ -15,8 +16,10 @@ document.addEventListener('keydown', event => {
 // eslint-disable-next-line no-unused-vars
 function addDomain() {
 	const request = require('request');
+	// eslint-disable-next-line import/no-extraneous-dependencies
 	const ipcRenderer = require('electron').ipcRenderer;
 	const JsonDB = require('node-json-db');
+	// eslint-disable-next-line import/no-extraneous-dependencies
 	const {app} = require('electron').remote;
 
 	const db = new JsonDB(app.getPath('userData') + '/domain.json', true, true);
@@ -39,7 +42,7 @@ function addDomain() {
 		} else {
 			document.getElementById('pic').style.display = 'none';
 			document.getElementById('main').innerHTML = 'Switch';
-			document.getElementById('urladded').innerHTML = 'Not a vaild Zulip server.';
+			document.getElementById('urladded').innerHTML = 'Not a vaild Zulip Server.';
 		}
 	});
 }

app/renderer/pref.html

@@ -10,7 +10,7 @@
 		<div class="close" id="close-button">Close</div>
 		<div class="form">
 			<form onsubmit="addDomain(); return false">
-				<input id="url" type="text" placeholder="zulip.example.com">
+				<input id="url" type="text" placeholder="chat.zulip.org">
 				<button type="submit" id="main" value="Submit" onclick="addDomain();">
 				Switch</button>
 				<img id="pic" src="img/loader.gif" />
@@ -19,4 +19,4 @@
 			</div>
 			<script src="js/pref.js"></script>
 		</body>
-	</html>
+	</html>

appveyor.yml

@@ -0,0 +1,23 @@
+version: build{build}
+
+platform:
+  - x64
+os: Previous Visual Studio 2015
+
+cache:
+  - node_modules
+  
+install:
+  - ps: Install-Product node 6 x64
+  - git reset --hard HEAD
+  - npm install npm -g
+  - node --version
+  - npm --version
+  - python --version
+  - npm install
+  - npm install -g gulp
+
+build: off  
+
+test_script:
+  - npm run test

build/icons/1024x1024.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b92ae5c6e5fb0e5b7fcdb46fe102fa0ca7f4d150016cf1a461c0e86921bc731
+size 163336

gulpfile.js

@@ -1,5 +1,6 @@
 'use strict';
 const gulp = require('gulp');
+const mocha = require('gulp-mocha');
 const electron = require('electron-connect').server.create({
 	verbose: true
 });
@@ -27,4 +28,9 @@ gulp.task('reload:renderer', done => {
 	done();
 });
 
-gulp.task('default', ['dev']);
+// Test app using mocha+spectron
+gulp.task('test', () => {
+	return gulp.src('tests/index.js').pipe(mocha());
+});
+
+gulp.task('default', ['dev', 'test']);

package.json

@@ -1,9 +1,15 @@
 {
-  "name": "Zulip-Desktop",
+  "name": "zulip",
   "productName": "Zulip",
-  "version": "0.3.1",
+  "version": "0.5.4",
   "description": "Zulip Desktop App",
-  "license": "MIT",
+  "license": "Apache-2.0",
+  "email":"<svnitakash@gmail.com>",
+  "copyright": "©2016 Kandra Labs, Inc.",
+  "author": {
+    "name": "Akash Nimare",
+    "email": "svnitakash@gmail.com"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/zulip/zulip-electron.git"
@@ -11,38 +17,77 @@
   "bugs": {
     "url": "https://github.com/zulip/zulip-electron/issues"
   },
-  "main": "app/main/index.js",
   "scripts": {
-    "test": "xo",
+    "start": "electron ./app/main",
-    "start": "electron .",
+    "postinstall": "install-app-deps",
+    "test": "gulp test && xo",
     "dev": "gulp dev",
-    "build:osx": "electron-packager . --out=dist --app-version=$npm_package_version --prune --asar --icon=app/resources/Icon.icns --overwrite --platform=darwin --arch=x64",
+    "pack": "build --dir",
-    "build": "electron-packager . --out=dist --app-version=$npm_package_version --prune --asar --overwrite --all"
+    "dist": "build",
+    "travis": "cd ./scripts && ./travis-build-test.sh"
+  },
+  "build": {
+    "appId": "org.zulip.zulip-electron",
+    "asar": "true",
+    "files": [
+      "**/*",
+      "!node_modules/@paulcbetts/cld/deps/cld${/*}"
+    ],
+    "copyright": "©2016 Kandra Labs, Inc.",
+    "mac": {
+      "category": "public.app-category.productivity"
+    },
+    "linux" : {
+      "synopsis": "Zulip Desktop App",
+      "category": "",
+      "packageCategory": "GNOME;GTK;Network;InstantMessaging",
+      "description": "Zulip Desktop Client for Linux",
+      "target" : ["deb", "AppImage"],
+      "version" : "0.5.4",
+      "title" : "Zulip",
+      "license": "Apache-2.0",
+      "maintainer": "Akash Nimare <svnitakash@gmail.com>"
+    },
+    "dmg": {
+      "background": "build/appdmg.png",
+      "icon": "build/icon.icns",
+      "iconSize": 128,
+      "contents": [
+        {
+          "x": 380,
+          "y": 240,
+          "type": "link",
+          "path": "/Applications"
+        },
+        {
+          "x": 122,
+          "y": 240,
+          "type": "file"
+        }
+      ]
+    },
+    "win": {
+      "target": "squirrel",
+      "icon": "build/icon.ico"
+    }
   },
   "keywords": [
-    "Zulip",
+  	"Zulip",
-    "Group Chat app",
+  	"Group Chat app",
-    "electron-app",
+  	"electron-app",
-    "electron"
+  	"electron",
+  	"Desktop app",
+  	"InstantMessaging"
   ],
-  "dependencies": {
-    "configstore": "^2.0.0",
-    "dialogs": "1.1.14",
-    "electron-context-menu": "0.4.0",
-    "electron-debug": "^1.0.0",
-    "electron-dl": "^0.2.0",
-    "electron-localshortcut": "^0.6.1",
-    "node-json-db": "^0.7.2",
-    "request": "^2.74.0",
-    "simple-spellchecker": "^0.9.0",
-    "wurl": "^2.1.0"
-  },
   "devDependencies": {
+    "assert": "^1.4.1",
     "devtron": "^1.1.0",
-    "electron": "1.3.3",
+    "electron-builder": "10.15.1",
+    "electron": "1.4.7",
     "electron-connect": "^0.4.6",
-    "electron-packager": "^7.0.0",
     "gulp": "^3.9.1",
+    "gulp-mocha": "^3.0.1",
+    "spectron": "^3.3.0",
     "xo": "*"
   },
   "xo": {
@@ -55,13 +100,20 @@
             "warn",
             350
           ],
-          "no-warning-comments": 0
+          "no-warning-comments": 0,
+          "no-else-return": 0,
+          "import/no-unresolved": 0,
+          "import/no-extraneous-dependencies":0
         }
       }
     ],
+    "ignore": [
+      "tests/*.js"
+    ],
     "envs": [
       "node",
-      "browser"
+      "browser",
+      "mocha"
     ]
   }
-}
+}

scripts/travis-build-test.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+  export DISPLAY=:99.0
+  sh -e /etc/init.d/xvfb start
+  sleep 3
+fi
+
+npm run test

tests/index.js

@@ -0,0 +1,27 @@
+const assert = require('assert')
+const Application = require('spectron').Application
+
+describe('application launch', function () {
+  this.timeout(15000)
+
+  beforeEach(function () {
+    this.app = new Application({
+      path: require('electron'),
+      args: [__dirname + '/../app/main/index.js']
+    })
+    return this.app.start()
+  })
+
+  afterEach(function () {
+    if (this.app && this.app.isRunning()) {
+      return this.app.stop()
+    }
+  })
+
+  it('shows an initial window', function () {
+    return this.app.client.getWindowCount().then(function (count) {
+      assert.equal(count, 1)
+    })
+  })
+})
+

zulip-electron-launcher.sh

@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Zulip Beta Client Launcher
+
+# This script ensures that you have the latest version of the specified branch
+# (defaults to master if none specified) and then updates or installs all your
+# required npm modules.
+
+# I recommend symlinking this script into your PATH.
+
+# {{{ showUsage()
+
+showUsage()
+{
+	echo "Usage: $0 <branch_name>"
+	echo "Example: $0 dev"
+	exit 1
+}
+
+# }}}
+# {{{ envSetup()
+
+envSetup()
+{
+	defaultBranch="master"
+	startingDir=`pwd`
+	requirePop=0
+
+	# Check command line arguments
+	if [ "$#" -gt "1" ]
+	then
+		showUsage
+	elif [ "$#" -eq "1" ]
+	then
+		myBranch=$1
+	else
+		myBranch=$defaultBranch
+	fi
+
+	# Set workingDir
+	if [ -L $0 ]
+	then
+		realPath=`ls -l $0 | cut -d '>' -f 2`
+		workingDir=`dirname $realPath`
+	else
+		workingDir="."
+	fi
+
+	# Set name of upstreamRemote
+	cd $workingDir
+	git remote -v | grep "github\.com.zulip.zulip-electron.git (fetch)" > /dev/null 2>&1
+	if [ $? -eq 0 ]
+	then
+		upstreamRemote=`git remote -v | grep "github\.com.zulip.zulip-electron.git (fetch)" | awk '{ print $1 }'`
+	else
+		upstreamRemote="origin"
+	fi
+}
+
+# }}}
+# {{{ gitCheckout()
+
+gitCheckout()
+{
+	git fetch $upstreamRemote
+	git checkout $myBranch
+	git rebase $upstreamRemote/master
+	if [ $? -gt 0 ]
+	then
+		echo "Stashing uncommitted changes and doing a new git pull"
+		git stash && requirePop=1
+		git rebase $upstreamRemote/master
+	fi
+}
+
+# }}}
+# {{{ npmInstallStart()
+
+npmInstallStart()
+{
+	npm install
+	npm start &
+}
+
+# }}}
+# {{{ cleanUp()
+
+cleanUp()
+{
+	# Switch back to branch we started on
+	git checkout -
+
+	# Pop if we stashed
+	if [ $requirePop -eq 1 ]
+	then
+		echo "Popping out uncommitted changes"
+		git stash pop
+	fi
+
+	# Return the whatever dir we started in
+	cd $startingDir
+}
+
+# }}}
+
+envSetup $*
+gitCheckout
+npmInstallStart
+cleanUp