Merge branch '41-names-of-the-nrm-binaries' into 'master'

Resolve "Names of the NRM binaries"

Closes #41

See merge request !81

.repoquality

 nrm/*.py
 nrm/coolr/*.py
 tests/*.py
-bin/daemon
-bin/cmd
-bin/argo-perf-wrapper
+bin/nrmd
+bin/nrm
+bin/nrm-perfwrapper

README.markdown

@@ -20,7 +20,7 @@ the our container piece on the system for now.
 
 ## Basic Usage
 
-Launch the `daemon`, and use `cmd` to interact with it.
+Launch `nrmd` and use `nrm` to interact with it.
 
 ## Additional Info
 

bin/cmd → bin/nrm

@@ -171,13 +171,14 @@ class CommandLineInterface(object):
                 logger.error("unexpected message: %r", msg)
             if outeof and erreof and state == 'exiting':
                 state = 'exit'
+                istatus = int(exitmsg.status)
                 logger.info("command ended: %r", exitmsg)
-                if os.WIFSIGNALED(exitmsg.status):
+                if os.WIFSIGNALED(istatus):
                     logger.error("command ended due to signal %s" %
-                                 str(os.WTERMSIG(exitmsg.status)))
+                                 str(os.WTERMSIG(istatus)))
                     sys.exit(1)
-                elif os.WIFEXITED(exitmsg.status):
-                    s = int(os.WTERMSIG(exitmsg.status))
+                elif os.WIFEXITED(istatus):
+                    s = int(os.WTERMSIG(istatus))
                     if s > 0:
                         logger.debug("command ended with exit code %s" %
                                      str(s))

setup.py

@@ -21,5 +21,5 @@ setup(
 
     packages=find_packages(),
     install_requires=[],
-    scripts=['bin/daemon', 'bin/app', 'bin/cmd', 'bin/argo-perf-wrapper']
+    scripts=['bin/nrmd', 'bin/app', 'bin/nrm', 'bin/nrm-perfwrapper']
 )