From 20dcdf77a4c0dd8249179078d7cfd99e77856c96 Mon Sep 17 00:00:00 2001 From: Chen Shen Date: Thu, 17 Sep 2015 09:52:00 -0700 Subject: [PATCH] update --- .../main.js | 0 .../compatible-native-module/build/Release/native.node | 0 .../node_modules/compatible-native-module/main.js | 0 .../node_modules/compatible-native-module/package.json | 0 .../node_modules/native-module/build/Release/native.node | 0 .../node_modules/native-module/main.js | 0 .../node_modules/native-module/package.json | 0 .../package.json | 0 spec/package-spec.coffee | 4 +++- src/package.coffee | 4 ++-- 10 files changed, 5 insertions(+), 3 deletions(-) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/main.js (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/compatible-native-module/build/Release/native.node (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/compatible-native-module/main.js (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/compatible-native-module/package.json (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/native-module/build/Release/native.node (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/native-module/main.js (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/node_modules/native-module/package.json (100%) rename spec/fixtures/packages/{package-with-both-incompatible-and-compatible-native-modules => package-with-ignored-incompatible-native-module}/package.json (100%) diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/main.js b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/main.js similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/main.js rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/main.js diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/build/Release/native.node b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/build/Release/native.node similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/build/Release/native.node rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/build/Release/native.node diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/main.js b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/main.js similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/main.js rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/main.js diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/package.json b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/package.json similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/compatible-native-module/package.json rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/compatible-native-module/package.json diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/build/Release/native.node b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/build/Release/native.node similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/build/Release/native.node rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/build/Release/native.node diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/main.js b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/main.js similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/main.js rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/main.js diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/package.json b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/package.json similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/node_modules/native-module/package.json rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/node_modules/native-module/package.json diff --git a/spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/package.json b/spec/fixtures/packages/package-with-ignored-incompatible-native-module/package.json similarity index 100% rename from spec/fixtures/packages/package-with-both-incompatible-and-compatible-native-modules/package.json rename to spec/fixtures/packages/package-with-ignored-incompatible-native-module/package.json diff --git a/spec/package-spec.coffee b/spec/package-spec.coffee index 7cdf93030..8f7f2c0bf 100644 --- a/spec/package-spec.coffee +++ b/spec/package-spec.coffee @@ -20,8 +20,10 @@ describe "Package", -> expect(pack.incompatibleModules[0].path).toBe path.join(packagePath, 'node_modules', 'native-module') it "utilizes _atomModuleCache to get native modules and skips traversing through submodules", -> - packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-both-incompatible-and-compatible-native-modules') + packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-ignored-incompatible-native-module') pack = new Package(packagePath) + # Since `_atomModuleCache` exists and it doesn't have the record of the + # incompatible native module, this package is recognized as compatible. expect(pack.isCompatible()).toBe true it "caches the incompatible native modules in local storage", -> diff --git a/src/package.coffee b/src/package.coffee index 25a33e6fc..c38ea08f7 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -598,10 +598,10 @@ class Package nativeModulePaths = [] if @metadata._atomModuleCache? - nativeModuleBindingPaths = @metadata._atomModuleCache.extensions?['.node'] ?[] + nativeModuleBindingPaths = @metadata._atomModuleCache.extensions?['.node'] ? [] for nativeModuleBindingPath in nativeModuleBindingPaths # The `.node` file lies in nativeModulePath/build/Release/ folder. - nativeModulePath = path.normalize(path.join(path.dirname(nativeModuleBindingPath), '..', '..')) + nativeModulePath = path.join(path.dirname(nativeModuleBindingPath), '..', '..') nativeModulePaths.push(nativeModulePath) if @isNativeModule(nativeModulePath) return nativeModulePaths