Merge pull request spry-group#12 from spry-group/master

0.1.1 Release

Author: dopry

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "nightly"
+install:
+  - "pip install ."
+script: "python setup.py develop && python setup.py test"

README.rst

@@ -1,6 +1,8 @@
 Vultr
 =====
-
+.. image:: https://travis-ci.org/spry-group/python-vultr.svg?branch=master
+    :target: https://travis-ci.org/spry-group/python-vultr
+    
 Vultr provides a client library to the Vultr.com API.
 
 **Usage**

setup.py

@@ -12,7 +12,10 @@ def read(filename):
 
 setup(
     name='vultr',
-    version='0.1.0',
+    version='0.1.1',
+    install_requires=[
+      "requests"
+    ],
     description='Vultr.com API Client',
     long_description=(read('README.rst')),
     url='http://github.com/spry-group/python-vultr',
@@ -32,4 +35,5 @@ def read(filename):
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     license=read('LICENSE'),
+    test_suite='tests'
 )

tests/__init__.py

@@ -0,0 +1,56 @@
+import unittest
+import os
+import warnings
+from vultr import Vultr, VultrError
+
+
+class UnauthenticateTests(unittest.TestCase):
+
+    def setUp(self):
+        self.vultr = Vultr('')
+
+    def test_plans_list(self):
+        response = self.vultr.plans_list()
+
+    def test_regions_list(self):
+        response = self.vultr.regions_list()
+
+    def test_os_list(self):
+        response = self.vultr.os_list()
+
+    def test_app_list(self):
+        response = self.vultr.app_list()
+
+
+class AuthenticatedTests(unittest.TestCase):
+
+    def setUp(self):
+        self.VULTR_KEY = os.environ.get('VULTR_KEY')
+
+        if self.VULTR_KEY is None:
+            warnings.warn('The VULTR_KEY environment variable is not ' +
+                          'set. AuthenticatedTests will be bypassed.',
+                          UserWarning)
+        else:
+            self.vultr = Vultr(self.VULTR_KEY)
+
+    def test_get_api_key(self):
+        if self.VULTR_KEY is None:
+            return
+        response = self.vultr.iso_list()
+
+    def test_post_api_key(self):
+        if self.VULTR_KEY is None:
+            return
+        try:
+            response = self.vultr.server_label_set('', '')
+        except VultrError as e:
+            msg = str(e)
+            self.assertEqual(msg, "Request failed. Check the response body" +
+                                  " for a more detailed description. Body:" +
+                                  " \nInvalid server.  Check SUBID value and" +
+                                  " ensure your API key matches the server's" +
+                                  " account")
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_vultr.py

@@ -1,2 +1,4 @@
-__version__ = '0.1.0'
-__license__ = 'MIT'
+__version__ = '0.1.1'
+__license__ = 'MIT'
+
+from .vultr import Vultr, VultrError

vultr/__init__.py

@@ -863,23 +863,23 @@ def server_create(self, dcid, vpsplanid, osid, ipxe_chain_url=None,
         if ipxe_chain_url is not None:
             params['ipxe_chain_url'] = ipxe_chain_url
         if isoid is not None:
-            params['isoid'] = isoid
+            params['ISOID'] = isoid
         if scriptid is not None:
-            params['scriptid'] = scriptid
+            params['SCRIPTID'] = scriptid
         if snapshotid is not None:
-            params['snapshotid'] = snapshotid
+            params['SNAPSHOTID'] = snapshotid
         if enable_ipv6 is not None:
             params['enable_ipv6'] = enable_ipv6
         if enable_private_network is not None:
             params['enable_private_network'] = enable_private_network
         if label is not None:
             params['label'] = label
         if sshkeyid is not None:
-            params['sshkeyid'] = sshkeyid
+            params['SSHKEYID'] = sshkeyid
         if auto_backups is not None:
             params['auto_backups'] = auto_backups
         if appid is not None:
-            params['appid'] = appid
+            params['APPID'] = appid
         return self.request('/v1/server/create', params, 'POST')
 
     def server_list_ipv4(self, subid):
@@ -1312,12 +1312,14 @@ def request(self, path, params={}, method='GET'):
         if not path.startswith('/'):
             path = '/' + path
         url = self.api_endpoint + path
-        params['api_key'] = self.api_key
 
         try:
             if method == 'POST':
-                resp = requests.post(url, data=params, timeout=60)
+                query = {'api_key': self.api_key}
+                resp = requests.post(url, params=query, data=params,
+                                     timeout=60)
             elif method == 'GET':
+                params['api_key'] = self.api_key
                 resp = requests.get(url, params=params, timeout=60)
             else:
                 raise VultrError('Unsupported method %s' % method)
@@ -1327,46 +1329,46 @@ def request(self, path, params={}, method='GET'):
 
         if resp.status_code != 200:
             if resp.status_code == 400:
-                raise VultrError('Invalid API location. Check the URL that you \
-                                  are using')
+                raise VultrError('Invalid API location. Check the URL that' +
+                                 ' you are using')
             elif resp.status_code == 403:
-                raise VultrError('Invalid or missing API key. Check that your \
-                                  API key is present and matches your assigned\
-                                  key')
+                raise VultrError('Invalid or missing API key. Check that' +
+                                 ' your API key is present and matches' +
+                                 ' your assigned key')
             elif resp.status_code == 405:
-                raise VultrError('Invalid HTTP method. Check that the method \
-                                  (POST|GET) matches what the documentation \
-                                  indicates')
+                raise VultrError('Invalid HTTP method. Check that the' +
+                                 ' method (POST|GET) matches what the' +
+                                 ' documentation indicates')
             elif resp.status_code == 412:
-
-                raise VultrError('Request failed. Check the response body for \
-                                  a more detailed description' + resp.json())
+                raise VultrError('Request failed. Check the response body ' +
+                                 'for a more detailed description. Body: \n' +
+                                 resp.text)
             elif resp.status_code == 500:
-                raise VultrError('Internal server error. Try again at a later \
-                                  time')
+                raise VultrError('Internal server error. Try again at a' +
+                                 ' later time')
             elif resp.status_code == 503:
-                raise VultrError('Rate limit hit. API requests are limited to \
-                                  an average of 1/s. Try your request again \
-                                  later.')
+                raise VultrError('Rate limit hit. API requests are limited' +
+                                 ' to an average of 1/s. Try your request' +
+                                 ' again later.')
 
         return resp.json()
 
 
 if __name__ == '__main__':
-    print "Vultr API Python Libary"
-    print "http://vultr.com"
+    print("Vultr API Python Libary")
+    print("http://vultr.com")
 
     api_key = ''
     if len(sys.argv) > 1:
         api_key = sys.argv[1]
 
     vultr = Vultr(api_key)
 
-    print vultr.iso_list()
-    print vultr.plans_list()
-    print vultr.regions_list()
-    print vultr.os_list()
-    print vultr.app_list()
+    print (vultr.iso_list())
+    print (vultr.plans_list())
+    print (vultr.regions_list())
+    print (vultr.os_list())
+    print (vultr.app_list())
 
     if api_key:
-        print vultr.account_info()
+        print (vultr.account_info())