Merge pull request #11 from internap/pep8

Add PEP8 validation

Author: godp1301

.travis.yml

@@ -1,4 +1,5 @@
 language: python
+sudo: false
 
 python:
   - "2.7"
@@ -8,7 +9,9 @@ install:
   - pip install -r requirements.txt
   - pip install -r test-requirements.txt
 
-script: nosetests
+script:
+  - nosetests
+  - flake8
 
 deploy:
   provider: pypi

setup.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/usr/bin/env python
-
 from setuptools import setup
 
 setup(

test-requirements.txt

@@ -2,3 +2,4 @@ nose>=1.2.1
 mock>=1.0.1
 pyhamcrest>=1.6
 flexmock>=0.10.2
+flake8>=3.3.0

tests/test_api.py

@@ -65,7 +65,8 @@ def test_execute_method_returns_string(self):
             }
         ))
 
-        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[], env={'variable1': 'value1'}, callback={})
+        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[],
+                                                     env={'variable1': 'value1'}, callback={})
         assert_that(json.loads(output.data.decode(output.charset)), is_('simple string'))
         assert_that(output.status_code, is_(200))
 
@@ -84,7 +85,8 @@ def test_execute_method_raise_an_exception(self):
                                               }
                                       ))
 
-        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[], env={'variable1': 'value1'}, callback={})
+        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[],
+                                                     env={'variable1': 'value1'}, callback={})
         assert_that(json.loads(output.data.decode(output.charset)), is_('Some Error'))
         assert_that(output.status_code, is_(500))
 
@@ -103,7 +105,8 @@ def test_execute_method_returns_list(self):
             }
         ))
 
-        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[], env={'variable1': 'value1'}, callback={})
+        self.router.invoke_method.assert_called_with(module=self.module2, method='remote_method', params=[],
+                                                     env={'variable1': 'value1'}, callback={})
         assert_that(json.loads(output.data.decode(output.charset)), is_(['a', 'b', 'c']))
         assert_that(output.status_code, is_(200))
 
@@ -131,4 +134,4 @@ def test_listing_unknown_module_returns_a_404(self):
 
 class NoTrailingSlashApiTest(ApiTest):
     def generate_module_path(self, module_name):
-        return '/{0}'.format(module_name)
+        return '/{0}'.format(module_name)

tests/test_server.py

@@ -22,6 +22,7 @@ class TestModule(object):
     def hello(self):
         return "world"
 
+
 @mock.patch('ubersmith_remote_module_server.server.Flask')
 @mock.patch('ubersmith_remote_module_server.server.router.Router')
 @mock.patch('ubersmith_remote_module_server.server.api.Api')

tox.ini

@@ -1,8 +1,16 @@
 [tox]
-envlist = py27,py34
+envlist = py27,py34,pep8
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
 commands =
     nosetests
 
+[testenv:pep8]
+basepython = python3
+commands = flake8
+
+[flake8]
+exclude = .eggs,.tox
+show-source = True
+max-line-length = 120

ubersmith_remote_module_server/remote.py

@@ -72,4 +72,5 @@ def invoke_global(self, func_name, args):
                                                      function='_web_hook_invoke_global',
                                                      module_params=[func_name, [args]])
 
+
 ubersmith = UbersmithRemoteProxy()

ubersmith_remote_module_server/server.py

@@ -16,11 +16,12 @@
 
 from ubersmith_remote_module_server import api, router
 
+
 class Server(object):
     def __init__(self, modules):
         self.router = router.Router()
         self.app = Flask(__name__)
         self.api = api.Api(modules, self.app, self.router)
 
     def run(self, *args, **kwargs):
-        self.app.run(*args, **kwargs)
+        self.app.run(*args, **kwargs)