Skip to content

Commit 049e6c3

Browse files
committed
Merge pull request #22 from stefanpenner/splat-version
allow '*' versions to match all
2 parents 29c405a + bf7e0ac commit 049e6c3

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

lib/package.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ Package.prototype.updateRequired = function() {
1818
var version = this.versionSpecified;
1919
var isGitRepo = require('./git-repo');
2020
var semver = require('semver');
21-
if (isGitRepo(version)) {
21+
22+
if (version === '*') {
23+
return false;
24+
} else if (isGitRepo(version)) {
2225
var parts = version.split('#');
2326
if (parts.length === 2) {
2427
version = semver.valid(parts[1]);

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"scripts": {
1010
"start": "ember server",
1111
"build": "ember build",
12-
"test": "node tests/runner"
12+
"test": "node tests/runner",
13+
"test:debug": "node debug tests/runner"
1314
},
1415
"repository": {
1516
"type": "git",

tests/unit/dependency-checker-bower-test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,10 @@ describe('EmberCLIDependencyChecker', function() {
9292
var project = createProject({ 'ember': '~/projects/emberjs' });
9393
assertNoBowerError(project);
9494
});
95+
96+
it('does NOT error with a * dependency', function() {
97+
var project = createProject({ 'ember': '*' });
98+
assertNoBowerError(project);
99+
});
95100
});
96101
});

tests/unit/dependency-checker-npm-test.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,10 @@ describe('EmberCLIDependencyChecker', function() {
8282
var project = createProject({ 'ember-cli': '~/projects/ember-cli' });
8383
assertNoNpmError(project);
8484
});
85+
86+
it('does NOT error with a * dependency', function() {
87+
var project = createProject({ 'ember-cli': '*' });
88+
assertNoNpmError(project);
89+
});
8590
});
8691
});

0 commit comments

Comments
 (0)