Merge pull request #76 from mazehall/development

Version 1.3.0

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "src/public/bower_components"
+}

.gitignore

@@ -7,3 +7,4 @@ Thumbs.db
 /build/
 /releases/
 /tmp/
+/config/local*

.npmrc

@@ -0,0 +1,4 @@
+; electron build options - build packages against electrons node
+disturl = "https://atom.io/download/atom-shell";
+runtime = "electron";
+target = "0.36.9";

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "4.2"
-  - "4.1"
-script: cd app && npm test
+  - "5.0"
+  - "5.10"
+script: npm test
 # requirements for building on node.js 4.0 / io.js v3
 addons:
   apt:

CHANGELOG.md

@@ -1,10 +1,35 @@
-## 1.2.2
+## 1.3
+
+Added:
+
+- projects can now be cloned
+- installed projects can be partially edited
+- loading animations for async actions
+- minimal height for the browser window
+
+Changed:
+
+- installing through a project url now creates a local registry entry
+- replaced vagrant backup with logic that repairs the broken vagrant
+- removed Express Server Layer, so now native electron
+- replaced most vagrant shell calls with a more durable solution
+- improved Eintopf start time
+- design
+
+Fixed:
+
+- issue when starting multiple Eintopf instances
+- incorrect vagrant ssh config values
+- issues when having projects with the same dir name but different upper case letters
+
+
+## 1.2.2 (08.03.2016)
 
 Changed:
 
-- upgraded eintopf proxy to version 1.0.2
+- upgrade eintopf proxy to version 1.0.2
 
-## 1.2.1
+## 1.2.1 (10.02.2016)
 
 Fixed:
 

README.md

@@ -46,7 +46,6 @@ For MacOS homebrewer:
 ---|---|---
  __4480__  | __4480__  | Proxy that provides all started docker container
  __4443__  | __4443__  | Proxy SSL termination point
- __31313__ | __31313__ | Eintopf GUI server
 
 
 The containers being proxied must [expose](https://docs.docker.com/reference/run/#expose-incoming-ports) the port to be proxied, either by using the `EXPOSE` directive in their `Dockerfile` or by using the `--expose` flag to `docker run` or `docker create`.
@@ -70,8 +69,9 @@ The configuration works partially, so you only have to set what you want to over
         "pathDefaultVagrantFile": "config/Vagrantfile.default" # relative path to the Vagrant configuration
       },
       "registry": {
-        "url": "http://registry.eintopf.io/files/projects.json", # set your own registry definition url here 
-        "refreshInterval": "900000" # set the interval in milliseconds to load the registry
+        "url": "http://registry.eintopf.io/files/projects.json", # overwrite community registry 
+        "refreshInterval": "900000", # set the interval in milliseconds to load the registry
+        "private": ["http://127.0.0.1/eintopf-projects.json"] # use your team registry
       }
     }
 
@@ -94,7 +94,7 @@ The following settings are necessary so that Eintopf can use Vagrant :
 - REGISTRY_INTERVAL # set your own registry definition url here
 - REGISTRY_URL # set the interval in milliseconds to load the registry
 
-## Project pattern development
+## Project description development
 
 A pattern is a project configuration which can be used by Eintopf.
 
@@ -106,7 +106,7 @@ Minimal file system:
 The file package.json defines this package as a Eintopf pattern. Minimal package.json:
 
     {
-      "name": "example-pattern", # pattern id
+      "name": "example-pattern",
       "eintopf": {
         "name": "Example-pattern", # pattern name
         "description": "This is my example-pattern. It can be used as ..." # pattern description
@@ -251,28 +251,9 @@ File system:
 
 # Development
 
-## Structure of the project
-
-There are **two** `package.json` files:  
-
-__1. For development__
-
-Sits on path: `eintopf/package.json`. Here you declare dependencies for your development environment and build scripts. **This file is not distributed with real application!**
-
-Also here you declare the version of Electron runtime you want to use:
-```json
-"devDependencies": {
-  "electron-prebuilt": "^0.24.0"
-}
-```
-
-__2. For the application__
-
-Sits on path: `eintopf/app/package.json`. This is **real** manifest of the application. Declare your app dependencies here.
-
 ## Project's folders
 
-- `app` - code of your application goes here.
+- `src` - application code
 - `releases` - ready for distribution installers will land here.
 - `resources` - resources for particular operating system.
 - `tasks` - build and development environment scripts.
@@ -282,31 +263,17 @@ Sits on path: `eintopf/app/package.json`. This is **real** manifest of the appli
 ```
 npm install
 ```
-It will also download Electron runtime, and install dependencies for second `package.json` file inside `app` folder.
-
+Installs package dependencies.
 
 ### Starting the app
 
 ```
 npm start
 ```
+### Npm package building
 
-### Adding pure-js npm modules to your app
-
-Remember to add your dependency to `app/package.json` file, so do:
-```
-cd app
-npm install name_of_npm_module --save
-```
-
-### Adding native npm modules to your app
-
-If you want to install native module you need to compile it agains Electron, not Node.js you are firing in command line by typing `npm install` [(Read more)](https://github.com/atom/electron/blob/master/docs/tutorial/using-native-node-modules.md).
-```
-npm run app-install -- name_of_npm_module
-```
-Of course this method works also for pure-js modules, so you can use it all the time if you're able to remember such an ugly command.
-
+All npm packages are build against the electron node version. This is configured in the .npmrc file.
+Look [(here)](https://github.com/atom/electron/blob/master/docs/tutorial/using-native-node-modules.md) for more info.
 
 ### Making a release