Merge pull request #3809 from ember-cli/pr-3779

Pr 3779
ember-cli · Apr 6, 2015 · c8796ff · c8796ff
2 parents cbd2f8f + 2892a1a
commit c8796ff
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/lib/models/command.js b/lib/models/command.js
@@ -3,9 +3,9 @@
 var nopt          = require('nopt');
 var chalk         = require('chalk');
 var path          = require('path');
+var isGitRepo     = require('is-git-url');
 var camelize      = require('../utilities/string').camelize;
 var getCallerFile = require('../utilities/get-caller-file');
-var isGitRepo     = require('../utilities/git-repo');
 var Promise       = require('../ext/promise');
 var union         = require('lodash/array/union');
 var uniq          = require('lodash/array/uniq');

diff --git a/lib/tasks/install-blueprint.js b/lib/tasks/install-blueprint.js
@@ -2,8 +2,8 @@
 
 var Blueprint     = require('../models/blueprint');
 var Task          = require('../models/task');
-var isGitRepo     = require('../utilities/git-repo');
 var Promise       = require('../ext/promise');
+var isGitRepo     = require('is-git-url');
 var temp          = require('temp');
 var childProcess  = require('child_process');
 var path          = require('path');

diff --git a/lib/utilities/git-repo.js b/lib/utilities/git-repo.js
diff --git a/package.json b/package.json
@@ -101,6 +101,7 @@
     "http-proxy": "^1.9.0",
     "inflection": "^1.7.0",
     "inquirer": "0.5.1",
+    "is-git-url": "^0.2.0",
     "js-string-escape": "^1.0.0",
     "leek": "0.0.18",
     "lodash": "^3.6.0",

diff --git a/tests/unit/utilities/git-repo-test.js b/tests/unit/utilities/git-repo-test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var isGitRepo = require('../../../lib/utilities/git-repo');
+var isGitRepo = require('is-git-url');
 var expect    = require('chai').expect;
 
 describe('cleanBaseURL()', function() {