Skip to content

Commit

Permalink
Prep v0.6.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
cpettitt committed Oct 29, 2014
1 parent 2e07af4 commit 70af336
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 141 deletions.
120 changes: 0 additions & 120 deletions CHANGELOG.md

This file was deleted.

6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphlib-dot",
"version": "0.6.0",
"version": "0.6.1",
"main": [
"dist/graphlib-dot.core.js",
"dist/graphlib-dot.core.min.js"
Expand All @@ -21,7 +21,7 @@
"test/**"
],
"dependencies": {
"lodash": "^2.4.1",
"graphlib": "^0.9.1"
"graphlib": "^1.0.1",
"lodash": "^2.4.1"
}
}
29 changes: 19 additions & 10 deletions dist/graphlib-dot.js
Original file line number Diff line number Diff line change
Expand Up @@ -2624,7 +2624,7 @@ module.exports = function readOne(str) {


},{"./build-graph":3,"./dot-grammar":4}],9:[function(require,module,exports){
module.exports = '0.6.0';
module.exports = '0.6.1';

},{}],10:[function(require,module,exports){
var _ = require("./lodash");
Expand Down Expand Up @@ -3645,14 +3645,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 @@ -3662,6 +3657,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 @@ -3877,7 +3886,7 @@ function read(json) {
},{"./graph":26,"./lodash":29}],29:[function(require,module,exports){
module.exports=require(6)
},{"/Users/cpettitt/projects/graphlib-dot/lib/lodash.js":6,"lodash":31}],30:[function(require,module,exports){
module.exports = '0.9.1';
module.exports = '1.0.1';

},{}],31:[function(require,module,exports){
(function (global){
Expand Down
6 changes: 3 additions & 3 deletions dist/graphlib-dot.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.1-pre';
module.exports = '0.6.1';
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphlib-dot",
"version": "0.6.1-pre",
"version": "0.6.1",
"description": "A DOT language parser / writer for graphlib",
"author": "Chris Pettitt <cpettitt@gmail.com>",
"main": "index.js",
Expand All @@ -10,7 +10,7 @@
"parse"
],
"dependencies": {
"graphlib": "^0.9.1",
"graphlib": "^1.0.1",
"lodash": "^2.4.1"
},
"devDependencies": {
Expand Down Expand Up @@ -40,4 +40,4 @@
"Dominic Tarr <dominic.tarr@gmail.com> (http://bit.ly/dominictarr)"
],
"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 70af336

Please sign in to comment.