Browse Source

Merge pull request #854 from maraoz/fix/releaser

fix releaser script
patch-2
Esteban Ordano 10 years ago
parent
commit
386a6de652
  1. 28
      gulpfile.js
  2. 4
      lib/address.js

28
gulpfile.js

@ -228,33 +228,45 @@ gulp.task('release:bump', function() {
}); });
gulp.task('release:checkout-releases', function(cb) { gulp.task('release:checkout-releases', function(cb) {
git.checkout('releases', {args: ''}, cb); git.checkout('releases', {
args: ''
}, cb);
}); });
gulp.task('release:merge-master', function(cb) { gulp.task('release:merge-master', function(cb) {
git.merge('master', {args: ''}, cb); git.merge('master', {
args: ''
}, cb);
}); });
gulp.task('release:checkout-master', function(cb) { gulp.task('release:checkout-master', function(cb) {
git.checkout('master', {args: ''}, cb); git.checkout('master', {
args: ''
}, cb);
}); });
gulp.task('release:add-built-files', function() { gulp.task('release:add-built-files', function() {
return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json']) return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json'])
.pipe(git.add({args: '-f'})); .pipe(git.add({
args: '-f'
}));
}); });
gulp.task('release:build-commit', ['release:add-built-files'], function() { gulp.task('release:build-commit', ['release:add-built-files'], function() {
var pjson = require('./package.json'); var pjson = require('./package.json');
return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json']) return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json'])
.pipe(git.commit('Build: ' + pjson.version, {args: ''})); .pipe(git.commit('Build: ' + pjson.version, {
args: ''
}));
}); });
gulp.task('release:version-commit', function() { gulp.task('release:version-commit', function() {
var pjson = require('./package.json'); var pjson = require('./package.json');
var files = ['./package.json', './bower.json']; var files = ['./package.json', './bower.json'];
return gulp.src(files) return gulp.src(files)
.pipe(git.commit('Bump package version to ' + pjson.version, {args: ''})); .pipe(git.commit('Bump package version to ' + pjson.version, {
args: ''
}));
}); });
gulp.task('release:push-releases', function(cb) { gulp.task('release:push-releases', function(cb) {
@ -273,9 +285,7 @@ gulp.task('release:push-tag', function(cb) {
var pjson = require('./package.json'); var pjson = require('./package.json');
var name = 'v' + pjson.version; var name = 'v' + pjson.version;
git.tag(name, 'Release ' + name, function() { git.tag(name, 'Release ' + name, function() {
git.push('bitpay', name, { git.push('bitpay', name, cb);
args: '--tags'
}, cb);
}); });
}); });

4
lib/address.js

@ -58,9 +58,7 @@ function Address(data, network, type) {
return data; return data;
} }
if (!data) { $.checkArgument(data, new TypeError('First argument is required, please include address data.'));
throw new TypeError('First argument is required, please include address data.');
}
if (network && !Networks.get(network)) { if (network && !Networks.get(network)) {
throw new TypeError('Second argument must be "livenet" or "testnet".'); throw new TypeError('Second argument must be "livenet" or "testnet".');

Loading…
Cancel
Save