Merge c13c308 into 92bb4a1

lib/spm-package.js

@@ -98,16 +98,20 @@ function resolveDeps(name, deps, pkg) {
   var version, dest;
   var base = util.getBase(pkg);
 
-  // detect root spm_modules
-  dest = join(base, pkg.options.moduleDir, name);
-  if (exists(dest)) {
+  // detech current pkg and father pkg
+  var levelCount = 2;
+  while (levelCount-- && !version && pkg) {
+    dest = join(pkg.dest, pkg.options.moduleDir, name);
     version = util.getVersion(deps[name], dest);
+    pkg = pkg.father;
   }
 
-  // detect current spm_modules
-  if (!version && pkg.dest !== base) {
-    dest = join(pkg.dest, pkg.options.moduleDir, name);
-    version = util.getVersion(deps[name], dest);
+  // detect root spm_modules
+  if (!version && pkg) {
+    dest = join(base, pkg.options.moduleDir, name);
+    if (exists(dest)) {
+      version = util.getVersion(deps[name], dest);
+    }
   }
 
   if (!version) {

lib/util.js

@@ -4,6 +4,7 @@ var fs = require('fs');
 var semver = require('semver');
 var path = require('path');
 var join = path.join;
+var exists = fs.existsSync;
 var dirname = path.dirname;
 
 exports.getVersion = getVersion;
@@ -13,6 +14,8 @@ exports.isRelative = isRelative;
 exports.winPath = winPath;
 
 function getVersion(version, dest) {
+  if (!exists(dest)) return;
+
   var map = {};
   var dirs = fs.readdirSync(dest);
   var versions = dirs

test/fixtures/spm/resolve-deps-in-pkg-deep/index.js

@@ -0,0 +1 @@
+require('b');

test/fixtures/spm/resolve-deps-in-pkg-deep/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "a",
+  "version": "0.1.0",
+  "spm": {
+    "dependencies": {
+      "b": "0.2.0"
+    }
+  }
+}

test/fixtures/spm/resolve-deps-in-pkg-deep/sea-modules/b/0.2.0/index.js

@@ -0,0 +1 @@
+require('c');

test/fixtures/spm/resolve-deps-in-pkg-deep/sea-modules/b/0.2.0/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "b",
+  "version": "0.2.0",
+  "spm": {
+    "dependencies": {
+      "c": "0.3.0"
+    }
+  }
+}

test/fixtures/spm/resolve-deps-in-pkg-deep/sea-modules/b/0.2.0/sea-modules/c/0.3.0/index.js

@@ -0,0 +1 @@
+require('d');

test/fixtures/spm/resolve-deps-in-pkg-deep/sea-modules/b/0.2.0/sea-modules/c/0.3.0/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "c",
+  "version": "0.3.0",
+  "spm": {
+    "dependencies": {
+      "d": "0.3.0"
+    }
+  }
+}

test/fixtures/spm/resolve-deps-in-pkg-deep/sea-modules/b/0.2.0/sea-modules/d/0.3.0/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "d",
+  "version": "0.3.0",
+  "spm": {
+  }
+}

test/spm.test.js

@@ -117,6 +117,12 @@ describe('Father.SpmPackage', function() {
     pkg.dependencies.b.dependencies.c.version.should.be.equal('0.4.0');
   });
 
+  it('resolve deps in pkg, deep', function() {
+    var pkg = getPackage('resolve-deps-in-pkg-deep');
+    pkg.dependencies.b.dependencies.c.should.be.truthy;
+    pkg.dependencies.b.dependencies.c.dependencies.d.should.be.truthy;
+  });
+
   it('css', function() {
     var pkg = getPackage('css');
     Object.keys(pkg.files).should.eql(['index.css', 'base.css', 'other.css']);