Skip to content

Commit

Permalink
Merge branch 'patch-1' of https://github.com/yyjdelete/yuidoc
Browse files Browse the repository at this point in the history
  • Loading branch information
caridy committed Feb 19, 2014
2 parents 01a902a + c46f13f commit 4b43c92
Show file tree
Hide file tree
Showing 20 changed files with 2,940 additions and 2,773 deletions.
1,156 changes: 609 additions & 547 deletions lib/builder.js

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions lib/cli.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
#!/usr/bin/env node

/*
Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://yuilibrary.com/license/
*/

/**
* Parses the arguments, creates the options and passes them to `Y.YUIDoc` and then `Y.DocBuilder`.
* @class CLI
* @module yuidoc
*/
* Parses the arguments, creates the options and passes them to `Y.YUIDoc` and then `Y.DocBuilder`.
* @class CLI
* @module yuidoc
*/

var Y = require('./index'),
path = require('path');
/*global Y:true */
var Y = require('./index');

var options = Y.Options(Y.Array(process.argv, 2));

Y.log('Starting YUIDoc@' + Y.packageInfo.version + ' using YUI@' + Y.version + ' with NodeJS@' + process.versions.node, 'info', 'yuidoc');

var starttime = (new Date).getTime();
var starttime = (new Date()).getTime();

options = Y.Project.init(options);

Expand All @@ -32,7 +33,6 @@ Y.log(opts, 'info', 'yuidoc');
if (options.server) {
Y.Server.start(options);
} else {

var json = (new Y.YUIDoc(options)).run();
if (json === null) {
return;
Expand All @@ -41,9 +41,9 @@ if (options.server) {

if (!options.parseOnly) {
var builder = new Y.DocBuilder(options, json);
builder.compile(function() {
var endtime = (new Date).getTime();
Y.log('Completed in ' + ((endtime - starttime) / 1000) + ' seconds' , 'info', 'yuidoc');
builder.compile(function () {
var endtime = (new Date()).getTime();
Y.log('Completed in ' + ((endtime - starttime) / 1000) + ' seconds', 'info', 'yuidoc');
});
}
}
Loading

0 comments on commit 4b43c92

Please sign in to comment.