Track users with services so the same username on two different services aren't treated the same.

Author: scottgonzalez

src/hook.js

@@ -36,14 +36,14 @@ function processVersions( repo, fn ) {
 	Step(
 		// get all tags for the repo
 		function() {
-			pluginsDb.getTags( repo.getId(), this.parallel() );
+			pluginsDb.getTags( repo.id, this.parallel() );
 			repo.getVersionTags( this.parallel() );
 		},
 
 		// filter to new versions
 		function( error, processedTags, tags ) {
 			if ( error ) {
-				retry.log( "processVersions", repo.getId() );
+				retry.log( "processVersions", repo.id );
 				return fn( error );
 			}
 
@@ -58,7 +58,7 @@ function processVersions( repo, fn ) {
 		// get releases
 		function( error, tags ) {
 			if ( error ) {
-				retry.log( "processVersions", repo.getId() );
+				retry.log( "processVersions", repo.id );
 				return fn( error );
 			}
 
@@ -76,7 +76,7 @@ function processVersions( repo, fn ) {
 		// filter to valid releases
 		function( error, tags, releases ) {
 			if ( error ) {
-				retry.log( "processVersions", repo.getId() );
+				retry.log( "processVersions", repo.id );
 				return fn( error );
 			}
 
@@ -88,15 +88,15 @@ function processVersions( repo, fn ) {
 				}
 
 				// track invalid tags so we don't process them on each update
-				pluginsDb.addTag( repo.getId(), tags[ i ], invalidGroup() );
+				pluginsDb.addTag( repo.id, tags[ i ], invalidGroup() );
 				return false;
 			}));
 		},
 
 		// process the releases
 		function( error, releases ) {
 			if ( error ) {
-				retry.log( "processVersions", repo.getId() );
+				retry.log( "processVersions", repo.id );
 				return fn( error );
 			}
 
@@ -121,20 +121,20 @@ function processRelease( repo, release, fn ) {
 		// 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.userName, this );
+			pluginsDb.getOrSetOwner( release.package.name, repo.userId, this );
 		},
 
 		// verify the user is the owner
 		function( error, owner ) {
 			if ( error ) {
-				retry.log( "processRelease", repo.getId(), release.tag );
+				retry.log( "processRelease", repo.id, release.tag );
 				return fn( error );
 			}
 
 			// the plugin is owned by someone else
-			if ( owner !== repo.userName ) {
+			if ( owner !== repo.userId ) {
 				// TODO: report error to user
-				logger.log( repo.userName + " attempted to add " + release.package.name + " which is owned by " + owner );
+				logger.log( repo.userId + " attempted to add " + release.package.name + " which is owned by " + owner );
 				return fn( null, null );
 			}
 
@@ -143,13 +143,13 @@ function processRelease( repo, release, fn ) {
 
 		// track the new release
 		function( error, owner ) {
-			pluginsDb.addRelease( repo.getId(), release, this );
+			pluginsDb.addRelease( repo.id, release, this );
 		},
 
 		// finished processing release
 		function( error ) {
 			if ( error ) {
-				retry.log( "processRelease", repo.getId(), release.tag );
+				retry.log( "processRelease", repo.id, release.tag );
 				return fn( error );
 			}
 
@@ -167,23 +167,23 @@ function processMeta( repo, fn ) {
 
 		function( error, package ) {
 			if ( error ) {
-				retry.log( "processMeta", repo.getId() );
+				retry.log( "processMeta", repo.id );
 				return fn( error );
 			}
 
 			if ( !package || !package.name ) {
 				return fn( null );
 			}
 
-			pluginsDb.updatePlugin( package.name, repo.userName, {
+			pluginsDb.updatePlugin( package.name, repo.userId, {
 				watchers: repo.watchers,
 				forks: repo.forks
 			}, this );
 		},
 
 		function( error ) {
 			if ( error ) {
-				retry.log( "processMeta", repo.getId() );
+				retry.log( "processMeta", repo.id );
 				return fn( error );
 			}
 

src/service.js

@@ -8,17 +8,11 @@ function extend( a, b ) {
 	}
 }
 
-function Repo() {}
-
-extend( Repo.prototype, {
-	getId: function() {
-		return this.service + "/" + this.userName + "/" + this.repoName;
-	},
-
-	getPath: function() {
-		return config.repoDir + "/" + this.getId();
-	}
-});
+function Repo() {
+	this.userId = this.service + "/" + this.userName;
+	this.id = this.userId + "/" + this.repoName;
+	this.path = config.repoDir + "/" + this.id;
+}
 
 // package.json
 extend( Repo.prototype, {

src/service/github.js

@@ -39,6 +39,8 @@ function GithubRepo( userName, repoName ) {
 	this.repoName = repoName;
 	this.siteUrl = "http://github.com" + partialPath;
 	this.sourceUrl = "git://github.com" + partialPath + ".git";
+
+	service.Repo.call( this );
 }
 
 GithubRepo.test = function( data ) {
@@ -66,7 +68,7 @@ extend( GithubRepo.prototype, {
 					return fn( error );
 				}
 
-				exec( "git tag", { cwd: repo.getPath() }, this );
+				exec( "git tag", { cwd: repo.path }, this );
 			},
 
 			// parse the tags
@@ -84,7 +86,7 @@ extend( GithubRepo.prototype, {
 
 	_getPackageJson: function( version, fn ) {
 		version = version || "master";
-		exec( "git show " + version + ":package.json", { cwd: this.getPath() }, function( error, stdout, stderr ) {
+		exec( "git show " + version + ":package.json", { cwd: this.path }, function( error, stdout, stderr ) {
 			// this will also result in an error being passed, so we check stderr first
 			if ( stderr && stderr.substring( 0, 11 ) === "fatal: Path" ) {
 				return fn( null, null );
@@ -99,7 +101,7 @@ extend( GithubRepo.prototype, {
 	},
 
 	getReleaseDate: function( tag, fn ) {
-		exec( "git log --pretty='%cD' -1 " + tag, { cwd: this.getPath() }, function( error, stdout ) {
+		exec( "git log --pretty='%cD' -1 " + tag, { cwd: this.path }, function( error, stdout ) {
 			if ( error ) {
 				return fn( error );
 			}
@@ -121,7 +123,7 @@ extend( GithubRepo.prototype, {
 		Step(
 			// make sure the user directory exists
 			function() {
-				mkdirp( dirname( repo.getPath() ), 0755, this );
+				mkdirp( dirname( repo.path ), 0755, this );
 			},
 
 			// check if the repo already exists
@@ -130,22 +132,22 @@ extend( GithubRepo.prototype, {
 					return fn( error );
 				}
 
-				fs.stat( repo.getPath(), this );
+				fs.stat( repo.path, this );
 			},
 
 			// create or update the repo
 			function( error ) {
 				// repo already exists
 				if ( !error ) {
-					return exec( "git fetch -t", { cwd: repo.getPath() }, this );
+					return exec( "git fetch -t", { cwd: repo.path }, this );
 				}
 
 				// error other than repo not existing
 				if ( error.code !== "ENOENT" ) {
 					return fn( error );
 				}
 
-				exec( "git clone " + repo.sourceUrl + " " + repo.getPath(), this );
+				exec( "git clone " + repo.sourceUrl + " " + repo.path, this );
 			},
 
 			function( error ) {