rework scripts as entry-points

Author: razvancrainea

scripts/opensips-event opensips/event/__main__.pyscripts/opensips-event renamed to opensips/event/__main__.py

@@ -30,6 +30,7 @@
 
 communication.add_argument('-t', '--type',
                     type=str,
+                    default='fifo',
                     choices=['fifo', 'http', 'datagram'],
                     help='OpenSIPS MI Communication Type')
 communication.add_argument('-i', '--ip',
@@ -40,15 +41,15 @@
                     type=int,
                     help='OpenSIPS MI Port',
                     default=8888)
-communication.add_argument('-f', '--file',
+communication.add_argument('-f', '--fifo-file',
                     metavar='FIFO_FILE',
                     type=str,
                     help='OpenSIPS MI FIFO File')
-communication.add_argument('-fb', '--fallback',
+communication.add_argument('-fb', '--fifo-fallback',
                     metavar='FIFO_FALLBACK_FILE',
                     type=str,
                     help='OpenSIPS MI Fallback FIFO File')
-communication.add_argument('-fd', '--dir',
+communication.add_argument('-fd', '--fifo-reply-dir',
                     metavar='FIFO_DIR',
                     type=str,
                     help='OpenSIPS MI FIFO Reply Directory')
@@ -63,19 +64,19 @@
                     type=str,
                     choices=['datagram', 'stream'],
                     help='OpenSIPS Event Transport',
-                    required=True)
+                    default='datagram')
 event.add_argument('-li', '--listen-ip',
                     type=str,
                     help='OpenSIPS Event Listen IP Address',
-                    default='127.0.0.1')
+                    default='0.0.0.0')
 event.add_argument('-lp', '--listen-port',
                     type=int,
                     help='OpenSIPS Event Listen Port',
-                    required=True)
+                    default=0)
 event.add_argument('-e', '--expire',
                     type=int,
                     help='OpenSIPS Event Expire Time',
-                    default=3600)
+                    default=None)
 
 args = parser.parse_args()
 

scripts/opensips-mi opensips/mi/__main__.pyscripts/opensips-mi renamed to opensips/mi/__main__.py

@@ -20,7 +20,7 @@
 import argparse
 from opensips.mi import OpenSIPSMI, OpenSIPSMIException
 import json
-  
+
 parser = argparse.ArgumentParser()
 
 communication = parser.add_argument_group('communication')
@@ -36,20 +36,20 @@
                     type=int,
                     help='OpenSIPS MI Port',
                     default=8888)
-communication.add_argument('-f', '--file',
+communication.add_argument('-f', '--fifo-file',
                     type=str,
                     help='OpenSIPS MI FIFO File')
-communication.add_argument('-fb', '--fallback',
+communication.add_argument('-fb', '--fifo-fallback',
                     type=str,
                     help='OpenSIPS MI Fallback FIFO File')
-communication.add_argument('-fd', '--dir',
+communication.add_argument('-fd', '--fifo-reply-dir',
                     type=str,
                     help='OpenSIPS MI FIFO Reply Directory')
 
 group = parser.add_mutually_exclusive_group(required=True)
 
 group.add_argument('-s', '--stats',
-                    nargs='+',                                                                                                                                                     
+                    nargs='+',
                     default=[],
                     help='statistics')
 

opensips/version.py

@@ -19,4 +19,4 @@
 
 """ OpenSIPS Package version """
 
-__version__ = '0.1.1'
+__version__ = '0.1.2'

setup.py

@@ -17,10 +17,15 @@
 ## along with this program. If not, see <http://www.gnu.org/licenses/>.
 ##
 
+""" Setup module for OpenSIPS package """
+
 from setuptools import setup, find_packages
 
 from opensips import version
 
+with open('README.md', encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     name="opensips",
     version=version.__version__,
@@ -29,14 +34,19 @@
     author="Darius Stefan",
     author_email="darius.stefan@opensips.org",
     description="OpenSIPS Python Packages",
-    long_description=open('README.md').read(),
+    long_description=long_description,
     long_description_content_type='text/markdown',
     url="https://github.com/OpenSIPS/python-opensips",
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
     ],
-    scripts=['scripts/opensips-mi', 'scripts/opensips-event'],
+    entry_points = {
+        'console_scripts': [
+            'openisps-mi = opensips.mi',
+            'openisps-event = opensips.event',
+        ],
+    },
     python_requires=">=3.6"
 )