Merge pull request #10 from RethinkRobotics-opensource/rosnodejs_nameswitch

Rename rosjs to rosnodejs

Author: chris-smith

README.md

@@ -1 +1 @@
-# rosjs
+# rosnodejs

example.js

@@ -1,10 +1,10 @@
 'use strict';
 
-let rosjs = require('./index.js');
-const std_msgs = rosjs.require('std_msgs').msg;
-const SetBool = rosjs.require('std_srvs').srv.SetBool;
+let rosnodejs = require('./index.js');
+const std_msgs = rosnodejs.require('std_msgs').msg;
+const SetBool = rosnodejs.require('std_srvs').srv.SetBool;
 
-rosjs.initNode('/my_node')
+rosnodejs.initNode('/my_node')
 .then((rosNode) => {
   // EXP 1) Service Server
   let service = rosNode.advertiseService({

index.js

@@ -47,7 +47,7 @@ function _checkMasterHelper(callback, timeout) {
     rosNode.getMasterUri()
     .then((resp) => {
       log.info('Connected to master!');
-      callback(Rosjs.getNodeHandle());
+      callback(Rosnodejs.getNodeHandle());
     })
     .catch((err, resp) => {
       if (firstCheck) {
@@ -71,7 +71,7 @@ function _validateNodeName(nodeName) {
   return nodeName;
 }
 
-let Rosjs = {
+let Rosnodejs = {
   /**
    * Initializes a ros node for this process. Only one ros node can exist per process
    * If called a second time with the same nodeName, returns a handle to that node.
@@ -152,4 +152,4 @@ let Rosjs = {
   }
 }
 
-module.exports = Rosjs;
+module.exports = Rosnodejs;

lib/ActionClient.js

@@ -17,7 +17,7 @@
 
 'use strict';
 
-const rosjs = require('../index.js');
+const rosnodejs = require('../index.js');
 const timeUtils = require('../utils/time_utils.js');
 let EventEmitter = require('events');
 
@@ -27,7 +27,7 @@ class ActionClient extends EventEmitter {
 
     this._actionServer = options.actionServer;
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
 
     // FIXME: support user options for these parameters
     this._goalPub = nh.advertise({

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "rosjs",
+  "name": "rosnodejs",
   "version": "0.1.0",
   "description": "Native ROS for nodejs",
   "main": "index.js",

test/genjsTest.js test/gennodejsTest.jstest/genjsTest.js renamed to test/gennodejsTest.js

@@ -179,7 +179,7 @@ describe('genjsTests', () => {
     });
 
     it('int64', (done) => {
-      // rosjs takes in raw buffer for 64bit integer msgs
+      // rosnodejs takes in raw buffer for 64bit integer msgs
       const intData = new Buffer([1, 2, 3, 0, 0, 0, 1, 6]);
 
       const msgBuffer = new Buffer(intData);
@@ -196,7 +196,7 @@ describe('genjsTests', () => {
     });
 
     it('uint64', (done) => {
-      // rosjs takes in raw buffer for 64bit integer msgs
+      // rosnodejs takes in raw buffer for 64bit integer msgs
       const intData = new Buffer([1, 2, 3, 0, 0, 0, 1, 6]);
 
       const msgBuffer = new Buffer(intData);

test/xmlrpcTest.js

@@ -2,14 +2,14 @@
 
 const chai = require('chai');
 const expect = chai.expect;
-const rosjs = require('../index.js');
+const rosnodejs = require('../index.js');
 const xmlrpc = require('xmlrpc');
 const netUtils = require('../utils/network_utils.js');
 
 describe('XmlrpcTests', () => {
   // NOTE: make sure a roscore is not running (or something else at this address)
-  rosjs.require('std_msgs');
-  rosjs.require('std_srvs');
+  rosnodejs.require('std_msgs');
+  rosnodejs.require('std_srvs');
   let masterStub = xmlrpc.createServer({host: 'localhost', port: 11311});
   const nodeName = '/testNode';
 
@@ -19,7 +19,7 @@ describe('XmlrpcTests', () => {
       callback(null, resp);
     });
 
-    return rosjs.initNode(nodeName);
+    return rosnodejs.initNode(nodeName);
   });
 
   it('registerSubscriber', (done) => {
@@ -41,7 +41,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
     const sub = nh.subscribe({
       topic: topic,
       type: msgType,
@@ -72,7 +72,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
     const sub = nh.subscribe({
       topic: topic,
       type: msgType,
@@ -105,7 +105,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.getNodeHandle();
+    const nh = rosnodejs.getNodeHandle();
     const sub = nh.advertise({
       topic: topic,
       type: msgType,
@@ -136,7 +136,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
     const pub = nh.advertise({
       topic: topic,
       type: msgType,
@@ -176,7 +176,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
     const serv = nh.advertiseService({
       service: service,
       type: srvType
@@ -203,7 +203,7 @@ describe('XmlrpcTests', () => {
       done();
     });
 
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
     const serv = nh.advertiseService({
       service: service,
       type: srvType
@@ -215,7 +215,7 @@ describe('XmlrpcTests', () => {
   });
 
   afterEach(() => {
-    const nh = rosjs.nh;
+    const nh = rosnodejs.nh;
 
     // clear out any service, subs, pubs
     nh._node._services = {};

utils/message_utils.js

@@ -36,9 +36,9 @@ let messagePackagePathMap = {};
 // Utilities for loading, finding handlers for
 // message serialization/deserialization
 //
-//  When rosjs starts, it searches through your cmakepath for generated
+//  When rosnodejs starts, it searches through your cmakepath for generated
 //  javascript messages. It caches paths for any of the packages it finds.
-//  Then, in rosjs when you ask to use a message package we check for it
+//  Then, in rosnodejs when you ask to use a message package we check for it
 //  in the cache and require it if found.
 //-----------------------------------------------------------------------