chore(website): rename some tasks and make building an explicit action

juliemr · juliemr · commit 75e90d936d1f · 2014-08-28T13:38:06.000-07:00
diff --git a/website/README.md b/website/README.md
@@ -3,58 +3,59 @@ Protractor website
 
 Generates the documentation for the protractor website.
 
-##How to run
+## How to run
 
 ```shell
 cd website/
 npm install
+npm run build
 ```
 
-And then copy all the files from the `build` directory to the gh-pages branch.
+Then copy all the files from the `build` directory to the gh-pages branch.
 If you want to run the website locally then run the following command:
 
 ```shell
-./node_modules/.bin/gulp liveReload
+npm start
 ```
 
 And point your browser to: [localhost:8080](http://localhost:8080/)
 
-##How to run the tests
+## How to run the tests
 
 The website includes 3 types of tests:
 
 * minijasminenode unit tests for the dgeni modules.
 * karma unit tests for the angular controllers.
 * protractor for e2e testing.
 
-###Start the server first
+### Start the server first
 
 The following command will start a server on [localhost:8080](http://localhost:8080/).
 The server is used to run the protractor tests.
 
 ```shell
-npm run server
+npm start
 ```
 
-###Run all the tests
+### Run all the tests
 
 ```shell
 npm test
 ```
 
-###Run the dgeni tests
+### Run the dgeni tests
 
 ```shell
 ./node_modules/.bin/minijasminenode docgen/spec/*
 ```
 
-###Run the karma tests
+### Run the karma tests
 
 ```shell
 ./node_modules/karma/bin/karma start
 ```
 
-###Run the protractor tests
+### Run the protractor tests
 
 ```shell
 ../bin/protractor
diff --git a/website/gulpfile.js b/website/gulpfile.js
@@ -27,7 +27,8 @@ gulp.task('clean', function(cb) {
   del(paths.build, cb);
 });
 
-// Generate the table of contents json file using Dgeni.
+// Generate the table of contents json file using Dgeni. This is output to
+// docgen/build/toc.json
 gulp.task('dgeni', function() {
   var config = path.resolve(__dirname, './docgen/dgeni-config.js');
   dgeni(config).generateDocs();
@@ -38,17 +39,17 @@ gulp.task('copyBowerFiles', function() {
   gulp.src([
     'bower_components/bootstrap/dist/js/bootstrap.min.js',
     'bower_components/lodash/dist/lodash.min.js'
-  ]).pipe(gulp.dest('js'));
+  ]).pipe(gulp.dest(paths.outputDir + '/js'));
   gulp.src('bower_components/bootstrap/dist/css/bootstrap.min.css')
-      .pipe(gulp.dest('css'));
+      .pipe(gulp.dest(paths.outputDir + '/css'));
 });
 
 gulp.task('copyFiles', function() {
   // html.
   gulp.src('index.html')
       .pipe(gulp.dest(paths.outputDir));
   gulp.src('partials/*.html')
-      .pipe(gulp.dest(paths.outputDir+ '/partials'));
+      .pipe(gulp.dest(paths.outputDir + '/partials'));
 
   // Degeni docs.
   gulp.src(['docgen/build/*.json'])
@@ -124,10 +125,10 @@ gulp.task('liveReload', [
 ]);
 
 gulp.task('default', [
-  'copyBowerFiles',
   'dgeni',
   'less',
   'markdown',
   'js',
-  'copyFiles'
+  'copyFiles',
+  'copyBowerFiles'
 ]);
diff --git a/website/index.html b/website/index.html
@@ -5,6 +5,7 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <link rel="stylesheet" href="css/protractor.css"/>
+  <link rel="stylesheet" href="css/bootstrap.min.css"/>
   <title>Protractor - end to end testing for AngularJS</title>
 </head>
 <body ng-app="protractorApp">
@@ -78,6 +79,8 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.15/angular.min.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.15/angular-route.min.js"></script>
+<script src="js/bootstrap.min.js"></script>
+<script src="js/lodash.min.js"></script>
 <script src="protractorApp.js"></script>
 </body>
 </html>
diff --git a/website/package.json b/website/package.json
@@ -21,9 +21,10 @@
     "minijasminenode": "^1.1.1"
   },
   "scripts": {
-    "install": "./node_modules/bower/bin/bower install",
-    "postinstall": "./node_modules/.bin/gulp",
-    "server": "gulp liveReload",
+    "prepublish": "./node_modules/bower/bin/bower install",
+    "clean": "./node_modules/.bin/gulp clean",
+    "build": "./node_modules/.bin/gulp",
+    "start": "gulp liveReload",
     "test": "./run-tests.js"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@`
`21`	`21`	`"minijasminenode": "^1.1.1"`
`22`	`22`	`},`
`23`	`23`	`"scripts": {`
`24`		`- "install": "./node_modules/bower/bin/bower install",`
`25`		`- "postinstall": "./node_modules/.bin/gulp",`
`26`		`- "server": "gulp liveReload",`
	`24`	`+ "prepublish": "./node_modules/bower/bin/bower install",`
	`25`	`+ "clean": "./node_modules/.bin/gulp clean",`
	`26`	`+ "build": "./node_modules/.bin/gulp",`
	`27`	`+ "start": "gulp liveReload",`
`27`	`28`	`"test": "./run-tests.js"`
`28`	`29`	`}`
`29`	`30`	`}`