rigid 0.2.0 → 0.2.1

data/vendor/requests/utils.py

@@ -20,13 +20,16 @@ import warnings
 
 from . import __version__
 from . import certs
+# to_native_string is unused here, but imported here for backwards compatibility
+from ._internal_utils import to_native_string
 from .compat import parse_http_list as _parse_list_header
-from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
-                     builtin_str, getproxies, proxy_bypass, urlunparse,
-                     basestring)
+from .compat import (
+    quote, urlparse, bytes, str, OrderedDict, unquote, getproxies,
+    proxy_bypass, urlunparse, basestring, integer_types)
 from .cookies import RequestsCookieJar, cookiejar_from_dict
 from .structures import CaseInsensitiveDict
-from .exceptions import InvalidURL, InvalidHeader, FileModeWarning
+from .exceptions import (
+    InvalidURL, InvalidHeader, FileModeWarning, UnrewindableBodyError)
 
 _hush_pyflakes = (RequestsCookieJar,)
 
@@ -45,7 +48,7 @@ def dict_to_sequence(d):
 
 
 def super_len(o):
-    total_length = 0
+    total_length = None
     current_position = 0
 
     if hasattr(o, '__len__'):
@@ -54,10 +57,6 @@ def super_len(o):
     elif hasattr(o, 'len'):
         total_length = o.len
 
-    elif hasattr(o, 'getvalue'):
-        # e.g. BytesIO, cStringIO.StringIO
-        total_length = len(o.getvalue())
-
     elif hasattr(o, 'fileno'):
         try:
             fileno = o.fileno()
@@ -87,7 +86,22 @@ def super_len(o):
             # is actually a special file descriptor like stdin. In this
             # instance, we don't know what the length is, so set it to zero and
             # let requests chunk it instead.
-            current_position = total_length
+            if total_length is not None:
+                current_position = total_length
+        else:
+            if hasattr(o, 'seek') and total_length is None:
+                # StringIO and BytesIO have seek but no useable fileno
+
+                # seek to end of file
+                o.seek(0, 2)
+                total_length = o.tell()
+
+                # seek back to current position to support
+                # partially read file-like objects
+                o.seek(current_position or 0)
+
+    if total_length is None:
+        total_length = 0
 
     return max(0, total_length - current_position)
 
@@ -319,9 +333,7 @@ def add_dict_to_cookiejar(cj, cookie_dict):
     :rtype: CookieJar
     """
 
-    cj2 = cookiejar_from_dict(cookie_dict)
-    cj.update(cj2)
-    return cj
+    return cookiejar_from_dict(cookie_dict, cj)
 
 
 def get_encodings_from_content(content):
@@ -617,13 +629,13 @@ def select_proxy(url, proxies):
     proxies = proxies or {}
     urlparts = urlparse(url)
     if urlparts.hostname is None:
-        return proxies.get('all', proxies.get(urlparts.scheme))
+        return proxies.get(urlparts.scheme, proxies.get('all'))
 
     proxy_keys = [
-        'all://' + urlparts.hostname,
-        'all',
         urlparts.scheme + '://' + urlparts.hostname,
         urlparts.scheme,
+        'all://' + urlparts.hostname,
+        'all',
     ]
     proxy = None
     for proxy_key in proxy_keys:
@@ -759,22 +771,6 @@ def get_auth_from_url(url):
     return auth
 
 
-def to_native_string(string, encoding='ascii'):
-    """Given a string object, regardless of type, returns a representation of
-    that string in the native string type, encoding and decoding where
-    necessary. This assumes ASCII unless told otherwise.
-    """
-    if isinstance(string, builtin_str):
-        out = string
-    else:
-        if is_py2:
-            out = string.encode(encoding)
-        else:
-            out = string.decode(encoding)
-
-    return out
-
-
 # Moved outside of function to avoid recompile every call
 _CLEAN_HEADER_REGEX_BYTE = re.compile(b'^\\S[^\\r\\n]*$|^$')
 _CLEAN_HEADER_REGEX_STR = re.compile(r'^\S[^\r\n]*$|^$')
@@ -815,3 +811,17 @@ def urldefragauth(url):
     netloc = netloc.rsplit('@', 1)[-1]
 
     return urlunparse((scheme, netloc, path, params, query, ''))
+
+def rewind_body(prepared_request):
+    """Move file pointer back to its recorded starting position
+    so it can be read again on redirect.
+    """
+    body_seek = getattr(prepared_request.body, 'seek', None)
+    if body_seek is not None and isinstance(prepared_request._body_position, integer_types):
+        try:
+            body_seek(prepared_request._body_position)
+        except (IOError, OSError):
+            raise UnrewindableBodyError("An error occured when rewinding request "
+                                        "body for redirect.")
+    else:
+        raise UnrewindableBodyError("Unable to rewind request body for redirect.")

data/vendor/{rigid-0.2.0.dist-info → rigid-0.2.1.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.0
 Name: rigid
-Version: 0.2.0
+Version: 0.2.1
 Summary: Rig up your web application in seconds
-Home-page: http://rigidapp.com/
+Home-page: https://rigidapp.com/
 Author: Kyle Fuller
 Author-email: kyle@cocode.org
 License: BSD

data/vendor/{rigid-0.2.0.dist-info → rigid-0.2.1.dist-info}/RECORD

@@ -1,48 +1,48 @@
 rigid/__init__.py,sha256=FVHPBGkfhbQDi_z3v0PiKJrXXqXOx0vGW_1VaqNJi7U,22
-rigid/api.py,sha256=-V1Vh6cbXgDlN-YqOR_DlnwTGGXMDpeH75mV6ueguPw,4193
-rigid/deploy.py,sha256=0gnooMal1IbOQFznuonR1KJq42nKpfBCBs_5SnY4ozY,2175
-rigid/file_scanner.py,sha256=UMlJkD7YXnozMkWDxmpnQEhyJan2zoZXWtEiuJPZ-pg,1479
+rigid/api.py,sha256=4-NhL1MonAfOMIt19ElLx-urqXdQU3cjU6-1FmvvPn4,5316
+rigid/deploy.py,sha256=mu9H4sxJy_kf8oxrc1e-zWUAT9HiYs8FZCFZPCn51P0,2181
+rigid/file_scanner.py,sha256=-BX0LpLPsG_6Pj4UqMtkWk-egVftUDzNzC0xCmc0_iQ,1485
 rigid/utils.py,sha256=eJPmktA9Gm83TaG9uwbs1413LTpJP-EiG_DYECEZMEA,428
-rigid/commands/__init__.py,sha256=hFNGlIKsNnIKzmluMOjTB5iMtstvCVKueMIGSKiSIEg,6959
+rigid/commands/__init__.py,sha256=1jWdHvZv1EhYD0tja6HeaUkvTPB29IsxbFus3MwBAsc,8650
 rigid/commands/deploy.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rigid-0.2.0.dist-info/DESCRIPTION.rst,sha256=OCTuuN6LcWulhHS3d5rfjdsQtW22n7HENFRh6jC6ego,10
-rigid-0.2.0.dist-info/METADATA,sha256=tekFsMJr4NHv4eDDySfXrJ3ul_NKgayRuhJHb87dGiY,638
-rigid-0.2.0.dist-info/RECORD,,
-rigid-0.2.0.dist-info/WHEEL,sha256=u6Fy2U76CDFJ6q2P27rqtBo3AN6qpylFiMaYzNr2lJg,95
-rigid-0.2.0.dist-info/entry_points.txt,sha256=MPjHcNW_6-u5NuSAzeVAqVfmIbo2A47LSotTigvTa_c,46
-rigid-0.2.0.dist-info/metadata.json,sha256=vAq9h69JatHvPjCDoKvQyHrtZG-ikLekqousZAwUeeo,967
-rigid-0.2.0.dist-info/top_level.txt,sha256=LbeTr3maOGl8NwALmksu6EESy4CVZ_nltVNtdqLBKWY,12
+rigid-0.2.1.dist-info/DESCRIPTION.rst,sha256=OCTuuN6LcWulhHS3d5rfjdsQtW22n7HENFRh6jC6ego,10
+rigid-0.2.1.dist-info/METADATA,sha256=C7JsLjtl5HiCAorhNrnT1ivymLtRAaJbsY_dFfJyfp4,639
+rigid-0.2.1.dist-info/RECORD,,
+rigid-0.2.1.dist-info/WHEEL,sha256=u6Fy2U76CDFJ6q2P27rqtBo3AN6qpylFiMaYzNr2lJg,95
+rigid-0.2.1.dist-info/entry_points.txt,sha256=MPjHcNW_6-u5NuSAzeVAqVfmIbo2A47LSotTigvTa_c,46
+rigid-0.2.1.dist-info/metadata.json,sha256=EXtJCWwdQh58xaYZL3CpOz7QaJ20J1UBfZXxtI5EWBw,968
+rigid-0.2.1.dist-info/top_level.txt,sha256=LbeTr3maOGl8NwALmksu6EESy4CVZ_nltVNtdqLBKWY,12
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_deploy.py,sha256=ob_v3v2KZV_x258imkCQqvOA_un1qkloPqZWh9QzBfY,893
 tests/test_file_scanner.py,sha256=PFGwRr4lnyXj7WBoa9OnENCGB6gttuFq50XZB6VYzOM,2753
-tests/utils.py,sha256=qfqcNn4iI3nE59wXfp1AiuJ2XWlBiY6VY4PLK5mzFwU,2292
+tests/utils.py,sha256=oq2wfPzvnX--6SkuarBHOpa1OTQeN74TyQy-gPQ5_E8,2398
 tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/integration/test_app.py,sha256=l5zMxUMyzJMoQw1bNKSHHAQYvOR-7MmO-KSscezExkM,2232
+tests/integration/test_app.py,sha256=JN4FSA8kjibM4tBh4ny46sJ2holExeIPbVjf7YN7hxQ,2757
 tests/integration/test_apps.py,sha256=kWv_JHQp7YxbBfaenefeFTdjje63REiF9LRtg2dHSu8,762
 tests/integration/test_deploy.py,sha256=NMNPlpHbuRUjbPQehIACzKbNvSiqtoxa3ZmXiWzSaWY,4986
 tests/integration/test_domains.py,sha256=YP-xlWIR-KmpmW-usaRUQg5aC5pY2vvpkjVkM_RpvC4,1341
 tests/integration/test_login.py,sha256=7jpgY7EkLdbd0ahWBpxbJyuZMXPUPENAHvQAyJBSYFU,1507
-tests/integration/test_promote.py,sha256=vmEH89H-_IeLfHCRXSs3rMJ9UTtfWwXkxKI71VJOaJM,809
+tests/integration/test_promote.py,sha256=7RfIsIA5N8R0Uv34gLk7i14UGxJ8OQZhTMi3lpiTQPw,859
 tests/integration/test_token.py,sha256=xsMxtrPYb6zt48TvP--sjC-P7750IeZEFjcgZGh7t0w,1117
 tests/integration/test_whoami.py,sha256=rJ5j5VaauKnddduo7PYfHwXbt47ccgHQY1tEMhGtVkQ,730
 ../../../bin/rigid,sha256=siJK-1C1K5gmtBOVFKUYHZLx_8Q4hz27OPaGyFfGADA,265
-rigid-0.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+rigid-0.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
 tests/integration/test_promote.pyc,,
 tests/test_file_scanner.pyc,,
 rigid/deploy.pyc,,
 tests/__init__.pyc,,
-tests/utils.pyc,,
+rigid/commands/deploy.pyc,,
 rigid/utils.pyc,,
-tests/integration/test_token.pyc,,
 tests/integration/test_domains.pyc,,
-rigid/commands/deploy.pyc,,
 tests/integration/__init__.pyc,,
 rigid/api.pyc,,
 tests/integration/test_app.pyc,,
+tests/integration/test_token.pyc,,
 tests/integration/test_apps.pyc,,
 rigid/__init__.pyc,,
 rigid/commands/__init__.pyc,,
 tests/integration/test_deploy.pyc,,
+tests/utils.pyc,,
 tests/test_deploy.pyc,,
 tests/integration/test_whoami.pyc,,
 tests/integration/test_login.pyc,,

data/vendor/{rigid-0.2.0.dist-info → rigid-0.2.1.dist-info}/metadata.json

@@ -1 +1 @@
-{"classifiers": ["Development Status :: 5 - Production/Stable", "Operating System :: OS Independent", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5", "License :: OSI Approved :: BSD License"], "extensions": {"python.commands": {"wrap_console": {"rigid": "rigid.commands:cli"}}, "python.details": {"contacts": [{"email": "kyle@cocode.org", "name": "Kyle Fuller", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "http://rigidapp.com/"}}, "python.exports": {"console_scripts": {"rigid": "rigid.commands:cli"}}}, "extras": [], "generator": "bdist_wheel (0.30.0.a0)", "license": "BSD", "metadata_version": "2.0", "name": "rigid", "run_requires": [{"requires": ["click", "pyyaml", "requests"]}], "summary": "Rig up your web application in seconds", "test_requires": [{"requires": ["six"]}], "version": "0.2.0"}
+{"classifiers": ["Development Status :: 5 - Production/Stable", "Operating System :: OS Independent", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.5", "License :: OSI Approved :: BSD License"], "extensions": {"python.commands": {"wrap_console": {"rigid": "rigid.commands:cli"}}, "python.details": {"contacts": [{"email": "kyle@cocode.org", "name": "Kyle Fuller", "role": "author"}], "document_names": {"description": "DESCRIPTION.rst"}, "project_urls": {"Home": "https://rigidapp.com/"}}, "python.exports": {"console_scripts": {"rigid": "rigid.commands:cli"}}}, "extras": [], "generator": "bdist_wheel (0.30.0.a0)", "license": "BSD", "metadata_version": "2.0", "name": "rigid", "run_requires": [{"requires": ["click", "pyyaml", "requests"]}], "summary": "Rig up your web application in seconds", "test_requires": [{"requires": ["six"]}], "version": "0.2.1"}

data/vendor/rigid/api.py

@@ -1,13 +1,19 @@
 import os
 import sys
 import platform
-import urlparse
+
+try:
+    import urlparse
+except ImportError:
+    # Python 3
+    from urllib import parse as urlparse
+
 import requests
 import click
 
 from rigid import __version__
 
-DEFAULT_API_BASE = 'https://rigid-api.herokuapp.com'
+DEFAULT_API_BASE = 'https://api.rigidapp.com'
 
 
 class Client(object):
@@ -107,6 +113,11 @@ class Client(object):
         response = self.session.delete(self.url('apps', name))
         self.validate(response)
 
+    def update_app(self, name, payload):
+        response = self.session.patch(self.url('apps', name), json=payload)
+        self.validate(response)
+        return response.json()
+
     def promote(self, app, alias, version, config=None):
         payload = {
             'version': version,
@@ -127,3 +138,29 @@ class Client(object):
     def remove_domain(self, app, alias, domain):
         response = self.session.delete(self.url('apps', app, 'aliases', alias, 'domains', domain))
         self.validate(response)
+
+    # Organisations
+
+    def orgs(self):
+        response = self.session.get(self.url('organisations'))
+        self.validate(response)
+        return response.json()
+
+    def org(self, name):
+        response = self.session.get(self.url('organisations', name))
+        self.validate(response)
+        return response.json()
+
+    def create_organisation(self, name):
+        response = self.session.post(self.url('organisations'), json=dict(name=name))
+        self.validate(response)
+        return response.json()
+
+    def update_organisation(self, name, payload):
+        response = self.session.patch(self.url('organisations', name), json=payload)
+        self.validate(response)
+        return response.json()
+
+    def delete_organisation(self, name):
+        response = self.session.delete(self.url('organisations', name))
+        self.validate(response)

data/vendor/rigid/commands/__init__.py

@@ -88,8 +88,9 @@ def token(ctx, scope):
 @click.argument('app')
 @click.option('--create', is_flag=True)
 @click.option('--delete', is_flag=True)
+@click.option('--rename')
 @click.pass_context
-def app(ctx, app, create, delete):
+def app(ctx, app, create, delete, rename):
     """View or manage a specific application"""
 
     if create:
@@ -103,6 +104,11 @@ def app(ctx, app, create, delete):
         click.echo('{} has been deleted.'.format(app))
         return
 
+    if rename:
+        payload = ctx.obj.update_app(app, {'name': rename})
+        click.echo('{} has been renamed to {}.'.format(app, payload['name']))
+        return
+
     payload = ctx.obj.app(app)
 
     click.echo('{} - {}'.format(payload['name'], payload['web_url']))
@@ -173,35 +179,37 @@ def deploy(ctx, source, app, alias, create, config, verbose):
     if create:
         new_app = ctx.obj.create_app(app)
         app = new_app['name']
-        click.echo('Application {} has been created.'.format(app))
+        click.echo('=> Application {} has been created'.format(app))
     else:
         deploy.validate(app)
 
     if verbose:
         files = deploy.collect_files()
-        click.echo('{} source files:'.format(len(files)))
+        click.echo(' -> {} source files:'.format(len(files)))
 
         for name in files:
-            click.echo('- {}'.format(name))
+            click.echo('    - {}'.format(name))
 
     uploader, length = deploy.upload(app)
 
-    with click.progressbar(length=length, label='Uploading Source') as progress:
+    with click.progressbar(length=length, label='=> Uploading Source') as progress:
         source_uuid = uploader(progress.update)
 
     version_uuid = deploy.upload_version(app, source_uuid)
 
-    click.echo('Version {} has been created'.format(version_uuid))
+    click.echo('=> Created version {}'.format(version_uuid))
 
-    with click.progressbar(length=100, label='Promoting to {}'.format(alias)) as progress:
+    with click.progressbar(length=100, label='=> Promoting to {}'.format(alias)) as progress:
+        progress.update(5)
         counter = 0
 
         while True:
             try:
-                ctx.obj.promote(app, alias, version_uuid, config)
+                alias = ctx.obj.promote(app, alias, version_uuid, config)
+                progress.update(100)
                 break
             except click.ClickException as e:
-                progress.update(1)
+                progress.update(10)
 
                 if hasattr(e, 'response') and e.response.status_code == 400:
                     payload = e.response.json()
@@ -219,7 +227,7 @@ def deploy(ctx, source, app, alias, create, config, verbose):
             if counter % 2:
                 time.sleep(2)
 
-    click.echo('{} ({}) has been deployed.'.format(app, alias))
+    click.echo('=> {} deployed'.format(alias.get('web_url')))
 
 
 @cli.command('domains')
@@ -256,5 +264,57 @@ def promote(ctx, app, alias, config, version):
     """Promote a version to an alias."""
 
     config = load_config(config, alias)
+    click.echo('=> Promoting {} to {}'.format(version, alias))
     payload = ctx.obj.promote(app, alias, version, config)
-    click.echo('{}/{} is now running {}.'.format(app, alias, payload['version']))
+    click.echo('=> {} deployed'.format(payload.get('web_url')))
+
+
+@cli.command('org')
+@click.argument('name')
+@click.option('--create', is_flag=True)
+@click.option('--delete', is_flag=True)
+@click.option('--rename')
+@click.pass_context
+def app(ctx, name, create, delete, rename):
+    """View or manage a specific organisation"""
+
+    if create:
+        payload = ctx.obj.create_organisation(name)
+        click.echo('{name} has been created.'.format(**payload))
+        return
+
+    if delete:
+        click.confirm('Are you sure you want to delete {}?'.format(name), abort=True)
+        ctx.obj.delete_organisation(name)
+        click.echo('{} has been deleted.'.format(name))
+        return
+
+    if rename:
+        payload = ctx.obj.update_organisation(name, {'name': rename})
+        click.echo('{} has been renamed to {}.'.format(name, payload['name']))
+        return
+
+    payload = ctx.obj.org(name)
+    click.echo(payload['name'])
+
+
+@cli.command('orgs')
+@click.pass_context
+def apps(ctx):
+    """List your Rigid organisations"""
+
+    orgs = ctx.obj.orgs()
+
+    for org in orgs:
+        click.echo(org['name'])
+
+    if len(orgs) == 0:
+        click.echo("You don't have any organisations yet.")
+
+
+# TODO add `hidden=True` in click 7.0
+# https://github.com/pallets/click/pull/500#issuecomment-221018003
+@cli.command('help')
+@click.pass_context
+def help(ctx):
+    ctx.fail('No such command "help". Did you mean `--help`?')

data/vendor/rigid/deploy.py

@@ -22,7 +22,7 @@ class Deploy(object):
         else:
             skipper = Skipper([])
 
-        return filter(skipper, scan(self.source))
+        return list(filter(skipper, scan(self.source)))
 
     def create_tarball(self, path):
         tar(path, self.collect_files(), self.source)