Skip to content

Commit

Permalink
Prep v0.6.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
cpettitt committed Oct 29, 2014
1 parent a4dde5d commit a130136
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 233 deletions.
211 changes: 0 additions & 211 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dagre",
"version": "0.6.1",
"version": "0.6.2",
"main": [
"dist/dagre.core.js",
"dist/dagre.core.min.js"
Expand All @@ -21,7 +21,7 @@
"test/**"
],
"dependencies": {
"graphlib": "^0.9.1",
"graphlib": "^1.0.1",
"lodash": "^2.4.1"
}
}
2 changes: 1 addition & 1 deletion dist/dagre.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -2918,6 +2918,6 @@ function notime(name, fn) {
}

},{"./graphlib":8,"./lodash":11}],31:[function(require,module,exports){
module.exports = "0.6.1";
module.exports = "0.6.2";

},{}]},{},[1]);
2 changes: 1 addition & 1 deletion dist/dagre.core.min.js

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions dist/dagre.js
Original file line number Diff line number Diff line change
Expand Up @@ -2918,7 +2918,7 @@ function notime(name, fn) {
}

},{"./graphlib":8,"./lodash":11}],31:[function(require,module,exports){
module.exports = "0.6.1";
module.exports = "0.6.2";

},{}],32:[function(require,module,exports){
/**
Expand Down Expand Up @@ -3810,14 +3810,9 @@ Graph.prototype.setPath = function(vs, value) {
* setEdge(v, w, [value, [name]])
* setEdge({ v, w, [name] }, [value])
*/
Graph.prototype.setEdge = function(v, w, value, name) {
var valueSpecified = arguments.length > 2;

v = String(v);
w = String(w);
if (!_.isUndefined(name)) {
name = String(name);
}
Graph.prototype.setEdge = function() {
var v, w, name, value,
valueSpecified = false;

if (_.isPlainObject(arguments[0])) {
v = arguments[0].v;
Expand All @@ -3827,6 +3822,20 @@ Graph.prototype.setEdge = function(v, w, value, name) {
value = arguments[1];
valueSpecified = true;
}
} else {
v = arguments[0];
w = arguments[1];
name = arguments[3];
if (arguments.length > 2) {
value = arguments[2];
valueSpecified = true;
}
}

v = "" + v;
w = "" + w;
if (!_.isUndefined(name)) {
name = "" + name;
}

var e = edgeArgsToId(this._isDirected, v, w, name);
Expand Down Expand Up @@ -4042,7 +4051,7 @@ function read(json) {
},{"./graph":47,"./lodash":50}],50:[function(require,module,exports){
module.exports=require(11)
},{"/Users/cpettitt/projects/dagre/lib/lodash.js":11,"lodash":52}],51:[function(require,module,exports){
module.exports = '0.9.1';
module.exports = '1.0.1';

},{}],52:[function(require,module,exports){
(function (global){
Expand Down
6 changes: 3 additions & 3 deletions dist/dagre.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = "0.6.2-pre";
module.exports = "0.6.2";
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dagre",
"version": "0.6.2-pre",
"version": "0.6.2",
"description": "Graph layout for JavaScript",
"author": "Chris Pettitt <[email protected]>",
"main": "index.js",
Expand All @@ -9,7 +9,7 @@
"layout"
],
"dependencies": {
"graphlib": "^0.9.1",
"graphlib": "^1.0.1",
"lodash": "^2.4.1"
},
"devDependencies": {
Expand All @@ -36,4 +36,4 @@
"url": "https://github.com/cpettitt/dagre.git"
},
"license": "MIT"
}
}
1 change: 0 additions & 1 deletion src/release/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ echo Attemping to publish version: $VERSION
[ -n "$PROJECT" ] || bail "No project name was specified."
[ -n "$DIST_DIR" ] || bail "No dist dir was specified."
[ -z "`git tag -l v$VERSION`" ] || bail "Version already published. Skipping publish."
[ -n "`grep v$SHORT_VERSION CHANGELOG.md`" ] || bail "ERROR: No entry for v$VERSION in CHANGELOG.md"
[ "`git rev-parse HEAD`" = "`git rev-parse master`" ] || [ -n "$PRE_RELEASE" ] || bail "ERROR: You must release from the master branch"
[ -z "`git status --porcelain`" ] || bail "ERROR: Dirty index on working tree. Use git status to check"

Expand Down

0 comments on commit a130136

Please sign in to comment.