Merge pull request #107 from rafajaques/deploy-tests

rafajaques · web-flow · commit ba1e8aa6039a · 2016-06-10T11:14:18.000-03:00
Fix #106
diff --git a/.travis.yml b/.travis.yml
@@ -23,23 +23,17 @@ addons:
     - icnsutils
     - graphicsmagick
     - xz-utils
-    - gcc-multilib # for building 32 in 64 machine
-    - g++-multilib # for building 32 in 64 machine
-    - rpm # for building rpm pack
-    - bsdtar # for building pacman
+    - gcc-multilib
+    - g++-multilib
+    - rpm
+    - bsdtar
 before_install:
 - npm install -g eslint eslint-config-airbnb
 install:
 - npm install
 after_success:
 - npm run dist:$TRAVIS_OS_NAME
-- ls dist/
-deploy:
-  skip_cleanup: true
-  provider: bintray
-  file: "deploy/descriptor-$TRAVIS_OS_NAME.json"
-  user: rafajaques
-  on:
-    branch: release
-  key:
-    secure: pfY4//jQB8KIqmNxZ9LXzeIWohn9K2At7NamxTdUKytnRhSn7RffYQuOCiBNgS3DPT91VHNaUkyAPsolye3O2NKo7DZLdkksVVeRM324fCPrXyL4CPZdCy5N5W8PrALsRN3XzuNHgP9ENdkOd4dCFBTlaunCvwdkcLkZFxzeSKMuDmRbOZuLz5049uWPs9hVeE/w8p99PQoSTPsnkIWZQbnSYbIxegXTGlb8O1NO2+oJJM4Gy/5C6xU8e7uvffysjqsjG4VO/8o0YpQabttdxfcmdf/u7CKDeoPPxYE4XHpxmFpKzRQ5tLqbKVx3Q2piWNTk0wQ51Udljpd5gDGCdhoZ04liU+H63+FH4ehHzIVFCxoOEBq0wfvJnGJh6/Y4a8ZDmLAoBIsiyiGTEe21Oav7EeGmeYHAqnD0Wx4dB3rbIPh4GfVkVmU3fUeGU3UfM6/zboPTO+hR9I+2LLS/s6ucL32EArae1lTzwtlfTTGiTOYwAVS95INSIE58Fzq/bzWLEmh7Be+AtrEB6/z+npBgQCXoKTBZvI3fe4tpU9IUCQMTl/BVKEKIURGa0NOxc+Jt300TkfYkHzfRTsm8P3JrWMIz20vHQ4u4jVAS9meaDlp8B9Wsh/wCGvMM3D2X32lnVF1uwjSHZmJ4ga1tU9Fbf24oMf41xNcsX+ACaMA=
+- ls dist/$TRAVIS_OS_NAME
+env:
+  global:
+    secure: ZAAQcyMG0qqLSUYAkvIG3r6MuumuD4DiYasIdqFE6XuidwcyRVPNIR2znPp2Rxt6b+qfs0J8L86YsgzbCdj8zRqoifg3e4T9tWh7oCK4KkrkxS0V7vJ5tlRpN2Z/6nAk7I1eaC4gpdDvuZUeiKX+Hy/K4uDffR7w2PNCSh2oRV8pyKstpvc3Jcp8+59xiTpF+0fX2wahG5vYlg5hq2ilaG97lwOgkkb7ODUm2Cr2kGqeIcUJBvrniabKPkZXkiBrbk44cnITDa9xvVR+jbbPRpqtC9jr9XmYK9q4XDx5VTFfh5dXEAL5A3CxyzgzYL83utl4EBCMbWFUW1PPoDFKXO4D5dSuyDXTNdrzrLYQCe/o6ceVVZ3quCQZieAfUm7JJ9ZHVr/PPAIlwfNdw1heJeJ629+ynyr2SLLclVWySTf1yJ6bCZKUGpAAI01Ri89p2BpqpIHpcSJknxjKjPN+i+9QxuTiDZijjTFiQLhLIfzaskeY7TjmfyNtCqADSyfrzpB+dPBjtja2yN8tRtLlMjL+ZFEb933F4wZaZsGxhGlplgDovY5yrGrJtcBu07kapb60NlWU5xy0RMWC69pRsVb2RdqnzWWXW5w6rJBK0bPc5uIxQW1fumCWWkj8f8SdpNmraghGFSjF5IBh0WQ3LpppJDDXm/oo+MmQaeIlPOA=
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 
 [![Travis Build Status](https://travis-ci.org/rafajaques/php-assistant.svg?branch=master)](https://travis-ci.org/rafajaques/php-assistant)
 [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/r4wsabo0ury7a5kg?svg=true)](https://ci.appveyor.com/project/rafajaques/php-assistant)
+[![Latest release](https://img.shields.io/github/tag/rafajaques/php-assistant.svg)](https://github.com/rafajaques/php-assistant/releases)
 [![Dependency Status](https://david-dm.org/rafajaques/php-assistant.svg?path=app)](https://david-dm.org/rafajaques/php-assistant?path=app)
 [![devDependency Status](https://david-dm.org/rafajaques/php-assistant/dev-status.svg)](https://david-dm.org/rafajaques/php-assistant#info=devDependencies)
 [![license:mit](https://img.shields.io/badge/license-mit-blue.svg)](https://opensource.org/licenses/MIT)
@@ -20,11 +21,11 @@ The main goal is to have a simple app to test small pieces of code without havin
 
 You will find the most recent releases at Bintray repositories. Remember that PHP Assistant is still in development, so you may find bugs during its utilization. In case of problem, open an [issue](https://github.com/rafajaques/php-assistant/issues).
 
-Mac OSX [![OSX Download](https://api.bintray.com/packages/rafajaques/mac-osx/php-assistant/images/download.svg) ](https://bintray.com/rafajaques/mac-osx/php-assistant/_latestVersion#files)
-
-Debian/Ubuntu/Mint [![DEB Download](https://api.bintray.com/packages/rafajaques/deb/php-assistant/images/download.svg) ](https://bintray.com/rafajaques/deb/php-assistant/_latestVersion#files)
-
-Windows [![Windows Download](https://api.bintray.com/packages/rafajaques/windows/php-assistant/images/download.svg) ](https://bintray.com/rafajaques/windows/php-assistant/_latestVersion#files)
+[![Mac OSX Download](https://img.shields.io/badge/download-Mac%20OSX-blue.svg)](link)
+[![Debian/Ubuntu/Mint 32](https://img.shields.io/badge/download-Debian%2FUbuntu%2FMint%20(32)-blue.svg)](link)
+[![Debian/Ubuntu/Mint 64](https://img.shields.io/badge/download-Debian%2FUbuntu%2FMint%20(64)-blue.svg)](link)
+[![Windows 32 Download](https://img.shields.io/badge/download-Windows%20(32)-blue.svg)](link)
+[![Windows 64 Download](https://img.shields.io/badge/download-Windows%20(64)-blue.svg)](link)
 
 ## Building
 
diff --git a/app/locales/da.json b/app/locales/da.json
@@ -32,7 +32,6 @@
 	"Requires restart": "Kræver genstart",
 	"Presentation mode": "Præsentations mode",
 	"Auto run code": "Auto kør kode",
-	"Actions": "Actions",
 	"Toggle mode": "Skift mode",
 	"Edit": "Rediger",
 	"Undo": "Fortryd",
@@ -90,5 +89,6 @@
 	"Update available": "Update available",
 	"Check for updates automatically": "Check for updates automatically",
 	"Check for updates now": "Check for updates now",
-	"Default font size": "Default font size"
-}
+	"Default font size": "Default font size",
+	"File": "File"
+}
diff --git a/app/locales/de.json b/app/locales/de.json
@@ -30,7 +30,6 @@
 	"Tray only": "Nur Taskleiste",
 	"Regular + Tray": "Normal + Taskleiste",
 	"Requires restart": "Neustart erforderlich",
-	"Actions": "Aktionen",
 	"Toggle mode": "Modus umschalten",
 	"Edit": "Bearbeiten",
 	"Undo": "Rückgänig",
@@ -90,5 +89,6 @@
 	"Update available": "Update available",
 	"Check for updates automatically": "Check for updates automatically",
 	"Check for updates now": "Check for updates now",
-	"Default font size": "Default font size"
-}
+	"Default font size": "Default font size",
+	"File": "File"
+}
diff --git a/app/locales/en.json b/app/locales/en.json
@@ -51,7 +51,6 @@
 	"Bring All to Front": "Bring All to Front",
 	"Toggle mode": "Toggle mode",
 	"Preferences": "Preferences",
-	"Actions": "Actions",
 	"PHP binary found!": "PHP binary found!",
 	"Starting app...": "Starting app...",
 	"PHP Assistant: First run check...": "PHP Assistant: First run check...",
@@ -90,5 +89,6 @@
 	"Update available": "Update available",
 	"Check for updates automatically": "Check for updates automatically",
 	"Check for updates now": "Check for updates now",
-	"Default font size": "Default font size"
-}
+	"Default font size": "Default font size",
+	"File": "File"
+}
diff --git a/app/locales/fr.json b/app/locales/fr.json
@@ -51,7 +51,6 @@
 	"Bring All to Front": "Bring All to Front",
 	"Toggle mode": "Toggle mode",
 	"Preferences": "Preferences",
-	"Actions": "Actions",
 	"PHP binary found!": "PHP binary found!",
 	"Starting app...": "Starting app...",
 	"PHP Assistant: First run check...": "PHP Assistant: First run check...",
@@ -90,5 +89,6 @@
 	"Update available": "Update available",
 	"Check for updates automatically": "Check for updates automatically",
 	"Check for updates now": "Check for updates now",
-	"Default font size": "Default font size"
-}
+	"Default font size": "Default font size",
+	"File": "File"
+}
diff --git a/app/locales/pt-BR.json b/app/locales/pt-BR.json
@@ -51,7 +51,6 @@
 	"Bring All to Front": "Trazer todas para frente",
 	"Toggle mode": "Alternar modo",
 	"Preferences": "Preferências",
-	"Actions": "Ações",
 	"PHP binary found!": "Binário do PHP encontrado!",
 	"Starting app...": "Iniciando a aplicação...",
 	"PHP Assistant: First run check...": "PHP Assistant: Checagem da primeira execução...",
@@ -90,5 +89,6 @@
 	"Update available": "Atualização disponível",
 	"Check for updates automatically": "Procurar atualizações automaticamente",
 	"Check for updates now": "Procurar atualizações agora",
-	"Default font size": "Tamanho de fonte padrão"
+	"Default font size": "Tamanho de fonte padrão",
+	"File": "Arquivo"
 }
diff --git a/app/main.js b/app/main.js
@@ -79,6 +79,11 @@ app.on('ready', () => {
   }
 });
 
+/* In case of all windows are closed */
+app.on('window-all-closed', () => {
+  app.quit();
+});
+
 function startApp() {
   // Loading main HTML
   mainWindow.loadURL('file://' + Path.join(__dirname, 'index.html'));
@@ -254,7 +259,7 @@ function getExternalDisplayBounds() {
 function createMenu() {
   const template = [
     {
-      label: i18n.__('Actions'),
+      label: i18n.__('File'),
       submenu: [
         {
           label: i18n.__('Run code'),
@@ -369,6 +374,12 @@ function createMenu() {
           accelerator: 'CmdOrCtrl+M',
           role: 'minimize'
         },
+        {
+          label: i18n.__('Hide'),
+          accelerator: 'CmdOrCtrl+H',
+          role: 'hide',
+          click: () => mainWindow.hide()
+        },
       ]
     },
     {
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phpassistant",
   "productName": "PHP Assistant",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "main.js",
   "description": "A cross-platform desktop PHP runner",
   "author": "Rafael Jaques <rafael@phpit.com.br>",
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,56 +1,24 @@
-version: 0.4.{build}
-
+version: 0.5.{build}
 platform:
   - x64
-
 cache:
   - node_modules
   - app\node_modules
   - '%APPDATA%\npm-cache'
   - '%USERPROFILE%\.electron'
-
 init:
   - git config --global core.autocrlf input
-
 install:
   - git reset --hard HEAD
   - npm install npm -g
   - npm install electron-builder@next # force install next version to test electron-builder
   - npm install
   - npm prune
-
 build_script:
   - node --version
   - npm --version
   - npm run dist:win
-
-artifacts:
-  - path: dist\win\*.exe
-    name: win64-installer
-    type: zip
-  - path: dist\win-ia32\*.exe
-    name: win32-installer
-    type: zip
-  # - path: dist\win-unpacked
-  #   name: win64-standalone
-  #   type: zip
-  # - path: dist\win-ia32-unpacked
-  #   name: win32-standalone
-  #   type: zip
-
-deploy:
-  - provider: BinTray
-    username: rafajaques
-    api_key:
-      secure: C3BCPbZfcKkbEDdCofae+VImfUy5XlMoZueo0N2HT7Bf8H0QiWS6SQ/XpMdEiFvy
-    subject: rafajaques
-    repo: windows
-    package: "php-assistant"
-    version: 0.0.9
-    publish: true
-    override: true
-    explode: true
-    on:
-      branch: release
-
+environment:
+  GH_TOKEN:
+    secure: SsWMU6aC2YeEqjKERctSLqPZOLjTlmjkj5df53e8kvWhW8BRvboGNz0Pp43yUMcq
 test: off
diff --git a/deploy/descriptor-linux.json b/deploy/descriptor-linux.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "0.0.9",
+        "name": "0.0.10",
         "desc": "Minor release",
-        "released": "2016-06-06",
-        "vcs_tag": "0.0.9",
+        "released": "2016-06-09",
+        "vcs_tag": "0.0.10",
         "gpgSign": false
     },
 
diff --git a/deploy/descriptor-osx.json b/deploy/descriptor-osx.json
@@ -16,10 +16,10 @@
     },
 
     "version": {
-        "name": "0.0.9",
+        "name": "0.0.10",
         "desc": "Minor release",
-        "released": "2016-06-06",
-        "vcs_tag": "0.0.9",
+        "released": "2016-06-09",
+        "vcs_tag": "0.0.10",
         "gpgSign": false
     },
 
diff --git a/package.json b/package.json
@@ -6,25 +6,28 @@
     "locale-sync": "/usr/bin/env php ./tools/locale-sync.php",
     "test": "eslint ./app/main.js ./app/js/*",
     "postinstall": "install-app-deps",
+    "pack": "build --target dir",
     "dist": "build --windows --linux --osx",
-    "dist:osx": "build --osx",
-    "dist:linux": "build --linux",
+    "dist:osx": "build --osx --publish onTagOrDraft",
+    "dist:linux": "npm run dist:linux32 && npm run dist:linux64",
+    "dist:linux32": "build --linux --ia32 --publish onTagOrDraft",
+    "dist:linux64": "build --linux --x64 --publish onTagOrDraft",
     "dist:win": "npm run dist:win32 && npm run dist:win64",
-    "dist:win32": "build --windows --ia32",
-    "dist:win64": "build --windows --x64"
+    "dist:win32": "build --windows --ia32 --publish onTagOrDraft",
+    "dist:win64": "build --windows --x64 --publish onTagOrDraft"
   },
   "build": {
     "app-bundle-id": "br.rafajaques.phpassistant",
     "app-category-type": "public.app-category.utilities",
     "iconUrl": "http://rafajaques.com.br/php-assistant/icon.ico"
   },
   "devDependencies": {
-    "electron-prebuilt": "^1.2.1",
-    "electron-builder": "^4.2.2",
+    "electron-prebuilt": "^1.2.2",
+    "electron-builder": "^5.1.0",
     "eslint": "^2.11.1",
     "eslint-config-airbnb": "^9.0.1",
-    "eslint-plugin-import": "^1.8.0",
-    "eslint-plugin-jsx-a11y": "^1.2.2",
+    "eslint-plugin-import": "^1.8.1",
+    "eslint-plugin-jsx-a11y": "^1.3.0",
     "eslint-plugin-react": "^5.1.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "phpassistant",`
`3`	`3`	`"productName": "PHP Assistant",`
`4`		`- "version": "0.0.9",`
	`4`	`+ "version": "0.0.10",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"description": "A cross-platform desktop PHP runner",`
`7`	`7`	`"author": "Rafael Jaques <rafael@phpit.com.br>",`