Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a bump-only command #59

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = function(grunt) {
grunt.initConfig({

clean: {
test: 'test/fixtures/_component.json'
},
Expand Down Expand Up @@ -37,13 +37,23 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-nodeunit');

grunt.registerTask('test', [
'clean',
'setup',
'release',
'nodeunit',
'clean'
]);
grunt.registerTask('test', function() {
grunt.task.run([
'clean',
'setup',
'release',
'nodeunit',
'clean'
]);

grunt.task.run([
'clean',
'setup',
'bump-only',
'nodeunit',
'clean'
]);
});

grunt.registerMultiTask('setup', 'Setup test fixtures', function(){
this.files.forEach(function(f){
Expand Down
48 changes: 28 additions & 20 deletions tasks/grunt-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@ var shell = require('shelljs');
var semver = require('semver');

module.exports = function(grunt){
grunt.registerTask('bump-only', 'bump version only', function(type){
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be registerMultiTask.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also change bump-only to release-bump since bump is a subset of release and I believe we should "namespace" it here.


var file = grunt.config.get('release.options.file') || grunt.config('pkgFile') || 'package.json';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We changed the way how we read the files. Please update it here.

grunt.log.writeln(file);

grunt.log.writeln('Only bumping the version.');
bump(setup(file, true, type));
});
grunt.registerTask('release', 'bump version, git tag, git push, npm publish', function(type){

//defaults
var options = this.options({
bump: true,
Expand All @@ -24,7 +32,7 @@ module.exports = function(grunt){
npm : true
});

var config = setup(options.file, type);
var config = setup(options.file, options.bump, type);
var templateOptions = {
data: {
version: config.newVersion
Expand All @@ -45,15 +53,6 @@ module.exports = function(grunt){
if (options.npm) publish(config);
if (options.github) githubRelease(config);

function setup(file, type){
var pkg = grunt.file.readJSON(file);
var newVersion = pkg.version;
if (options.bump) {
newVersion = semver.inc(pkg.version, type || 'patch');
}
return {file: file, pkg: pkg, newVersion: newVersion};
}

function add(config){
run('git add ' + config.file);
}
Expand All @@ -78,7 +77,7 @@ module.exports = function(grunt){
var cmd = 'npm publish';
var msg = 'published '+ config.newVersion +' to npm';
var npmtag = getNpmTag();
if (npmtag){
if (npmtag){
cmd += ' --tag ' + npmtag;
msg += ' with a tag of "' + npmtag + '"';
}
Expand All @@ -104,12 +103,6 @@ module.exports = function(grunt){
if (msg) grunt.log.ok(msg);
}

function bump(config){
config.pkg.version = config.newVersion;
grunt.file.write(config.file, JSON.stringify(config.pkg, null, ' ') + '\n');
grunt.log.ok('Version bumped to ' + config.newVersion);
}

function githubRelease(){
var request = require('superagent');
var done = task.async();
Expand All @@ -127,7 +120,7 @@ module.exports = function(grunt){
.end(function(res){
if (res.statusCode === 201){
success();
}
}
else {
grunt.fail.warn('Error creating github release. Response: ' + res.text);
}
Expand All @@ -138,6 +131,21 @@ module.exports = function(grunt){
done();
}
}

});

function setup(file, bump, type){
var pkg = grunt.file.readJSON(file);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs update.

var newVersion = pkg.version;
if (bump) {
newVersion = semver.inc(pkg.version, type || 'patch');
}
return {file: file, pkg: pkg, newVersion: newVersion};
}

function bump(config){
config.pkg.version = config.newVersion;
grunt.file.write(config.file, JSON.stringify(config.pkg, null, ' ') + '\n');
grunt.log.ok('Version bumped to ' + config.newVersion);
}

};