Handle new manifest file format.

Author: scottgonzalez

docs/jquery.json.md

@@ -1,12 +1,12 @@
-Specification of the jQuery Plugins Site jquery.json
-====================================================
+Specification of the jQuery Plugins Site Manifest File
+======================================================
 
 # LIVING SPEC (heavily inspired by that of npm, thanks isaacs)
 
 This document is all you need to know about what's required in your jquery.json
-file(s). It must be actual JSON, not just a JavaScript object literal.
+manifest file(s). It must be actual JSON, not just a JavaScript object literal.
 
-**NOTE: While we refer to the file as jquery.json, the file name must actually be {name}.jquery.json.**
+**NOTE: Manifest file names must contain the plugin name, e.g. foo.jquery.json.**
 
 # Fields
 
@@ -31,15 +31,15 @@ file(s). It must be actual JSON, not just a JavaScript object literal.
 
 ## <a name="field-name">name</a>
 
-The *most* important things in your jquery.json are the name and version fields.
+The *most* important things in your manifest file are the name and version fields.
 The name and version together form an identifier that is assumed
 to be completely unique. Changes to the plugin should come along with
 changes to the version.
 
 The name is what your thing is called. Some tips:
 
 * Don't put "js" or "jquery" in the name. It's assumed that it's js and jquery, since
-  you're writing a jquery.json file.
+  you're writing a jquery.json manifest file.
 * The name ends up being part of a URL. Any name with non-url-safe characters will
   be rejected. The jQuery Plugins Site is UTF-8.
 * The name should be short, but also reasonably descriptive.
@@ -51,7 +51,7 @@ The name is what your thing is called. Some tips:
 
 ## <a name="field-version">version</a>
 
-The *most* important things in your jquery.json are the name and version fields.
+The *most* important things in your manifest file are the name and version fields.
 The name and version together form an identifier that is assumed
 to be completely unique. Changes to the plugin should come along with
 changes to the version. Version number must be a valid semantic version number
@@ -213,7 +213,7 @@ The following are equivalent:
 You may not supply a comparator with a version containing an x. Any
 digits after the first "x" are ignored.
 
-## <a href="sample">Sample jquery.json</a>
+## <a href="sample">Sample manifest</a>
 
 **color.jquery.json**
 
@@ -236,10 +236,8 @@ digits after the first "x" are ignored.
             "url": "https://github.com/jquery/jquery-color/raw/2.0.0-beta.1/GPL-LICENSE.txt"
         }
     ],
-    "jquery": {
-        "dependencies": {
-            "jquery": "1"
-        }
+    "dependencies": {
+        "jquery": ">=1.6"
     },
     "description": "The main purpose of this plugin is to animate color properties on elements using jQuery's .animate()",
     "keywords": [

grunt.js

@@ -6,8 +6,12 @@ grunt.loadNpmTasks( "grunt-wordpress" );
 
 grunt.initConfig({
 	lint: {
-		grunt: "grunt.js"
-		// src: [ "lib/**", "scripts/**" ]
+		grunt: "grunt.js",
+		src: [ "lib/**", "scripts/**" ]
+	},
+
+	test: {
+		files: [ "test/**/*.js" ]
 	},
 
 	wordpress: config.wordpress

lib/hook.js

@@ -106,8 +106,8 @@ function processVersions( repo, fn ) {
 
 			var group = this.group();
 			releases.forEach(function( release ) {
-				for ( file in release.packages ) {
-					processRelease( repo, release.tag, file, release.packages[ file ], group() );
+				for ( var file in release.manifests ) {
+					processRelease( repo, release.tag, file, release.manifests[ file ], group() );
 				}
 			});
 		},
@@ -118,12 +118,12 @@ function processVersions( repo, fn ) {
 	);
 }
 
-function processRelease( repo, tag, file, package, fn ) {
+function processRelease( repo, tag, file, manifest, fn ) {
 	Step(
 		// find out who owns this plugin
 		// if there is no owner, then set the user as the owner
 		function() {
-			pluginsDb.getOrSetOwner( package.name, repo.userId, repo.id, this );
+			pluginsDb.getOrSetOwner( manifest.name, repo.userId, repo.id, this );
 		},
 
 		// verify the user is the owner
@@ -136,7 +136,7 @@ function processRelease( repo, tag, file, package, fn ) {
 			// the plugin is owned by someone else
 			if ( owner !== repo.userId ) {
 				// TODO: report error to user
-				logger.log( repo.userId + " attempted to add " + package.name + " which is owned by " + owner );
+				logger.log( repo.userId + " attempted to add " + manifest.name + " which is owned by " + owner );
 				return fn( null, null );
 			}
 
@@ -145,7 +145,7 @@ function processRelease( repo, tag, file, package, fn ) {
 
 		// track the new release
 		function( error, owner ) {
-			pluginsDb.addRelease( repo.id, tag, file, package, this );
+			pluginsDb.addRelease( repo.id, tag, file, manifest, this );
 		},
 
 		// finished processing release
@@ -155,8 +155,8 @@ function processRelease( repo, tag, file, package, fn ) {
 				return fn( error );
 			}
 
-			logger.log( "Added " + package.name + " v" + package.version + " to plugins DB" );
-			fn( null, package );
+			logger.log( "Added " + manifest.name + " v" + manifest.version + " to plugins DB" );
+			fn( null, manifest );
 		}
 	);
 }

lib/pluginsdb.js

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