[MediaWiki-commits] [Gerrit] build: Implement 'npm run doc' entry point - change (mediawiki...MobileFrontend)

2015-06-19 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: build: Implement 'npm run doc' entry point
..


build: Implement 'npm run doc' entry point

Also add grunt-cli to devDependencies. Previously 'npm test' was
broken unless the user installed grunt-cli globally beforehand.

Now 'npm test' just works after 'npm install' on a fresh git clone.

The local node_modules/.bin path is automatically prepended to PATH
for package scripts. https://docs.npmjs.com/misc/scripts#path

The -s parameter is optional, but it omits some verbose output
from the npm wrapper that may be unexpected for users of make jsduck.

Minor hygiene: Simplify grunt-test by including docs instead of duplicating.

Change-Id: I071543c62032a0f7dcb8b4ef8b30dee1b3e216ec
---
M Gruntfile.js
M Makefile
M package.json
3 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Jdlrobson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gruntfile.js b/Gruntfile.js
index 9a1ed8b..4264e18 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -139,7 +139,7 @@
// grunt test will be run by npm test which will be run by Jenkins
// Do not execute qunit here, or other tasks that require full mediawiki
// running.
-   grunt.registerTask( 'test', [ 'lint', 'mkdir', 'jsduck' ] );
+   grunt.registerTask( 'test', [ 'lint', 'docs' ] );
 
grunt.registerTask( 'default', [ 'test' ] );
 };
diff --git a/Makefile b/Makefile
index 6516091..4ccda99 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
@dev-scripts/remotes/gerrit.py --project 
'mediawiki/extensions/MobileFrontend' --gtscore -1 --ignore 'WIP'
 
 jsduck: nodecheck gems ## Build the JavaScript documentation
-   @grunt docs
+   @npm run -s doc
 
 phpdoc: nodecheck  ## Build the PHP documentation
mkdir -p docs
diff --git a/package.json b/package.json
index 42b407e..24b8e28 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
description: Node.js dependencies used in MobileFrontend,
version: 0.0.1,
scripts: {
-   test: grunt test
+   test: grunt test,
+   doc: grunt docs
},
repository: {
type: git,
@@ -19,6 +20,7 @@
svgo: =0.4.4
},
devDependencies: {
+   grunt-cli: 0.1.13,
grunt-mkdir: ^0.1.2,
grunt-svg2png: 0.2.5,
grunt-contrib-jshint: 0.10.0,

-- 
To view, visit https://gerrit.wikimedia.org/r/219426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I071543c62032a0f7dcb8b4ef8b30dee1b3e216ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] build: Implement 'npm run doc' entry point - change (mediawiki...MobileFrontend)

2015-06-19 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219426

Change subject: build: Implement 'npm run doc' entry point
..

build: Implement 'npm run doc' entry point

Also add grunt-cli to devDependencies. Previously 'npm test' was
broken unless the user installed grunt-cli globally beforehand.

Now 'npm test' just works after 'npm install' on a fresh git clone.

The local node_modules/.bin path is automatically prepended to PATH
for package scripts. https://docs.npmjs.com/misc/scripts#path

The -s parameter is optional, but it omits some verbose output
from the npm wrapper that may be unexpected for users of make jsduck.

Minor hygiene: Simplify grunt-test by including docs instead of duplicating.

Change-Id: I071543c62032a0f7dcb8b4ef8b30dee1b3e216ec
---
M Gruntfile.js
M Makefile
M package.json
3 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/26/219426/1

diff --git a/Gruntfile.js b/Gruntfile.js
index 9a1ed8b..4264e18 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -139,7 +139,7 @@
// grunt test will be run by npm test which will be run by Jenkins
// Do not execute qunit here, or other tasks that require full mediawiki
// running.
-   grunt.registerTask( 'test', [ 'lint', 'mkdir', 'jsduck' ] );
+   grunt.registerTask( 'test', [ 'lint', 'docs' ] );
 
grunt.registerTask( 'default', [ 'test' ] );
 };
diff --git a/Makefile b/Makefile
index 6516091..4ccda99 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
@dev-scripts/remotes/gerrit.py --project 
'mediawiki/extensions/MobileFrontend' --gtscore -1 --ignore 'WIP'
 
 jsduck: nodecheck gems ## Build the JavaScript documentation
-   @grunt docs
+   @npm run -s doc
 
 phpdoc: nodecheck  ## Build the PHP documentation
mkdir -p docs
diff --git a/package.json b/package.json
index 42b407e..24b8e28 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
description: Node.js dependencies used in MobileFrontend,
version: 0.0.1,
scripts: {
-   test: grunt test
+   test: grunt test,
+   doc: grunt docs
},
repository: {
type: git,
@@ -19,6 +20,7 @@
svgo: =0.4.4
},
devDependencies: {
+   grunt-cli: 0.1.13,
grunt-mkdir: ^0.1.2,
grunt-svg2png: 0.2.5,
grunt-contrib-jshint: 0.10.0,

-- 
To view, visit https://gerrit.wikimedia.org/r/219426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I071543c62032a0f7dcb8b4ef8b30dee1b3e216ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits