Handle failures while processing a suite.

Author: scottgonzalez

src/hook.js

@@ -106,7 +106,9 @@ function processVersions( repo, fn ) {
 
 			var group = this.group();
 			releases.forEach(function( release ) {
-				processRelease( repo, release, group() );
+				for ( file in release.packages ) {
+					processRelease( repo, release.tag, file, release.packages[ file ], group() );
+				}
 			});
 		},
 
@@ -116,49 +118,26 @@ function processVersions( repo, fn ) {
 	);
 }
 
-function processRelease( repo, release, fn ) {
-	// if this is a suite, process each plugin individually
-	if ( Array.isArray( release.package ) ) {
-		return Step(
-			function() {
-				var group = this.group();
-				release.package.forEach(function( package ) {
-					processRelease( repo, {
-						tag: release.tag,
-						package: package
-					}, group() );
-				});
-			},
-
-			function( error ) {
-				if ( error ) {
-					return fn( error );
-				}
-
-				fn( null, release );
-			}
-		);
-	}
-
+function processRelease( repo, tag, file, package, fn ) {
 	// TODO: track plugin name for retry in suites
 	Step(
 		// find out who owns this plugin
 		// if there is no owner, then set the user as the owner
 		function() {
-			pluginsDb.getOrSetOwner( release.package.name, repo.userId, this );
+			pluginsDb.getOrSetOwner( package.name, repo.userId, this );
 		},
 
 		// verify the user is the owner
 		function( error, owner ) {
 			if ( error ) {
-				retry.log( "processRelease", repo.id, release.tag );
+				retry.log( "processRelease", repo.id, tag, file );
 				return fn( error );
 			}
 
 			// the plugin is owned by someone else
 			if ( owner !== repo.userId ) {
 				// TODO: report error to user
-				logger.log( repo.userId + " attempted to add " + release.package.name + " which is owned by " + owner );
+				logger.log( repo.userId + " attempted to add " + package.name + " which is owned by " + owner );
 				return fn( null, null );
 			}
 
@@ -167,18 +146,18 @@ function processRelease( repo, release, fn ) {
 
 		// track the new release
 		function( error, owner ) {
-			pluginsDb.addRelease( repo.id, release, this );
+			pluginsDb.addRelease( repo.id, tag, file, package, this );
 		},
 
 		// finished processing release
 		function( error ) {
 			if ( error ) {
-				retry.log( "processRelease", repo.id, release.tag );
+				retry.log( "processRelease", repo.id, tag, file );
 				return fn( error );
 			}
 
-			logger.log( "Added " + release.package.name + " v" + release.package.version + " to plugins DB" );
-			fn( null, release );
+			logger.log( "Added " + package.name + " v" + package.version + " to plugins DB" );
+			fn( null, package );
 		}
 	);
 }

src/pluginsdb.js

@@ -87,11 +87,12 @@ var pluginsDb = module.exports = {
 		db.run( "INSERT OR IGNORE INTO repos( repo, tag ) VALUES( ?, ? )", [ repoId, tag ], fn );
 	}),
 
-	addRelease: auto(function( repoId, release, fn ) {
+	addRelease: auto(function( repoId, tag, file, package, fn ) {
 		var data = JSON.stringify({
 			repo: repoId,
-			tag: release.tag,
-			package: release.package
+			tag: tag,
+			file: file,
+			package: package
 		});
 
 		db.run( "INSERT INTO actions( action, data ) VALUES( ?, ? )",
@@ -100,7 +101,7 @@ var pluginsDb = module.exports = {
 					return fn( error );
 				}
 
-				pluginsDb.addTag( repoId, release.tag, fn );
+				pluginsDb.addTag( repoId, tag, fn );
 			});
 	}),
 

src/retry.js

@@ -1,7 +1,8 @@
 var Step = require( "step" ),
 	hook = require( "./hook" ),
 	service = require( "./service" ),
-	retry = require( "./retrydb" );
+	retry = require( "./retrydb" ),
+	logger = require( "./logger" );
 
 process.on( "uncaughtException", function( error ) {
 	logger.error( "Uncaught exception: " + error.stack );
@@ -19,14 +20,14 @@ actions.processVersions = function( repoId, fn ) {
 	hook.processVersions( repo, fn );
 };
 
-actions.processRelease = function( repoId, tag, fn ) {
+actions.processRelease = function( repoId, tag, file, fn ) {
 	var repo = service.getRepoById( repoId );
-	repo.getRelease( tag, function( error, release ) {
+	repo.getPackageJson( tag, file, function( error, package ) {
 		if ( error ) {
 			return fn( error );
 		}
 
-		hook.processRelease( repo, release, fn );
+		hook.processRelease( repo, tag, file, package, fn );
 	});
 };
 

src/service.js

@@ -229,18 +229,18 @@ extend( Repo.prototype, {
 	},
 
 	getRelease: function( tag, fn ) {
-		this.validateVersion( tag, function( error, package ) {
+		this.validateVersion( tag, function( error, packages ) {
 			if ( error ) {
 				return fn( error );
 			}
 
-			if ( !package ) {
+			if ( !packages ) {
 				return fn( null, null );
 			}
 
 			fn( null, {
 				tag: tag,
-				package: package
+				packages: packages
 			});
 		});
 	},
@@ -279,7 +279,7 @@ extend( Repo.prototype, {
 					return fn( null, null );
 				}
 
-				fn( null, package );
+				fn( null, { "package.json": package } );
 			}
 		);
 	},
@@ -302,14 +302,18 @@ extend( Repo.prototype, {
 					return fn( null, null );
 				}
 
+				this.parallel()( null, files );
+
 				var group = this.group();
 				files.forEach(function( file ) {
 					repo.getPackageJson( tag, file, group() );
 				});
 			},
 
 			// validate package.jsons
-			function( error, packages ) {
+			function( error, files, packages ) {
+				var mappedPackages = {};
+
 				if ( error ) {
 					return fn( error );
 				}
@@ -325,9 +329,10 @@ extend( Repo.prototype, {
 					if ( repo.validatePackageJson( packages[ i ], tag ).length ) {
 						return fn( null, null );
 					}
+					mappedPackages[ files[ i ] ] = packages[ i ];
 				}
 
-				fn( null, packages );
+				fn( null, mappedPackages );
 			}
 		);
 	}