Replacing legacy references of ci-watch to ciwatch

Change-Id: I20e216caf683f34e4d98e6f82d921bbe5a57f05e

ciwatch/config.py

@@ -30,8 +30,8 @@ class Config(object):
     def get_config(self):
         this_file = os.path.dirname(os.path.realpath(__file__))
         this_dir = os.path.dirname(this_file)
-        conf_files = [os.path.join(this_dir, 'ci-watch.conf'),
-                      '/etc/ciwatch/ci-watch.conf']
+        conf_files = [os.path.join(this_dir, 'ciwatch.conf'),
+                      '/etc/ciwatch/ciwatch.conf']
         # Read first existing conf file, ignore the rest
         for conf_file in conf_files:
             if os.path.exists(conf_file):

ciwatch/log.py

@@ -38,4 +38,4 @@ def setup_logger(name):
     return logger
 
 
-logger = setup_logger(config.DATA_DIR + '/ci-watch.log')
+logger = setup_logger(config.DATA_DIR + '/ciwatch.log')

doc/source/installation.rst

@@ -12,9 +12,9 @@ Or, if you have virtualenvwrapper installed::
     $ pip install .
 
 
-Configuration is stored in the ``ci-watch.conf`` file. Importantly, you can
+Configuration is stored in the ``ciwatch.conf`` file. Importantly, you can
 specify a directory to store the ``third-party-ci.log`` file (data\_dir) as
-well as the database to connect to. Look at ``ci-watch.conf.sample`` for an
+well as the database to connect to. Look at ``ciwatch.conf.sample`` for an
 example.
 
 Other settings should be self explanatory based on the provided configuration

doc/source/usage.rst

@@ -4,10 +4,10 @@ Usage
 
 At the moment, this package provides three commands.
 
-``ci-watch-server``. Launch a development server.
+``ciwatch-server``. Launch a development server.
 
-``ci-watch-stream-events``. Stream events from Gerrit and append valid
+``ciwatch-stream-events``. Stream events from Gerrit and append valid
 events to ``third-party-ci.log``.
 
-``ci-watch-populate-database``. Add all entries from
+``ciwatch-populate-database``. Add all entries from
 ``third-party-ci.log`` to the database.

setup.cfg

@@ -24,9 +24,9 @@ packages =
 
 [entry_points]
 console_scripts =
-    ci-watch-server = ciwatch.server:main
-    ci-watch-populate-database = ciwatch.populate:main
-    ci-watch-stream-events = ciwatch.events:main
+    ciwatch-server = ciwatch.server:main
+    ciwatch-populate-database = ciwatch.populate:main
+    ciwatch-stream-events = ciwatch.events:main
 
 [build_sphinx]
 source-dir = doc/source