Skip to content
This repository has been archived by the owner on Apr 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/0.14.3' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
fearenales committed Jun 20, 2015
2 parents 35ae30a + 2fd1897 commit e576ba0
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 67 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## v0.14.3 - (2015-06-19)

* Bug
* [Sync] Fixing sync excluded folders based on mount value instead of relative dir of sync;
* [Tracking] Updating `insight-keen-io`, which was changed to use `child_process.spaw` instead of `child_process.fork`, ensuring sending the tracker data in background.

## v0.14.2 - (2015-06-18)

* Bug
Expand Down
116 changes: 59 additions & 57 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azk",
"version": "0.14.2",
"version": "0.14.3",
"description": "Orchestrate development environments with agility and automation",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"hipache": "git+https://github.com/hipache/hipache#c32e3d2138590cbdb70a67e696c5f8252f7143dc",
"i18n-cli": "0.0.3",
"inquirer": "^0.8.0",
"insight-keen-io": "^0.6.3",
"insight-keen-io": "^0.7.0",
"jstream": "^0.2.7",
"lodash": "^2.4.1",
"memcached": "^0.2.8",
Expand Down
2 changes: 1 addition & 1 deletion src/agent/configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { publish } from 'azk/utils/postal';
import { async, ninvoke, nfcall, thenAll } from 'azk/utils/promises';
import { config, set_config } from 'azk';
import { UIProxy } from 'azk/cli/ui';
import { AzkError, OSNotSupported, DependencyError } from 'azk/utils/errors';
import { OSNotSupported, DependencyError } from 'azk/utils/errors';
import { net, envDefaultArray } from 'azk/utils';
import Azk from 'azk';

Expand Down
13 changes: 6 additions & 7 deletions src/system/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -572,18 +572,17 @@ export class System {
_mounts_to_syncs(mounts) {
var syncs = {};

return _.reduce(mounts, (syncs, mount) => {
return _.reduce(mounts, (syncs, mount, mount_key) => {
if (mount.type === 'sync') {

var host_sync_path = this._resolved_path(mount.value);

var mounted_subpaths = _.reduce(mounts, (subpaths, mount) => {
var mount_path = this._resolved_path(mount.value);
if ( mount_path !== host_sync_path && mount_path.indexOf(host_sync_path) === 0) {
return subpaths.concat([path.join(mount.value, '/')]);
} else {
return subpaths;
var mounted_subpaths = _.reduce(mounts, (subpaths, mount, dir) => {
if ( dir !== mount_key && dir.indexOf(mount_key) === 0) {
var regex = new RegExp(`^${mount_key}`);
subpaths = subpaths.concat([path.normalize(dir.replace(regex, './'))]);
}
return subpaths;
}, []);

mount.options = mount.options || {};
Expand Down

0 comments on commit e576ba0

Please sign in to comment.