pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-10 10:17:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12292 from atom/mb-fix-incompatible-module-error

Browse Source 
Fix exception when package requires an incompatible native module
This commit is contained in:
Max Brunsfeld 2016-08-02 13:58:28 -07:00 committed by GitHub
commit c7b7eace22
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spec/package-spec.coffee
View File

@ -24,14 +24,14 @@ describe "Package", ->
mockLocalStorage()
it "does not activate it", ->
packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-incompatible-native-module')
packagePath = atom.project.getDirectories()[0].resolve('packages/package-with-incompatible-native-module')
pack = buildPackage(packagePath)
expect(pack.isCompatible()).toBe false
expect(pack.incompatibleModules[0].name).toBe 'native-module'
expect(pack.incompatibleModules[0].path).toBe path.join(packagePath, 'node_modules', 'native-module')
it "utilizes _atomModuleCache if present to determine the package's native dependencies", ->
packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-ignored-incompatible-native-module')
packagePath = atom.project.getDirectories()[0].resolve('packages/package-with-ignored-incompatible-native-module')
pack = buildPackage(packagePath)
expect(pack.getNativeModuleDependencyPaths().length).toBe(1) # doesn't see the incompatible module
expect(pack.isCompatible()).toBe true
@ -41,8 +41,7 @@ describe "Package", ->
expect(pack.isCompatible()).toBe false
it "caches the incompatible native modules in local storage", ->
packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-incompatible-native-module')
packagePath = atom.project.getDirectories()[0].resolve('packages/package-with-incompatible-native-module')
expect(buildPackage(packagePath).isCompatible()).toBe false
expect(global.localStorage.getItem.callCount).toBe 1
expect(global.localStorage.setItem.callCount).toBe 1
@ -51,6 +50,18 @@ describe "Package", ->
expect(global.localStorage.getItem.callCount).toBe 2
expect(global.localStorage.setItem.callCount).toBe 1
it "logs an error to the console describing the problem", ->
packagePath = atom.project.getDirectories()[0].resolve('packages/package-with-incompatible-native-module')
spyOn(console, 'warn')
spyOn(atom.notifications, 'addFatalError')
buildPackage(packagePath).activateNow()
expect(atom.notifications.addFatalError).not.toHaveBeenCalled()
expect(console.warn.callCount).toBe(1)
expect(console.warn.mostRecentCall.args[0]).toContain('it requires one or more incompatible native modules (native-module)')
describe "::rebuild()", ->
beforeEach ->
mockLocalStorage()

2
src/package.coffee
View File

@ -427,7 +427,7 @@ class Package
return @mainModule if @mainModuleRequired
unless @isCompatible()
console.warn """
Failed to require the main module of '#{@name}' because it requires one or more incompatible native modules (#{_.map(@incompatibleModules, 'name').join(', ')}).
Failed to require the main module of '#{@name}' because it requires one or more incompatible native modules (#{_.pluck(@incompatibleModules, 'name').join(', ')}).
Run `apm rebuild` in the package directory and restart Atom to resolve.
"""
return