Merge pull request #80 from mazehall/development

more fixes for 1.3.1

.npmrc

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

CHANGELOG.md

@@ -4,14 +4,17 @@ Changed:
 
 - closes project detail popup when clicking an action
 - redirects to project page after successful project edit save
-- Improved online check to try 3 times before actually setting offline state
+- improved online check to try 3 times before actually setting offline state
+- electron version 0.36.12
 
 Fixed:
 
+- fixed config issues -> replaced custom config implementation with a more native solution 
 - project cloning/installation and removing not finishing when custom.json does not exist
 - removing and reinstalling a running project shows wrong state in project listing
 - not showing configured design after clone when there was already a customization with that id
 - redundancy in apps frontend stream initialization
+- fixed deprecated electron initialization
 
 ## 1.3
 

README.md

@@ -272,7 +272,7 @@ npm start
 ```
 ### Npm package building
 
-All npm packages are build against the electron node version. This is configured in the .npmrc file.
+All npm packages are build against the electron node version. This is configured in the .npmrc file. If you use a newer electron version change it in .npmrc (target = ... ) as well.
 Look [(here)](https://github.com/atom/electron/blob/master/docs/tutorial/using-native-node-modules.md) for more info.
 
 ### Making a release

config/test.json

@@ -1,9 +1,7 @@
 {
   "registry": {
-    "url": "",
+    "public": "",
+    "private": [],
     "refreshInterval": "900000"
-  },
-  "test": {
-    "key": "value"
   }
 }

package.json

@@ -20,7 +20,7 @@
     "ansi-to-html-umd": "^0.4.2",
     "asar": "^0.8.0",
     "coffee-script": "1.9.3",
-    "config": "^1.15.0",
+    "config": "^1.20.2",
     "docker-events": "0.0.2",
     "dockerode": "^2.2.9",
     "fs-jetpack": "^0.7.0",
@@ -34,7 +34,7 @@
     "tmp": "0.0.28"
   },
   "devDependencies": {
-    "electron-prebuilt": "^0.37.5",
+    "electron-prebuilt": "^0.36.12",
     "gulp": "^3.9.0",
     "gulp-clean": "^0.3.1",
     "gulp-concat": "^2.5.2",

src/app.coffee

@@ -1,3 +1,6 @@
+utilsModel = require './models/util'
+utilsModel.initConfig()
+
 eventHandler = require './handler/events.coffee'
 setupModel = require './models/setup/setup.coffee'
 projectsModel = require './models/projects/list.coffee'

src/handler/runtimeStreams.coffee

@@ -2,7 +2,7 @@ _r = require 'kefir'
 ks = require 'kefir-storage'
 isOnline = require 'is-online'
 
-config = require '../models/stores/config'
+config = require 'config'
 utilModel = require '../models/util'
 dockerProxyModel = require '../models/docker/proxy.coffee'
 dockerListModel = require '../models/docker/list.coffee'

src/main.js

@@ -1,7 +1,9 @@
 require('coffee-script/register');
-var app = require('app');
-var shell = require('shell');
-var BrowserWindow = require('browser-window');
+const electron = require('electron');
+
+const app = electron.app;
+const shell = electron.shell;
+const BrowserWindow = electron.BrowserWindow;
 var windowStateKeeper = require('./utils/window_state');
 var windowMenu = require('./utils/window_menu');
 

src/models/docker/proxy.coffee

@@ -1,6 +1,6 @@
 _r = require 'kefir'
+config = require 'config'
 
-config = require '../stores/config.coffee'
 dockerModel = require '.'
 
 proxyConfig = config.get 'proxy'

src/models/registry/index.coffee

@@ -1,8 +1,8 @@
 _r = require 'kefir'
 ks = require 'kefir-storage'
 crypto = require "crypto"
+config = require 'config'
 
-config = require '../stores/config.coffee'
 utils = require '../util/index.coffee'
 remote = require './remote.coffee'
 local = require './local.coffee'

src/models/setup/setup.coffee

@@ -1,7 +1,7 @@
 _r = require 'kefir'
 ks = require 'kefir-storage'
+config = require 'config'
 
-config = require '../stores/config'
 vagrantFsModel = require '../vagrant/fs.coffee'
 vagrantRunModel = require '../vagrant/run.coffee'
 virtualBoxModel = require '../vagrant/virtualbox.coffee'

src/models/util/index.coffee

@@ -9,11 +9,20 @@ convert = new Convert();
 
 model = {}
 
-# use original config first and let it overwrite later with the custom config
-model.setConfig = (newConfig) ->
-  return false if ! newConfig || typeof newConfig != "object"
-  config = newConfig
-  return true
+# sync - extends default config with user config.
+# Changes to require('config') can only be made before the first .get call. After that it gets immutable
+model.initConfig = () ->
+  return false if ! (configModulePath = @getConfigModulePath())
+  configPath = jetpack.cwd(configModulePath).path('config.json')
+
+  #@todo improve error handling -> show config errors on eintopf startup
+  try
+    userConfig = jetpack.read configPath, 'json'
+    config.util.extendDeep config, userConfig
+  catch err
+    if process.env.NODE_ENV == 'development'
+      console.log 'Failed to load user config in ' + configPath
+      console.log 'Error message: ' + err.message
 
 # resolves relative paths
 model.resolvePath = (path) ->
@@ -46,20 +55,6 @@ model.getConfigModulePath = () ->
   return null if ! (configPath = @getConfigPath())? || ! config?.app?.defaultNamespace
   return jetpack.cwd(configPath).path config.app.defaultNamespace
 
-model.loadUserConfig = (callback) ->
-  return callback new Error 'Failed to get config module path' if ! (configModulePath = @getConfigModulePath())
-  @loadJson  jetpack.cwd(configModulePath).path('config.json'), callback
-
-model.loadJson = (path, callback) ->
-  return callback new Error 'Invalid path' if ! path
-
-  try
-    userConfig = jetpack.read path, 'json'
-  catch err
-    return callback err
-
-  return callback null, userConfig
-
 model.loadJsonAsync = (path, callback) ->
   return callback new Error 'Invalid path' if ! path
 

src/models/vagrant/fs.coffee

@@ -1,7 +1,7 @@
 _r = require 'kefir'
 jetpack = require 'fs-jetpack'
+config = require 'config'
 
-config = require '../stores/config'
 utilModel = require '../util/'
 
 appConfig = config.get 'app'

src/utils/window_menu.js

@@ -1,7 +1,7 @@
-var app  = require('app');
-var Menu = require('menu');
-var shell = require('shell');
-
+var electron = require('electron');
+var app  = electron.app;
+var Menu = electron.Menu;
+var shell = electron.shell;
 
 var template = [
   {

src/utils/window_state.js

@@ -4,13 +4,14 @@
 
 'use strict';
 
-var app = require('app');
+var electron = require('electron');
+var app = electron.app;
 var jetpack = require('fs-jetpack');
 
 module.exports = function (name, defaults) {
 
     var userDataDir = jetpack.cwd(app.getPath('userData'));
-    var stateStoreFile = 'window-state-' + name +'.json'
+    var stateStoreFile = 'window-state-' + name +'.json';
 
     var state = userDataDir.read(stateStoreFile, 'json') || {
         width: defaults.width,

tasks/postinstall.js

@@ -19,6 +19,7 @@ if (process.platform === 'win32') {
 var params = ['install', 'pty.js'];
 
 var install = childProcess.spawn(installCommand, params, {
+    cwd: process.cwd(),
     env: process.env,
     stdio: 'inherit'
 });