Skip to content
This repository was archived by the owner on Sep 27, 2020. It is now read-only.

Version 1.3.2 #81

Merged
marcelkilian merged 3 commits into from
Jun 6, 2016
Merged

Version 1.3.2 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9b5cb9
fixed not using decorators of created recipe
marcelkilian May 24, 2016
ebe19dd
fixed startup error when no .eintopf folder exists
marcelkilian Jun 6, 2016
1cc3460
increased version to 1.3.2
marcelkilian Jun 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.3.2

Fixed:

- fixed startup error when no .eintopf folder exists
- fixed not using decorators of created recipe

## 1.3.1

Changed:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"productName": "Eintopf",
"identifier": "com.mazehall.eintopf",
"description": "The smartest way to share and administrate docker projects.",
"version": "1.3.1",
"version": "1.3.2",
"author": "Jens Klose <jens.klose@mazehall.com>",
"maintainers": [
"jens klose <jens.klose@mazehall.com>",
Expand Down
6 changes: 3 additions & 3 deletions src/models/projects/list.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ model.installProject = (project, callback) ->
_r.fromNodeCallback (cb) ->
return model.patternPostInstall project, cb if pattern
model.projectPostInstall project, cb
.flatMap ->
_r.fromNodeCallback (cb) ->
customModel.clearCustomization project.id, cb
.flatMap -> # reload projects to enforce view update
_r.fromNodeCallback (cb) ->
model.loadProjects cb
Expand Down Expand Up @@ -100,6 +97,9 @@ model.patternPostInstall = (project, callback) ->
.flatMap -> # remove .git folder
_r.fromNodeCallback (cb) ->
utilModel.removeFileAsync projectDir.path('.git'), cb
.flatMap ->
_r.fromNodeCallback (cb) ->
customModel.clearCustomization project.id, cb
.onError callback
.onValue ->
callback null, true
Expand Down
7 changes: 6 additions & 1 deletion src/models/vagrant/virtualbox.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ utilModel = require "../util/index.coffee"

winVBoxManagePath = 'C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe' # keep slashes

messageNoMachinesFound = 'Vagrant machines not found'

model = {}

# wrapper for VBoxManage execution.
Expand Down Expand Up @@ -66,6 +68,7 @@ model.getOnlyVirtualBoxDir = (callback) ->

_r.fromPromise jetpack.findAsync configDir.path(), {matching: ["./.vagrant/machines/*"]}, "inspect"
.flatMap (folders) ->
return _r.constantError new Error messageNoMachinesFound if folders.length == 0
_r.fromNodeCallback (cb) ->
return cb new Error "can't maintain integrity with multiple machine folders" if folders.length != 1
cb null, folders[0]
Expand Down Expand Up @@ -126,7 +129,9 @@ model.getGuestStatus = (callback) ->
.map (dir) ->
regEx = new RegExp('"' + dir.name + '"')
return regEx.test runningVms
.onError callback
.onError (err) ->
return callback null, false if err.message == messageNoMachinesFound
callback err
.onValue (val) ->
callback null, val

Expand Down
Loading