Move isGitUrl() method to utils/location.js

Author: jpreynat

lib/constants/gitPrefix.js

@@ -0,0 +1,5 @@
+
+/*
+    Prefix used for git URLs
+*/
+module.exports = 'git+';

lib/utils/git.js

@@ -7,8 +7,9 @@ var pathUtil = require('./path');
 var Promise = require('./promise');
 var command = require('./command');
 var fs = require('./fs');
+var LocationUtils = require('./location');
 
-var GIT_PREFIX = 'git+';
+var GIT_PREFIX = require('../constants/gitPrefix');
 
 function Git() {
     this.tmpDir;
@@ -65,7 +66,7 @@ Git.prototype.clone = function(host, ref) {
 // Get file from a git repo
 Git.prototype.resolve = function(giturl) {
     // Path to a file in a git repo?
-    if (!Git.isUrl(giturl)) {
+    if (!LocationUtils.isGitUrl(giturl)) {
         if (this.resolveRoot(giturl)) return Promise(giturl);
         return Promise(null);
     }
@@ -97,16 +98,11 @@ Git.prototype.resolveRoot = function(filepath) {
     return path.resolve(this.tmpDir, repoId);
 };
 
-// Check if an url is a git dependency url
-Git.isUrl = function(giturl) {
-    return (giturl.indexOf(GIT_PREFIX) === 0);
-};
-
 // Parse and extract infos
 Git.parseUrl = function(giturl) {
     var ref, uri, fileParts, filepath;
 
-    if (!Git.isUrl(giturl)) return null;
+    if (!LocationUtils.isGitUrl(giturl)) return null;
     giturl = giturl.slice(GIT_PREFIX.length);
 
     uri = new URI(giturl);

lib/utils/location.js

@@ -1,6 +1,8 @@
 var url = require('url');
 var path = require('path');
 
+var GIT_PREFIX = require('../constants/gitPrefix');
+
 // Is the url an external url
 function isExternal(href) {
     try {
@@ -19,6 +21,11 @@ function isDataURI(href) {
     }
 }
 
+// Is a git content reference URL
+function isGitUrl(giturl) {
+    return (giturl.indexOf(GIT_PREFIX) === 0);
+}
+
 // Inverse of isExternal
 function isRelative(href) {
     return !isExternal(href);
@@ -108,6 +115,7 @@ function areIdenticalPaths(p1, p2) {
 module.exports = {
     areIdenticalPaths: areIdenticalPaths,
     isDataURI: isDataURI,
+    isGitUrl: isGitUrl,
     isExternal: isExternal,
     isRelative: isRelative,
     isAnchor: isAnchor,