Skip to content

Commit

Permalink
Merge branch release/2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alrik committed Oct 25, 2015
2 parents a80fc67 + fb0b54d commit f929951
Show file tree
Hide file tree
Showing 22 changed files with 72 additions and 68 deletions.
6 changes: 3 additions & 3 deletions Application.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand All @@ -13,7 +13,7 @@ const
ServiceManager = require('./ServiceManager');

/**
* The srvoa application class.
* The kermit application class.
*/
class Application extends Service {
/**
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2015/10/25 - 2.0.0
- Rename srvoa to kermit.

2015/10/21 - 1.3.0
- Introduce strict service-manager api, add strict parameter to get, set and remove methods
- Introduce service-manager's strict mode, that is configurable via application config
Expand Down
4 changes: 2 additions & 2 deletions Config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand Down
6 changes: 3 additions & 3 deletions ConfigService.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand All @@ -13,7 +13,7 @@ const
Config = require('./Config');

/**
* The srvoa config service class can read and merge (recursively) multiple config files.
* The kermit config service class can read and merge (recursively) multiple config files.
* It wraps the config class and allows querying specific configs by nested-config-key-string-representation.
*/
class ConfigService extends Service {
Expand Down
6 changes: 3 additions & 3 deletions Service.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand All @@ -12,7 +12,7 @@ const
Config = require('./Config');

/**
* Abstract class that defines the srvoa service interface.
* Abstract class that defines the kermit service interface.
*/
class Service extends EventEmitter {
/**
Expand Down
6 changes: 3 additions & 3 deletions ServiceManager.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";

/**
* The srvoa service manager.
* The kermit service manager.
* It is responsible for holding the service registry and giving shared access to the service instances.
*/
class ServiceManager {
Expand Down
10 changes: 5 additions & 5 deletions bin/postinstall.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

var fs = require('fs'),
Expand All @@ -22,14 +22,14 @@ if (v8Version[0] > requiredVersion[0] || (
)
)
)) {
console.info('Your node installation supports es6 classes. Linking es6 version of srvoa.');
console.info('Your node installation supports es6 classes. Linking es6 version of kermit.');
packageFile = 'package-es6.js';
} else {
console.info('Your node installation does not support es6 classes. Linking babel polyfill version of srvoa.');
console.info('Your node installation does not support es6 classes. Linking babel polyfill version of kermit.');

fs.stat(packagePath + '/build', function(err) {
if (err) {
console.info('There is no build of srvoa. Calling `npm run ' + packagePath + ' build`.');
console.info('There is no build of kermit. Calling `npm run ' + packagePath + ' build`.');
exec('npm run ' + packagePath + ' build', function(err, stdout, stderr) {
if (stdout) {
console.info('[stdout]: ' + stdout);
Expand Down
4 changes: 2 additions & 2 deletions package-es5.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand Down
4 changes: 2 additions & 2 deletions package-es6.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand Down
4 changes: 2 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "srvoa",
"version": "1.3.0",
"name": "kermit",
"version": "2.0.0",
"description": "Infrastructure for service oriented architecture.",
"author": {
"name": "Alrik Zachert",
Expand All @@ -24,14 +24,15 @@
"framework",
"foundation",
"config",
"services"
"services",
"kermit"
],
"repository": {
"type": "git",
"url": "https://gitlab.com/a-z/node-srvoa"
"url": "https://gitlab.com/kermit-js/kermit.git"
},
"bugs": {
"url": "https://gitlab.com/a-z/node-srvoa/issues"
"url": "https://gitlab.com/kermit-js/kermit/issues"
},
"license": "BSD-2-Clause",
"devDependencies": {
Expand Down
26 changes: 13 additions & 13 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[![NPM](https://nodei.co/npm/srvoa.png?downloads=true)](https://nodei.co/npm/srvoa/)
[![NPM](https://nodei.co/npm/kermit.png?downloads=true)](https://nodei.co/npm/kermit/)
---
[![build status](https://ci.gitlab.com/projects/3656/status.png?ref=master)](https://ci.gitlab.com/projects/3656?ref=master)
[![coverage status](https://coveralls.io/repos/alrik/node-srvoa/badge.svg?branch=master&service=github)](https://coveralls.io/github/alrik/node-srvoa?branch=master)
[![coverage status](https://coveralls.io/repos/kermit-js/kermit/badge.svg?branch=master&service=github)](https://coveralls.io/github/kermit-js/kermit?branch=master)

# srvoa - 1.3.0
# kermit - 2.0.0

- is the **infrastructure** for service oriented architecture (**SOA**) for node.js
- provides **unified interfaces** for writing **modular** apps and (micro-)**services**
Expand All @@ -13,7 +13,7 @@
- is fully **tested** with mocha

---
Find the api docs on [srvoa.readme.io](https://srvoa.readme.io)
Find the api docs on [kermit-js.readme.io](https://kermit-js.readme.io)

---

Expand All @@ -23,26 +23,26 @@ Find the api docs on [srvoa.readme.io](https://srvoa.readme.io)
each of them being way more **simple** and **exchangeable**.
2. All Services have an unified interface `configure([serviceConfig])`, `bootstrap()`, `launch()`.
3. All Services are **EventEmitters**.
4. The **ServiceManager** is the di-container of srvoa in which all services are registered.
4. The **ServiceManager** is the di-container of kermit in which all services are registered.
5. All Services have access to the ServiceManager.
6. An Application is a Service, that manages dependent services and their configuration in the ServiceManager.
7. An Application manages the life-cycle of its dependent services.


### The Vision

- There are many srvoa wrappers for popular node.js modules.
- srvoa is ported to other environments / programming languages.
- There are many kermit wrappers for popular node.js modules.
- kermit is ported to other environments / programming languages.


## Install ##

`$ npm install srvoa`
`$ npm install kermit`


## Getting Started

A simple demo srvoa application may look like this:
A simple demo kermit application may look like this:

- config
- application.js
Expand Down Expand Up @@ -111,7 +111,7 @@ modules.exports = {
```js
"use strict";

var BaseApp = require('srvoa').Application;
var BaseApp = require('kermit').Application;

class Application extends BaseApp {}

Expand All @@ -123,7 +123,7 @@ modules.exports = Application;
```js
"use strict";

var Service = require('srvoa').Service;
var Service = require('kermit').Service;

class DemoService extends Service {
static get CONFIG_KEY() {
Expand Down Expand Up @@ -178,13 +178,13 @@ secret: 1234

### CHANGELOG

Please have a look at [CHANGELOG](https://gitlab.com/a-z/node-srvoa/raw/master/CHANGELOG).
Please have a look at [CHANGELOG](https://gitlab.com/kermit-js/kermit/raw/master/CHANGELOG).


### LICENSE

The files in this archive are released under BSD-2-Clause license.
You can find a copy of this license in [LICENSE](https://gitlab.com/a-z/node-srvoa/raw/master/LICENSE).
You can find a copy of this license in [LICENSE](https://gitlab.com/kermit-js/kermit/raw/master/LICENSE).


---
Expand Down
6 changes: 3 additions & 3 deletions test/Application.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

var assert = require('assert'),
Expand All @@ -11,7 +11,7 @@ var assert = require('assert'),
ServiceManager = require('../ServiceManager'),
ConfigService = require('../ConfigService');

describe('srvoa::application', function() {
describe('kermit::application', function() {
it('is derivative of abstract service.', function() {
var app = new Application;

Expand Down
6 changes: 3 additions & 3 deletions test/ConfigService.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

var assert = require('assert'),
Service = require('../Service'),
ConfigService = require('../ConfigService');

describe('srvoa::config-service', function() {
describe('kermit::config-service', function() {
it('is derivative of abstract service.', function() {
var srv = new ConfigService;

Expand Down
6 changes: 3 additions & 3 deletions test/Service.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

const
Expand All @@ -13,7 +13,7 @@ const
ServiceWithDefaultConfig = require('./lib/ServiceWithDefaultConfig'),
EventEmitter = require('events').EventEmitter;

describe('srvoa::service', function() {
describe('kermit::service', function() {
it('extends the event emitter.', function() {
var srv = new Service;

Expand Down
6 changes: 3 additions & 3 deletions test/ServiceManager.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

var assert = require('assert'),
ServiceManager = require('../ServiceManager');

describe('srvoa::service-manager', function() {
describe('kermit::service-manager', function() {
var dummyService = {};

it('should set a service for a given key.', function() {
Expand Down
6 changes: 3 additions & 3 deletions test/ServiceManagerStrictness.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

var assert = require('assert'),
Application = require('../Application'),
ServiceManager = require('../ServiceManager');

describe('srvoa::service-manager::strictness', function() {
describe('kermit::service-manager::strictness', function() {
it('should throw an error when requesting non existent service in strict mode.', function() {
var sm = new ServiceManager;

Expand Down
4 changes: 2 additions & 2 deletions test/config/app.config.global.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

"use strict";
Expand Down
4 changes: 2 additions & 2 deletions test/config/app.config.local.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* srvoa - soa infrastructure for node js
* kermit - soa infrastructure for node js
*
* @copyright Copyright (c) 2015, Alrik Zachert
* @license https://gitlab.com/a-z/node-srvoa/blob/master/LICENSE BSD-2-Clause
* @license https://gitlab.com/kermit-js/kermit/blob/master/LICENSE BSD-2-Clause
*/

module.exports = {
Expand Down
Loading

0 comments on commit f929951

Please sign in to comment.