Rename service keys in package.json

* serviceProvisions -> providedServices
* serviceDependencies -> consumedServices

Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld
2015-02-02 10:01:50 -08:00
committed by Nathan Sobo
parent 5638c7fb6a
commit 65f2ffa55e
6 changed files with 10 additions and 10 deletions

View File

@@ -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",

View File

@@ -1,7 +1,7 @@
{
"name": "package-with-service-provisions",
"name": "package-with-provided-services",
"serviceProvisions": {
"providedServices": {
"service-1": {
"description": "The first service",
"versions": {

View File

@@ -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()

View File

@@ -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))