Merge pull request #203 from tinytacoteam/feature/electron-builder

Switch to electron builder.

.github/CONTRIBUTING.md

@@ -0,0 +1,45 @@
+## Getting Involved
+
+### What's being worked on now
+
+The core team tracks what is currently being worked on on the [Zazu Project
+Board][Zazu Project Board].
+
+### Zazu Core
+
+You can also look through currently open issues in Zazu Core. Often, the ones
+not being worked on are marked with a [help wanted][help wanted tag]. tag.
+
+### Plugins
+
+Plugin development is also a great way to get involved. Zazu needs plugin to do
+anything useful for a user. If you create one, start the repo name with `zazu-`
+and feel free to submit it to the plugin directory once you get it working! If
+you need help getting started there is documentation on [creating a
+plugin][plugin page].
+
+## Community
+
+You can find the community and core developers on [Gitter Chat][Gitter Chat].
+
+## Core Team Guidelines
+
+If you're part of Zazu's core team there are a few guidelines for you as well.
+
+When starting work, please update the [Zazu Project Board][Zazu Project Board]
+with your current task. When you create a pull request, add a reviewer who is
+also on the core team.
+
+If you get added as a reviewer and you don't have time to get to it in the next
+day or two, feel free to comment or re-assign the ticket, things come up, we
+understand! [:
+
+If there is no reviewer on a pull request, from a non-core member for example,
+assign it to yourself and take it from there.
+
+Lastly, if you approve of the change, merge the pull request yourself.
+
+[Zazu Project Board]: https://github.com/orgs/tinytacoteam/projects/1
+[helped wanted tag]: https://github.com/tinytacoteam/zazu/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
+[plugin page]: http://zazuapp.org/documentation/plugins/
+[Gitter Chat]: https://gitter.im/tinytacoteam/zazu

.gitignore

@@ -4,9 +4,10 @@ log
 .DS_Store
 Thumbs.db
 *.autogenerated
-/build/
-/releases/
-/tmp/
+build
+releases
+dist
+tmp
 docs/_site
 databases
 zazu-fallback

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '6.3.0'
+  - '6.5.0'
 os:
   - linux
   - osx
@@ -11,16 +11,6 @@ before_install:
       export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start;
     fi
 script:
-  - npm run dev-release
   - npm run cucumber
   - npm test
-deploy:
-  provider: releases
-  api_key:
-    secure: cM5cbkBVEZgx0+vTnUzvEgtRs38G/bQn7EG2xXuQSlwf3rTUqTS62kai5Gfw7GCpK9SfQ6KBimihVDWpX1z4TGSa6dsS+wy8Ee2utynJBl0vY7gEaMZdV7spfU5Af0tgrI9NJGaGm9TxPYnHG5KafTCPoeEB+QGzkMOCGYArQSCPF+qPAAqD3Q/z2KYT4wdkD6cpe0gmT9cWTso2vj1DW8MLGv25ADJkfWde1kdYaYsIAUxDL8ijZcsCUWPJpZMNN3lbLrW1pMCQt/ZKWsoBIbYnK9PJ45IAD7mufJmUmfOrX4JS7cF+OIHecL/5rpkmbGojQ8imouqEPiaIqZ3soJB+K/ZqFMXYU1oX1Hl8mR62iWlJ6tpZyJFwLpdioXLzPhDpJlABpj4WH6OfbvnldR6a4OTqxSp9+sCYlTLINsrMObXzk2//GN7HhKTKKLCb2hS4gx3EFH/YNtMmONTnba5uMwDe3b66ogjVK4/iUpxAIXDNFSRJV6yRUsISEMjmsND9L0TKcPPnZ3OUhtEGveWJ2qA8PUJlTLbIzudsri1GnRlXlHi2EPYRHH3HT9gmdFHB8PoyUdc1c9H2DXOnSX7/Yr9nNzRaUxfn8Tii53Te/7SPkfQKpFM5hsp4yJRg4w3auskfCB4xg+bT4f0BpAB+fasLAeyHV+gGN4SxEAs=
-  file: "releases/*"
-  file_glob: true
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: tinytacoteam/zazu
+  - npm run release

README.md

@@ -43,3 +43,17 @@ will open by default. You can enable debug mode by adding a `debug` flag to
   "plugins": []
 }
 ~~~
+
+## Deployment
+
+To deploy simple update the version in both `package.json` and
+`app/package.json` (eg `0.3.2`). After comitting you can tag the release, but
+be sure to add the `v` in front (eg `v0.3.2`). Push the commits then the tag.
+
+The CI servers will upload the assets once the tests are done passing, the new
+release should be a draft, so once all assets are published you can publish the
+release on GitHub.
+
+Lastly, you should re-publish the docs. Zazu uses the doc website to see if a
+new release is available so doing a quick release will allow others to download
+the newest version. Simply run `npm run docs:publish`.

app/package.json

@@ -1,13 +1,12 @@
 {
   "name": "zazu",
-  "productName": "Zazu",
-  "identifier": "com.tinytacoteam.zazu",
+  "version": "0.4.0",
   "description": "A cross platform productivity application.",
-  "version": "0.3.2",
-  "author": "Blaine Schmeisser <[email protected]>",
-  "main": "background.js",
+  "email": "[email protected]",
+  "author": "Tiny Taco Team <[email protected]>",
   "homepage": "http://zazuapp.org",
   "license": "MIT",
+  "main": "background.js",
   "dependencies": {
     "auto-launch": "^2.1.0",
     "babel-register": "^6.18.0",
@@ -29,16 +28,5 @@
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
     "babelify": "^7.3.0"
-  },
-  "packageNameTemplate": "{{name}}-v{{version}}-{{platform}}-{{arch}}",
-  "osx": {
-    "build": "1",
-    "identifier": "com.tinytacoteam.zazu",
-    "LSApplicationCategoryType": "public.app-category.productivity",
-    "//codeSignIdentitiy": {
-      "dmg": "Developer ID Application: Company Name (APPIDENTITY)",
-      "MAS": "3rd Party Mac Developer Application: Company Name (APPIDENTITY)",
-      "MASInstaller": "3rd Party Mac Developer Installer: Company Name (APPIDENTITY)"
-    }
   }
 }

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  nodejs_version: "6"
+  nodejs_version: "6.5.0"
 
 os: unstable
 
@@ -12,22 +12,8 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm run dev-release
   - npm run cucumber
   - npm test
-
-artifacts:
-  - path: releases\*.exe
-    name: ZazuWin
-
-deploy:
-  provider: GitHub
-  auth_token:
-    secure: XJXnzo2BTOVQ/JOyd7ccmoVhucZbl3lEzeKACXgROih54K5JZKGIjAdx1pAX/E+G
-  artifact: ZazuWin
-  draft: false
-  prerelease: false
-  on:
-    appveyor_repo_tag: true
+  - npm run release
 
 build: off

changelog.md

@@ -1,3 +1,23 @@
+## 0.3.3
+
+### Bugs
+
+* Better detection if GIT is installed. #200
+* Fix issue with prefix script and optional dependencies. #154
+* Catch http exceptions when not connected to the internet. #211
+
+### Features
+
+* Add ability to be portable. (Thanks [schmic][schmic]!) #164
+* Check for updates every 24 hours, not just once. #170
+* Allow about text to be copy-able. #88
+* Better ranking algorithm based on block type. #176
+* Follow the cursor instead of always being on the primary monitor. (Thanks
+  [eldinoyev][eldinoyev]!) #169
+* Show error screen when no plugins are installed. (Thanks
+  [eldinoyev][eldinoyev]!) #193
+* Add a new block type for reloading configuration. #198
+
 ## 0.3.2
 
 ## Bugs
@@ -88,3 +108,6 @@
 * Scoped blocks now descope when toggling via the menu item. #44
 * Gracefully handle toggling devtools when no window is open. #45
 * Clear results when you close Zazu so they don't clear when you open. #46
+
+[schmic]: https://github.com/schmic
+[eldinoyev]: https://github.com/eldinoyev

features/step_definitions/myStepDefinitions.js

@@ -21,7 +21,7 @@ class World {
       jetpack.copy(fallbackProfile, homeProfile, { overwrite: true })
     }
     this.app = new Application({
-      path: require('electron-prebuilt'),
+      path: require('electron'),
       args: [appPath],
       env: {
         NODE_ENV: 'test',

package.json

@@ -1,12 +1,57 @@
 {
+  "version": "0.4.0",
+  "build": {
+    "productName": "Zazu",
+    "appId": "com.tinytacoteam.zazu",
+    "publish": [
+      "github"
+    ],
+    "win": {
+      "target": [
+        "nsis"
+      ],
+      "icon": "resources/windows/icon.ico"
+    },
+    "nsis": {
+      "oneClick": true,
+      "installerHeaderIcon": "resources/windows/setup-icon.ico"
+    },
+    "linux": {
+      "target": [
+        "deb"
+      ]
+    },
+    "mac": {
+      "target": [
+        "dmg"
+      ],
+      "icon": "resources/osx/icon.icns",
+      "category": "public.app-category.productivity"
+    },
+    "dmg": {
+      "icon": "resources/osx/dmg-icon.icns",
+      "background": "resources/osx/dmg-background.png"
+    },
+    "directories": {
+      "buildResources": "resources"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://[email protected]/tinytacoteam/zazu.git"
+  },
+  "bugs": {
+    "url": "https://github.com/tinytacoteam/zazu/issues"
+  },
   "devDependencies": {
     "asar": "^0.10.0",
     "chai": "^3.5.0",
     "cheerio": "^0.20.0",
     "cross-env": "^2.0.0",
     "cucumber": "^1.2.2",
+    "electron": "~1.3.1",
+    "electron-builder": "^11.5.2",
     "electron-mocha": "^1.0.0",
-    "electron-prebuilt": "~1.3.1",
     "eslint": "2.3.0",
     "eslint-config-standard": "5.1.0",
     "eslint-plugin-promise": "1.1.0",
@@ -31,9 +76,8 @@
   "scripts": {
     "prepush": "npm run lint && npm test",
     "postinstall": "cd app && npm install",
-    "dev-release": "gulp release --env=production",
     "prerelease": "npm install",
-    "release": "npm run dev-release",
+    "release": "cross-env DEBUG=electron-builder build --x64 --publish onTag",
     "start": "cross-env NODE_ENV=development electron ./app",
     "test": "cross-env NODE_ENV=test electron-mocha --recursive test/app",
     "cucumber": "cucumberjs",