Merge remote-tracking branch 'origin/master' into terminal

tingbot · Jun 22, 2016 · 985521c · 985521c
2 parents 09d38e1 + 3d9e7bd
commit 985521c
Show file tree

Hide file tree

Showing 25 changed files with 272 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 node_modules
-bower_components
-vendor/tingbot-python
-build
+app/build/
 .jshintrc
 dist/
 env
+npm-debug.log
+vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,45 @@
+osx_image: xcode7.3
+sudo: required
+dist: trusty
+language: c
+matrix:
+  include:
+  - os: linux
+    env: CC=clang CXX=clang++ npm_config_clang=1
+    compiler: clang
+  - os: osx
+cache:
+  directories:
+  - node_modules
+  - app/node_modules
+  - "$HOME/.electron"
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    - llvm-toolchain-precise-3.7
+    packages:
+    - libgnome-keyring-dev
+    - icnsutils
+    - clang-3.7
+    - graphicsmagick
+    - xz-utils
+    - rpm
+before_install:
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git-lfs; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git lfs pull; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -L https://github.com/github/git-lfs/releases/download/v1.2.0/git-lfs-linux-amd64-1.2.0.tar.gz | tar -xz; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git-lfs-1.2.0/git-lfs pull; fi
+install:
+- nvm install 6
+- npm install npm -g
+- npm install electron-builder@next
+- npm install
+- npm prune
+script:
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scripts/bundlePython.sh fi
+- npm run dist
+branches:
+  except:
+  - "/^v\\d+\\.\\d+\\.\\d+$/"
diff --git a/main.js → app/app.js b/main.js → app/app.js
@@ -1,12 +1,12 @@
 const electron = require('electron');
 const app = electron.app;
-const Menu = require('menu');
-const dialog = require('dialog');
-const fs = require('fs');
-const path = require('path');
+const Menu = electron.Menu;
+const dialog = electron.dialog;
 const defaultMenu = require('electron-default-menu')
 const BrowserWindow = electron.BrowserWindow;
 
+if (require('electron-squirrel-startup')) return;
+
 function createWindow(on_load) {
     newWindow = new BrowserWindow({
         width: 800,

diff --git a/index.html → app/index.html b/index.html → app/index.html
@@ -9,7 +9,7 @@
 <body>
   <app></app>
   <script>window.$ = window.jQuery = require('jquery')</script>
-  <script src="dist/build.js"></script>
+  <script src="build/build.js"></script>
 </body>
 
 </html>
diff --git a/app/package.json b/app/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "tide-electron",
+  "version": "0.0.2",
+  "description": "An Electron based IDE for TingBot",
+  "author": {
+    "name": "Tingbot Team",
+    "email": "[email protected]",
+    "url": "http://tingbot.com/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tingbot/tide-electron.git"
+  },
+  "keywords": [
+    "Electron",
+    "TingBot"
+  ],
+  "license": "BSD-2-Clause",
+  "bugs": {
+    "url": "https://github.com/tingbot/tide-electron/issues"
+  },
+  "homepage": "https://github.com/tingbot/tide-electron#readme",
+  "main": "app.js",
+  "dependencies": {
+    "electron-default-menu": "^0.1.1",
+    "electron-squirrel-startup": "^1.0.0"
+  }
+}
diff --git a/app/Tingapp.vue → app/src/Tingapp.vue b/app/Tingapp.vue → app/src/Tingapp.vue
diff --git a/app/components/ControlBar.vue → app/src/components/ControlBar.vue b/app/components/ControlBar.vue → app/src/components/ControlBar.vue
diff --git a/app/components/Editor.vue → app/src/components/Editor.vue b/app/components/Editor.vue → app/src/components/Editor.vue
diff --git a/app/components/File.vue → app/src/components/File.vue b/app/components/File.vue → app/src/components/File.vue
diff --git a/app/components/Sidebar.vue → app/src/components/Sidebar.vue b/app/components/Sidebar.vue → app/src/components/Sidebar.vue
diff --git a/app/main.js → app/src/main.js b/app/main.js → app/src/main.js
diff --git a/app/tingapp.js → app/src/tingapp.js b/app/tingapp.js → app/src/tingapp.js
@@ -15,7 +15,13 @@ class Tingapp {
 
         const newDocumentPath = path.join(tempDir, 'untitled.tingapp');
         console.log(newDocumentPath);
-        fsextra.copySync('./default.tingapp', newDocumentPath);
+        // check for dev to select where to fetch resources from
+        if(/[\\/]electron-prebuilt[\\/]/.test(process.execPath)){
+          fsextra.copySync('./default.tingapp', newDocumentPath);
+        }else{
+          fsextra.copySync(path.join(process.resourcesPath,'default.tingapp'), newDocumentPath);
+        }
+
 
         return new Tingapp(newDocumentPath);
     }

diff --git a/app/src/utils/tbtool.js b/app/src/utils/tbtool.js
@@ -0,0 +1,91 @@
+"use strict";
+import {spawn,spawnSync} from 'child_process';
+import path from 'path';
+import fs from 'fs';
+// var spawn = require('child_process').spawn;
+// var spawnSync = require('child_process').spawnSync;
+var current = null;
+var requirements_met = check_requirements();
+
+
+
+
+function start(tingbot,dir){
+
+  if(!requirements_met && !check_requirements()){
+    return;
+  }
+  var pythonExec = findPython();
+  if(current){
+    current.kill();
+  }
+
+  if(tingbot == "simulate"){
+    current = spawn(pythonExec, ['-m', 'tbtool', 'simulate',dir]);
+      console.log("Spawned");
+  }else{
+    current = spawn(pythonExec, ['-m', 'tbtool','run',tingbot,dir]);
+  }
+
+}
+
+function check_requirements(){
+  console.log("check");
+  var exit;
+  var missing = [];
+
+  var pythonExec = findPython();
+
+  exit = spawnSync(pythonExec,['-V']);
+
+  if(exit.status !== 0){
+    missing.push('Python');
+  }
+
+  exit = spawnSync(pythonExec,['-c','import pygame']);
+
+  if(exit.status !== 0){
+    missing.push('pygame');
+  }
+
+  exit = spawnSync(pythonExec,['-c','import tingbot']);
+
+  if(exit.status !== 0){
+    missing.push('python-tingbot');
+  }
+
+
+  if(missing.length > 0){
+    alert("You are missing: " + missing.toString() + ". Code execution disabled");
+    return false;
+  }
+  return true;
+}
+
+function findPython(){
+  var vendorPath = './vendor/python';
+  if(!/[\\/]electron-prebuilt[\\/]/.test(process.execPath)){
+    vendorPath = path.join(process.resourcesPath,"vendor","python");
+  }
+  try{
+  var pythonStat = fs.statSync(vendorPath);
+  if(!pythonStat.isDirectory()){
+    //no vendor use system python
+    console.log("Using System Python");
+    return 'python';
+  }
+  console.log("Using Bundled Python");
+  if(process.platform === 'win32'){
+    return path.join(vendorPath,"python.exe")
+  }else{
+    return path.join(vendorPath,"bin","python")
+  }
+} catch(ex){
+  console.log("Using System Python");
+  return 'python';
+}
+
+
+}
+
+module.exports.start = start;
diff --git a/img/grid-background.png → app/static/img/grid-background.png b/img/grid-background.png → app/static/img/grid-background.png
diff --git a/img/run.png → app/static/img/run.png b/img/run.png → app/static/img/run.png
diff --git a/img/upload.png → app/static/img/upload.png b/img/upload.png → app/static/img/upload.png
diff --git a/static/style.css → app/static/style.css b/static/style.css → app/static/style.css
@@ -107,11 +107,11 @@ option {
 }
 
 .run-button {
-  -webkit-mask-box-image: url(../img/run.png);
+  -webkit-mask-box-image: url(img/run.png);
 }
 
 .upload-button {
-  -webkit-mask-box-image: url(../img/upload.png);
+  -webkit-mask-box-image: url(img/upload.png);
 }
 
 .stop-button {
@@ -180,7 +180,7 @@ option {
   font: normal normal normal 14px/1 FontAwesome;
   -webkit-font-smoothing: antialiased;
   padding: 0 4px;
-  
+
   visibility: hidden;
   transition: transform 0.2s;
 }
@@ -299,7 +299,7 @@ screen and (min-resolution: 1.0dppx) {
   background-image: url(../img/grid-background.png);
 
   display: flex;
-  align-items: center;  
+  align-items: center;
   justify-content: center;
 }
 

diff --git a/app/utils/tbtool.js b/app/utils/tbtool.js
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,28 @@
+version: 0.4.{build}
+
+platform:
+  - x64
+
+cache:
+  - node_modules
+  - app\node_modules
+  - '%APPDATA%\npm-cache'
+  - '%USERPROFILE%\.electron'
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - ps: Install-Product node 6 x64
+  - 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
+
+test: off
diff --git a/assets/background.png b/assets/background.png
diff --git a/assets/icon.icns b/assets/icon.icns
diff --git a/assets/icon.ico b/assets/icon.ico