Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit aa5a162

Browse files
committed
chore(bower): write grunt task for running bower
1 parent a7ae292 commit aa5a162

File tree

5 files changed

+36
-24
lines changed

5 files changed

+36
-24
lines changed

.travis.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,5 @@ env:
88
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
99
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
1010

11-
before_script:
12-
- export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
13-
- ./lib/sauce/sauce_connect_setup.sh
14-
- npm install -g grunt-cli
15-
- grunt ci-checks package
16-
- ./lib/sauce/sauce_connect_block.sh
17-
1811
script:
19-
- grunt parallel:travis --reporters dots --browsers SL_Chrome
12+
- ./travis_build.sh

Gruntfile.js

+2-15
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module.exports = function(grunt) {
1010
grunt.loadNpmTasks('grunt-contrib-jasmine-node');
1111
grunt.loadNpmTasks('grunt-ddescribe-iit');
1212
grunt.loadNpmTasks('grunt-merge-conflict');
13-
grunt.loadNpmTasks('grunt-shell');
1413
grunt.loadNpmTasks('grunt-parallel');
1514
grunt.loadTasks('lib/grunt');
1615

@@ -102,18 +101,6 @@ module.exports = function(grunt) {
102101
clean: {build: ['build']},
103102

104103

105-
shell: {
106-
bower: {
107-
command: 'node ./node_modules/bower/bin/bower install',
108-
options: {
109-
stdout: true,
110-
stderr: true,
111-
failOnError: true
112-
}
113-
}
114-
},
115-
116-
117104
build: {
118105
scenario: {
119106
dest: 'build/angular-scenario.js',
@@ -245,10 +232,10 @@ module.exports = function(grunt) {
245232
//alias tasks
246233
grunt.registerTask('test:unit', ['test:jqlite', 'test:jquery', 'test:modules']);
247234
grunt.registerTask('test:docgen', ['jasmine-node']);
248-
grunt.registerTask('minify', ['shell:bower','clean', 'build', 'minall']);
235+
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
249236
grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']);
250237
grunt.registerTask('webserver', ['connect:devserver']);
251-
grunt.registerTask('package', ['shell:bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
238+
grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
252239
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']);
253240
grunt.registerTask('default', ['package']);
254241
};

lib/grunt/plugins.js

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var bower = require('bower');
12
var util = require('./utils.js');
23
var spawn = require('child_process').spawn;
34

@@ -63,4 +64,15 @@ module.exports = function(grunt) {
6364
grunt.registerTask('collect-errors', 'Combine stripped error files', function () {
6465
util.collectErrors();
6566
});
67+
68+
grunt.registerTask('bower', 'Install Bower packages.', function () {
69+
var done = this.async();
70+
71+
bower.commands.install()
72+
.on('log', function (result) {
73+
grunt.log.ok('bower: ' + result.id + ' ' + result.data.endpoint.name);
74+
})
75+
.on('error', grunt.fail.warn.bind(grunt.fail))
76+
.on('end', done);
77+
});
6678
};

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"grunt-contrib-compress": "0.4.1",
1111
"grunt-contrib-connect": "0.1.2",
1212
"grunt-contrib-copy": "0.4.1",
13-
"grunt-shell": "~0.2.2",
1413
"jasmine-node": "1.2.3",
1514
"q": "~0.9.2",
1615
"q-fs": "0.1.36",

travis_build.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
set -xe
4+
5+
warn() {
6+
tput setaf 1
7+
echo "[ERROR] Received $1"
8+
tput sgr0
9+
exit 1
10+
}
11+
12+
trap "warn SIGINT" SIGINT
13+
trap "warn SIGTERM" SIGTERM
14+
trap "warn SIGHUP" SIGHUP
15+
16+
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
17+
./lib/sauce/sauce_connect_setup.sh
18+
npm install -g grunt-cli
19+
grunt ci-checks package
20+
./lib/sauce/sauce_connect_block.sh
21+
grunt parallel:travis --reporters dots --browsers SL_Chrome

0 commit comments

Comments
 (0)