diff --git a/spec/fixtures/packages/package-with-service-dependencies/index.coffee b/spec/fixtures/packages/package-with-consumed-services/index.coffee similarity index 100% rename from spec/fixtures/packages/package-with-service-dependencies/index.coffee rename to spec/fixtures/packages/package-with-consumed-services/index.coffee diff --git a/spec/fixtures/packages/package-with-service-dependencies/package.json b/spec/fixtures/packages/package-with-consumed-services/package.json similarity index 77% rename from spec/fixtures/packages/package-with-service-dependencies/package.json rename to spec/fixtures/packages/package-with-consumed-services/package.json index 1bb292d2c..7598683e9 100644 --- a/spec/fixtures/packages/package-with-service-dependencies/package.json +++ b/spec/fixtures/packages/package-with-consumed-services/package.json @@ -1,7 +1,7 @@ { - "name": "package-with-service-dependencies", + "name": "package-with-consumed-services", - "serviceDependencies": { + "consumedServices": { "service-1": { "versions": { ">=0.2 <= 0.3.6": "handleFirstServiceV3", diff --git a/spec/fixtures/packages/package-with-service-provisions/index.coffee b/spec/fixtures/packages/package-with-provided-services/index.coffee similarity index 100% rename from spec/fixtures/packages/package-with-service-provisions/index.coffee rename to spec/fixtures/packages/package-with-provided-services/index.coffee diff --git a/spec/fixtures/packages/package-with-service-provisions/package.json b/spec/fixtures/packages/package-with-provided-services/package.json similarity index 81% rename from spec/fixtures/packages/package-with-service-provisions/package.json rename to spec/fixtures/packages/package-with-provided-services/package.json index d5950628e..66d2bd92a 100644 --- a/spec/fixtures/packages/package-with-service-provisions/package.json +++ b/spec/fixtures/packages/package-with-provided-services/package.json @@ -1,7 +1,7 @@ { - "name": "package-with-service-provisions", + "name": "package-with-provided-services", - "serviceProvisions": { + "providedServices": { "service-1": { "description": "The first service", "versions": { diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee index d9bf20bca..f4808c420 100644 --- a/spec/package-manager-spec.coffee +++ b/spec/package-manager-spec.coffee @@ -470,7 +470,7 @@ describe "PackageManager", -> new Disposable -> service2V6 = 'deactivated' waitsForPromise -> - atom.packages.activatePackage("package-with-service-provisions") + atom.packages.activatePackage("package-with-provided-services") runs -> expect(service1V3).toBe 'first-service-v3' @@ -478,7 +478,7 @@ describe "PackageManager", -> expect(service2V5).toBe 'second-service' expect(service2V6).toBeNull() - atom.packages.deactivatePackage("package-with-service-provisions") + atom.packages.deactivatePackage("package-with-provided-services") expect(service1V3).toBe 'deactivated' expect(service1V4).toBe 'deactivated' @@ -487,7 +487,7 @@ describe "PackageManager", -> it "registers the package's service dependencies", -> waitsForPromise -> - atom.packages.activatePackage("package-with-service-dependencies") + atom.packages.activatePackage("package-with-consumed-services") runs -> service1V3Spy = jasmine.createSpy('service1V3') @@ -505,7 +505,7 @@ describe "PackageManager", -> expect(service2V5Spy).toHaveBeenCalledWith('second-service-used') expect(service2V6Spy).not.toHaveBeenCalled() - atom.packages.deactivatePackage("package-with-service-dependencies") + atom.packages.deactivatePackage("package-with-consumed-services") service1V3Spy.reset() service1V4Spy.reset() diff --git a/src/package.coffee b/src/package.coffee index f89028dc2..651a1d53e 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -211,11 +211,11 @@ class Package @settingsActivated = true activateServices: -> - for name, {versions} of @metadata.serviceProvisions + for name, {versions} of @metadata.providedServices for version, methodName of versions @activationDisposables.add atom.packages.serviceHub.provide(name, version, @mainModule[methodName]()) - for name, {versions} of @metadata.serviceDependencies + for name, {versions} of @metadata.consumedServices for version, methodName of versions @activationDisposables.add atom.packages.serviceHub.consume(name, version, @mainModule[methodName].bind(@mainModule))