Merge pull request #327 from adafruit/rework

Simplification and rebuild of the webide

Author: jwcooper

.gitignore

@@ -2,7 +2,7 @@
 
 node_modules
 repositories
-users.db
+database/webide_data_store
 
 /editor.tar.gz
 __MACOSX

.travis.yml

@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 0.8
-  - 0.6
+  - 4.8.2

README.md

@@ -1,13 +1,15 @@
 Adafruit webIDE
 ================
-This is a simple editor designed to help learn the Raspberry Pi (including the Raspberry Pi 2) and Beaglebone components, and more. This editor is designed solely for use on your secure private network as of now.
+This is a simple editor designed to help learn the Raspberry Pi and Beaglebone components, and more. This editor is designed solely for use on your secure private network as of now.
 
 Debian Installation (Raspberry Pi and BeagleBone Black)
 ============
 
+The WebIDE installer is currently targeting Debian Stretch (latest Raspbian) installations only.
+
 On the Raspberry PI or BeagleBone Black (after expanding the file system):
 
-    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/install.sh | sudo sh
+    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/master/scripts/install.sh | sudo sh
 
 Alternatively, you can install using the .deb file:
 
@@ -21,57 +23,24 @@ If you don't need these features, feel free to manually install the editor below
 
 Note: This is also the default installation for any Debian or Ubuntu operating systems
 
-Angstrom Installation (BeagleBone Black)
-============
-
-On the Beaglebone (as the default root user), execute each line independently:
-
-    echo "nameserver 8.8.8.8" >> /etc/resolv.conf
-    curl -k https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/install-angstrom.sh | sh
-
-Note: The curl -k command is used due to the Beaglebone not having the github SSL certificate in the default installation.
-
-Note: If you've replaced the default operating system (Angstrom) with Debian or Ubuntu, use the Raspberry Pi installation instructions.
-
-Manual Installation (without process monitor)
+Manual Installation
 ============
 
-On the Raspberry PI:
-
-    sudo apt-get update && sudo apt-get -y install build-essential nodejs nodejs-legacy npm redis-server git
-    git clone git://github.com/adafruit/Adafruit-WebIDE.git
-    cd Adafruit-WebIDE
-    mkdir tmp
-    npm config set tmp tmp
-    npm install
-    editor config/config.js (change port 80 to your port of choice)
-    nodejs server.js
-
-You can look at the install.sh script if you'd like a process monitor, and to install it
-as a daemon.
+Follow along in the [installation script][1] and pick and choose
+the components you'd like to install.
 
 Uninstallation
 ============
 
 Debian (Raspberry PI and BeagleBone Black):
 
-    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/uninstall.sh | sudo sh
-
-Or if you installed with the .deb file:
-
-    sudo apt-get remove adafruitwebide
-
-Angstrom (BeagleBone Black, as default root user):
-
-    curl -k https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/uninstall-angstrom.sh | sh
+    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/master/scripts/uninstall.sh | sudo sh
 
 Manual Uninstallation
 ============
 
-On the Raspberry PI or BeagleBone Black:
-
-    rm -r Adafruit-WebIDE
-    rm ~/.ssh/id_rsa_bitbucket*
+Follow along in the [uninstallation script][2] and pick and choose
+the components you'd like to remove.
 
 Running the Editor
 ============
@@ -80,7 +49,7 @@ Using Firefox or Chrome (and likely any other webkit browser) on any computer in
 
 Raspberry Pi:
 
-    http://raspberrypi.local
+    http://raspberrypi.local:8080
 
 BeagleBone:
 
@@ -91,35 +60,17 @@ Restart the Editor
 
 If for any reason you need to restart the editor, you can execute the following commands in order
 
-    sudo service adafruit-webide.sh stop
-    sudo service adafruit-webide.sh start
+    sudo systemctl restart adafruit-webide
+    sudo systemctl start adafruit-webide
 
 Sudo is required to restart due to the editor running as the 'webide' user.
 
-Advanced Options
+Status or Logs for the Editor
 ============
 
-Offline Mode Installation:
-
-    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/install.sh | sudo sh -s - --offline
-
-Note: Offline mode does not setup git in any way other than installing it.  You'll want to git config your
-email and name, and setup your ssh keys.
-
-GitHub Mode Installation:
-
-    curl https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/scripts/install.sh | sudo sh -s - --github
+sudo systemctl status adafruit-webide
 
-Note: GitHub mode does not automatically create, and post an ssh key to your GitHub account.  It requires
-a bit more manual setup at this time.
-
-Enable support for Makefiles (execute on the Pi in the terminal, post-installation):
-
-    redis-cli hmset editor:settings enable_make "on"
-
-Disable:
-
-    redis-cli hmset editor:settings enable_make "off"
+Logs are in syslog: /var/log/syslog
 
 License
 ============
@@ -130,3 +81,6 @@ http://www.gnu.org/licenses/agpl-3.0.html
 SCREENSHOTS
 ===========
 ![ScreenShot](http://www.adafruit.com/adablog/wp-content/uploads/2012/10/WebIDE_Alpha.jpg)
+
+[1]: https://github.com/adafruit/Adafruit-WebIDE/blob/master/scripts/install.sh
+[2]: https://github.com/adafruit/Adafruit-WebIDE/blob/master/scripts/uninstall.sh

bin/node_hf/node

@@ -2,19 +2,16 @@ Welcome to the Adafruit webIDE.
 
 We've pre-loaded the Adafruit Python libraries that you may find useful.  
 
-By navigating into those libraries, you can choose to copy them into your 
-project folder, so you can edit, and save them.  If you ever need to start 
-over, just delete your copied project folder, and grab the 
+By navigating into those libraries, you can choose to copy them into your
+project folder, so you can edit, and save them.  If you ever need to start
+over, just delete your copied project folder, and grab the
 Adafruit libraries again.
 
-We've also created a folder you can start putting your projects into.  This 
-is a version-controlled repository stored in your Bitbucket account.  
-Whenever you create projects and files within this folder, they will be 
-versioned and saved at Bitbucket.
+We've also created a folder you can start putting your projects into.
 
-This file was pre-loaded in your projects folder, and is located in the 
+This file was pre-loaded in your projects folder, and is located in the
 'my-pi-projects' link to the left.
 
 We have usage information, installation instructions and various
-other information you may find useful at the Adafruit Learning System: 
+other information you may find useful at the Adafruit Learning System:
 http://learn.adafruit.com/webide

bin/node_hf/version.md

@@ -3,11 +3,9 @@
 //Change offline in /config.
 //Change github in /config.
 exports.editor = {
-  "port": 80,
-  "version": "0.3.12",
-  "version_url": "https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/alpha/release/version.txt",
-  "offline": false,
-  "github": false
+  "port": 3000,
+  "version": "0.7.0",
+  "version_url": "https://raw.githubusercontent.com/adafruit/Adafruit-WebIDE/rework/release/version.txt"
 };
 
 exports.adafruit = {