diff --git a/tools/bundler.js b/tools/bundler.js index fd5337a59f..dfc2564abc 100644 --- a/tools/bundler.js +++ b/tools/bundler.js @@ -1868,7 +1868,7 @@ exports.bundle = function (options) { var targets = {}; var messages = buildmessage.capture({ - title: "building the application" + title: "Building the application" }, function () { if (! release.usingRightReleaseForApp(appDir)) throw new Error("running wrong release for app?"); diff --git a/tools/catalog.js b/tools/catalog.js index ade20b5f52..723f06ba5b 100644 --- a/tools/catalog.js +++ b/tools/catalog.js @@ -141,7 +141,7 @@ _.extend(OfficialCatalog.prototype, { var thrownError = null; buildmessage.enterJob({ - title: 'Refreshing package metadata.' + title: 'Refreshing package metadata' }, function () { try { self._refresh(); @@ -760,7 +760,7 @@ _.extend(CompleteCatalog.prototype, { var packageSource = new PackageSource(self); var broken = false; buildmessage.enterJob({ - title: "reading package from `" + packageDir + "`", + title: "Reading package from `" + packageDir + "`", rootPath: packageDir }, function () { // All packages in the catalog must have versions. Though, for local @@ -1047,7 +1047,7 @@ _.extend(CompleteCatalog.prototype, { if (! unip) { // Didn't have a build or it wasn't up to date. Build it. buildmessage.enterJob({ - title: "building package `" + name + "`", + title: "Building package `" + name + "`", rootPath: sourcePath }, function () { unip = compiler.compile(self.packageSources[name], { @@ -1168,7 +1168,7 @@ _.extend(CompleteCatalog.prototype, { _.each(namedPackages, function (namedPackage) { if (!_.has(self.packageSources, namedPackage)) { buildmessage.enterJob( - { title: "rebuilding " + namedPackage }, function () { + { title: "Rebuilding " + namedPackage }, function () { buildmessage.error("unknown package"); }); bad = true; diff --git a/tools/commands-packages.js b/tools/commands-packages.js index 87d8c05f0f..a72e6120d1 100644 --- a/tools/commands-packages.js +++ b/tools/commands-packages.js @@ -101,7 +101,7 @@ main.registerCommand({ }; var messages = buildmessage.capture({ - title: 'getting packages ready' + title: 'Getting packages ready' }, function () { // First, build all accessible *local* packages, whether or not this app // uses them. Use the "all packages are local" loader. @@ -187,7 +187,7 @@ main.registerCommand({ var packageSource, compileResult; var messages = buildmessage.capture( - { title: "building the package" }, + { title: "Building the package" }, function () { packageSource = new PackageSource(catalog.complete); @@ -248,7 +248,7 @@ main.registerCommand({ var ec; // XXX maybe combine with messages? try { messages = buildmessage.capture({ - title: "publishing the package" + title: "Publishing the package" }, function () { ec = packageClient.publishPackage( packageSource, compileResult, conn, { @@ -359,7 +359,7 @@ main.registerCommand({ var unipkg; var messages = buildmessage.capture({ - title: "building package " + name + title: "Building package " + name }, function () { var packageSource = new PackageSource(catalog.complete); @@ -514,7 +514,7 @@ main.registerCommand({ try { messages = buildmessage.capture({ - title: "publishing package " + name + title: "Publishing package " + name }, function () { packageClient.createAndPublishBuiltPackage(conn, unipkg); }); @@ -713,7 +713,7 @@ main.registerCommand({ var toPublish = {}; var canBuild = true; var messages = buildmessage.capture( - {title: "rebuilding local packages"}, + {title: "Rebuilding local packages"}, function () { Console.info("Rebuilding local packages..."); _.each(contents, function (item) { @@ -731,7 +731,7 @@ main.registerCommand({ if (fs.existsSync(path.join(packageDir, 'package.js'))) { var packageSource = new PackageSource(catalog.complete); buildmessage.enterJob( - { title: "building package " + item }, + { title: "Building package " + item }, function () { Console.info(" checking consistency of " + item + " "); @@ -884,7 +884,7 @@ main.registerCommand({ var pubEC; try { messages = buildmessage.capture({ - title: "publishing package " + name + title: "Publishing package " + name }, function () { var opts = { new: !catalog.official.getPackage(name) @@ -2328,7 +2328,7 @@ main.registerCommand({ _.each(osArches, function (osArch) { _.each(release.packages, function (pkgVersion, pkgName) { buildmessage.enterJob({ - title: "looking up " + pkgName + "@" + pkgVersion + " on " + osArch + title: "Looking up " + pkgName + "@" + pkgVersion + " on " + osArch }, function () { if (!catalog.official.getBuildsForArches(pkgName, pkgVersion, [osArch])) { buildmessage.error("missing build of " + pkgName + "@" + pkgVersion + @@ -2383,7 +2383,7 @@ main.registerCommand({ path.join(tmpdir, '.meteor'), catalog.official); var messages = buildmessage.capture(function () { buildmessage.enterJob({ - title: "downloading tool package " + toolPkg.package + "@" + + title: "Downloading tool package " + toolPkg.package + "@" + toolPkg.constraint }, function () { tmpTropo.maybeDownloadPackageForArchitectures({ @@ -2394,7 +2394,7 @@ main.registerCommand({ }); _.each(release.packages, function (pkgVersion, pkgName) { buildmessage.enterJob({ - title: "downloading package " + pkgName + "@" + pkgVersion + title: "Downloading package " + pkgName + "@" + pkgVersion }, function () { tmpTropo.maybeDownloadPackageForArchitectures({ packageName: pkgName, diff --git a/tools/commands.js b/tools/commands.js index 5d2ebb47fc..16486c0ba6 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -1264,7 +1264,7 @@ var getPackagesForTest = function (packages) { var messages = buildmessage.capture(function () { testPackages = _.map(packages, function (p) { return buildmessage.enterJob({ - title: "trying to test package `" + p + "`" + title: "Trying to test package `" + p + "`" }, function () { // If it's a package name, just pass it through. @@ -1367,7 +1367,7 @@ var runTestAppForPackages = function (testPackages, testRunnerAppDir, options) { // We don't strictly need to do this before we bundle, but can't hurt. messages = buildmessage.capture({ - title: 'getting packages ready' + title: 'Getting packages ready' },function () { project._ensureDepsUpToDate(); }); diff --git a/tools/compiler.js b/tools/compiler.js index bfc5dac0e7..fb86ee0762 100644 --- a/tools/compiler.js +++ b/tools/compiler.js @@ -703,7 +703,7 @@ var compileUnibuild = function (unipkg, inputSourceArch, packageLoader, /** * @summary Works in web targets only. Add markup to the `head` or `body` - * section of the document. + * section of the document. * @param {Object} options * @param {String} options.section Which section of the document should * be appended to. Can only be "head" or "body". @@ -810,7 +810,7 @@ var compileUnibuild = function (unipkg, inputSourceArch, packageLoader, throw new Error("'data' option to addAsset must be a Buffer or String."); } } - + addAsset(options.data, options.path); }, @@ -961,7 +961,7 @@ compiler.compile = function (packageSource, options) { // Build plugins _.each(packageSource.pluginInfo, function (info) { buildmessage.enterJob({ - title: "building plugin `" + info.name + + title: "Building plugin `" + info.name + "` in package `" + packageSource.name + "`", rootPath: packageSource.sourceRoot }, function () { @@ -1069,7 +1069,7 @@ compiler.compile = function (packageSource, options) { // XXX I have no idea if this should be using buildmessage.enterJob // or not. test what happens on error buildmessage.enterJob({ - title: "compute build identifier for package `" + + title: "Compute build identifier for package `" + packageSource.name + "`", rootPath: packageSource.sourceRoot }, function () { diff --git a/tools/deploy.js b/tools/deploy.js index 05921356ec..07dc65a67d 100644 --- a/tools/deploy.js +++ b/tools/deploy.js @@ -390,7 +390,7 @@ var bundleAndDeploy = function (options) { var settings = null; var messages = buildmessage.capture({ - title: "preparing to deploy", + title: "Preparing to deploy", rootPath: process.cwd() }, function () { if (options.settingsFile) diff --git a/tools/main.js b/tools/main.js index c91ca4ec6e..a7058cb303 100644 --- a/tools/main.js +++ b/tools/main.js @@ -343,7 +343,7 @@ var springboard = function (rel, releaseOverride) { // XXX split better try { var messages = buildmessage.capture({ - title: "downloading tools package " + toolsPkg + "@" + toolsVersion + title: "Downloading tools package " + toolsPkg + "@" + toolsVersion }, function () { tropohouse.default.maybeDownloadPackageForArchitectures({ packageName: toolsPkg, diff --git a/tools/package-cache.js b/tools/package-cache.js index 51204c8f7c..431bddd2ad 100644 --- a/tools/package-cache.js +++ b/tools/package-cache.js @@ -103,7 +103,7 @@ _.extend(PackageCache.prototype, { } else { buildmessage.enterJob({ - title: "initializing package `" + name + "`", + title: "Initializing package `" + name + "`", rootPath: loadPath }, function () { var packageSource = new PackageSource(self.catalog); @@ -146,7 +146,7 @@ _.extend(PackageCache.prototype, { // It's a source tree. Load it. var packageSource = new PackageSource(self.catalog); buildmessage.enterJob({ - title: "initializing package `" + name + "`", + title: "Initializing package `" + name + "`", rootPath: loadPath }, function () { packageSource.initFromPackageDir(loadPath, { @@ -180,7 +180,7 @@ _.extend(PackageCache.prototype, { // Either we didn't have a build, or it was out of date, or the // caller wanted us to rebuild no matter what. Build the package. return buildmessage.enterJob({ - title: "building package `" + name + "`", + title: "Building package `" + name + "`", rootPath: loadPath }, function () { // We used to take great care to first put a diff --git a/tools/package-client.js b/tools/package-client.js index fffc0ffe01..bfdf27a482 100644 --- a/tools/package-client.js +++ b/tools/package-client.js @@ -653,7 +653,7 @@ exports.publishPackage = function (packageSource, compileResult, conn, options) // We need to build the test package to get all of its sources. var testFiles = []; var messages = buildmessage.capture( - { title: "getting test sources" }, + { title: "Getting test sources" }, function () { var testName = packageSource.testName; if (testName) { diff --git a/tools/project.js b/tools/project.js index 0c020236d3..ece95612ec 100644 --- a/tools/project.js +++ b/tools/project.js @@ -290,7 +290,7 @@ _.extend(Project.prototype, { var programSubdir = path.join(self.getProgramsDirectory(), item); buildmessage.enterJob({ - title: "initializing program `" + programName + "`", + title: "Initializing program `" + programName + "`", rootPath: self.rootDir }, function () { var packageSource; diff --git a/tools/run-app.js b/tools/run-app.js index caac3ab947..6a0606ac91 100644 --- a/tools/run-app.js +++ b/tools/run-app.js @@ -499,7 +499,7 @@ _.extend(AppRunner.prototype, { var settings = null; var settingsWatchSet = new watch.WatchSet; var settingsMessages = buildmessage.capture({ - title: "preparing to run", + title: "Preparing to run", rootPath: process.cwd() }, function () { if (self.settingsFile) diff --git a/tools/uniload.js b/tools/uniload.js index b6f819f812..e81bb1c78d 100644 --- a/tools/uniload.js +++ b/tools/uniload.js @@ -92,7 +92,7 @@ var load = function (options) { var ret; var messages = buildmessage.capture({ - title: "loading unipackage" + title: "Loading unipackage" }, function () { // Load the code. The uniloader does not call the constraint solver, unless // it is running from checkout, in which case it will use the constraint diff --git a/tools/unipackage.js b/tools/unipackage.js index a4919221a5..8c974384f4 100644 --- a/tools/unipackage.js +++ b/tools/unipackage.js @@ -406,7 +406,7 @@ _.extend(Unipackage.prototype, { // // 'handler' is a function that takes a single argument, a // CompileStep (#CompileStep) - + /** * @summary Inside a build plugin source file specified in * [Package.registerBuildPlugin](#Package-registerBuildPlugin), @@ -457,7 +457,7 @@ _.extend(Unipackage.prototype, { var plugin = pluginsByArch[arch]; buildmessage.enterJob({ - title: "loading plugin `" + name + + title: "Loading plugin `" + name + "` from package `" + self.name + "`" // don't necessarily have rootPath anymore // (XXX we do, if the unipackage was locally built, which is diff --git a/tools/updater.js b/tools/updater.js index 29931c0579..63e014efc2 100644 --- a/tools/updater.js +++ b/tools/updater.js @@ -164,7 +164,7 @@ var updateMeteorToolSymlink = function () { try { var messages = buildmessage.capture(function () { buildmessage.enterJob({ - title: "downloading tool package " + latestRelease.tool + title: "Downloading tool package " + latestRelease.tool }, function () { tropohouse.default.maybeDownloadPackageForArchitectures({ packageName: latestReleaseToolPackage, @@ -175,7 +175,7 @@ var updateMeteorToolSymlink = function () { }); _.each(latestRelease.packages, function (pkgVersion, pkgName) { buildmessage.enterJob({ - title: "downloading package " + pkgName + "@" + pkgVersion + title: "Downloading package " + pkgName + "@" + pkgVersion }, function () { tropohouse.default.maybeDownloadPackageForArchitectures({ packageName: pkgName,