Merge pull request #56 from Worvast/master

Fixing Lookup sender cli and changed API responses when failed

Author: Worvast

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.2.1] - 2019-03-28
+#### Fixed
+ * Lookup shell client now read config correctly
+ * Lookup shell client now apply default port if empty
+ 
+#### Changed
+ * API response in stream mode now return response object if response.code its not 200
+
 ## [2.2.0] - 2019-02-23
 #### Changed
  * Inits args for Sender(), and from_config(), to make it more flexible to config objects and flags

README.md

@@ -1,7 +1,7 @@
 
 [![master Build Status](https://travis-ci.com/DevoInc/python-sdk.svg?branch=master)](https://travis-ci.com/DevoInc/python-sdk) [![LICENSE](https://img.shields.io/dub/l/vibe-d.svg)](https://github.com/DevoInc/python-sdk/blob/master/LICENSE)
 
-[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-2.2.0-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
+[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-2.2.1-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-2.7%20%7C%203.3%20%7C%203.4%20%7C%203.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
 
 
 # Devo Python SDK

devo/__version__.py

@@ -1,6 +1,6 @@
 __description__ = 'Devo Python Library.'
 __url__ = 'http://www.devo.com'
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'

devo/api/client.py

@@ -279,6 +279,9 @@ def _make_request(self, payload, stream, verify):
                                          headers=self._get_headers(payload),
                                          verify=verify, timeout=self.timeout,
                                          stream=stream)
+                if response.status_code != 200:
+                    return response
+
                 if stream:
                     return response.iter_lines()
                 return response

devo/common/generic/configuration.py

@@ -193,11 +193,14 @@ def get(self, *args, **kwargs):
 
         return self.cfg
 
-    def keys(self, prop):
+    def keys(self, prop=None):
         """Check if exist property and if not then set to None
 
         :param prop: Property to check
         """
+        if not prop:
+            return self.cfg.keys()
+
         if prop not in self.cfg:
             return False
         return True

devo/sender/data.py

@@ -78,7 +78,7 @@ class SenderConfigTCP:
 
     """
 
-    def __init__(self, address=None, port=None, debug=False, timeout=300,
+    def __init__(self, address=None, port=443, debug=False, timeout=300,
                  **kwargs):
 
         try:
@@ -216,6 +216,7 @@ def __connect_ssl(self):
                                                   cert_reqs=ssl.CERT_NONE)
             except ssl.SSLError:
                 raise ssl.SSLError
+
             self.socket.connect(self._sender_config.address)
             self.reconnection += 1
             self.logger.debug('Devo-Sender|Conected to %s|%s'

devo/sender/scripts/sender_cli.py

@@ -96,7 +96,7 @@ def data(**kwargs):
 @click.option('--default', '-d', help='Use default file for configuration',
               default=False)
 @click.option('--url', '--address', '-a', help='Devo relay address')
-@click.option('--port', '-p', help='Devo relay address port')
+@click.option('--port', '-p', default=443, help='Devo relay address port')
 @click.option('--key', help='Devo user key cert file.')
 @click.option('--cert', help='Devo user cert file.')
 @click.option('--chain', help='Devo chain.crt file.')
@@ -157,16 +157,18 @@ def init_conf(args):
             config.load_default_config(section="sender")
     finally:
         config.mix(dict(args))
-        return config.get()
+        return config
 
 
 def configure_lookup(args):
     """ Configuration of Lookup for CLI """
     config = init_conf(args)
-    config.load_config(args.get('config'), 'lookup')
-    config.mix(dict(args))
+    if args.get('config'):
+        config.load_config(args.get('config'), 'lookup')
+    if "url" in config.keys():
+        config.set("address", config.get("url"))
 
-    return config.get()
+    return config
 
 
 def print_error(error, show_help=False, stop=True):