Fixed #7 -- updated README and published to pypi.

Author: mboersma

client/README.rst

@@ -1,68 +1,85 @@
-deis
-====
-
-**Deis** is an open source *platform-as-a-service* (PaaS) for public and
-private clouds.
-
-Take your agile development to the next level. Free your mind and focus
-on your code. Deploy updates to local metal or worldwide clouds with
-``git push``. Scale servers, processes, and proxies with a simple
-command. Enjoy the *twelve-factor app* workflow while keeping total
-control.
-
-The `opdemand/deis <https://github.com/opdemand/deis>`__ project
-contains a command-line interface to the **Deis** system. It's all you
-need to work with an existing **Deis** controller. To set up your own
-private application platform, the
-`deis-controller <https://github.com/opdemand/deis-controller>`__ and
-`deis-chef <https://github.com/opdemand/deis-chef>`__ projects are also
-required.
+deis: Command-line client for your PaaS
+=======================================
 
-Getting Started
+.. image:: https://badge.fury.io/py/deis.png
+    :target: http://badge.fury.io/py/deis
+
+.. image:: https://travis-ci.org/opdemand/deis.png?branch=master
+    :target: https://travis-ci.org/opdemand/deis
+
+.. image:: https://pypip.in/d/deis/badge.png
+    :target: https://crate.io/packages/deis/
+
+What is Deis?
+-------------
+
+Deis is an open source PaaS inspired by Heroku, that makes it easy to deploy
+and scale LXC containers used to host applications, databases, middleware and
+other services. Deis leverages Docker, Chef and Heroku Buildpacks to provide a
+private PaaS that is lightweight and flexible.
+
+Deis comes with out-of-the-box support for Ruby, Python, Node.js, Java,
+Clojure, PHP, Dart and Go. However, Deis can deploy *anything* using Heroku
+Buildpacks or pre-built Docker images.  Containers can be deployed to any
+cloud provider, although only EC2 is currently supported.
+
+Why Deis?
+=========
+
+Deploy anything
 ---------------
 
-Clone the git repository at `<https://github.com/opdemand/deis.git>`_:
+Leverage Heroku Buildpacks to deploy a wide range of languages and frameworks
+with a simple "git push" or create custom Docker images to deploy pre-built
+apps, databases and other services.
 
-::
+Control everything
+------------------
 
-    $ git clone https://github.com/opdemand/deis.git
-    Cloning into 'deis'...
-    ...
-    Resolving deltas: 100%, done.
-    $ cd deis
+Choose your hosting providers. Define your application formations. Scale
+nodes and containers independently. Control your routing layer. Manage the
+entire platform with a private Deis controller.
 
+Scale effortlessly
+------------------
 
-Use an isolated python environment:
+Scale nodes, containers and proxies with a single command. Node provisioning is
+transparent, container formations are rebalanced automatically and proxies are
+updated to re-route traffic without downtime.
 
-::
+100% Open Source
+----------------
 
-    $ virtualenv venv
-    New python executable in venv/bin/python
-    ...
-    Installing pip................done.
-    $ source venv/bin/activate
-    (venv) $
+Free, transparent and easily customized.  Join the open-source PaaS and DevOps
+community by using Deis and complimentary projects like Docker, Chef and
+Heroku Buildpacks.
 
+Getting Started
+---------------
 
-Next Steps
-----------
+Installing the Deis client from the Python Package Index is simple:
 
-License
--------
+::
 
-**Deis** is open source software under the Apache 2.0 license. Please
-see the **LICENSE** file in the root directory for details.
+    $ pip install deis
 
-Credits
+The client will automatically install the following dependencies:
+
+-  `pyyaml <https://bitbucket.org/xi/pyyaml>`__
+-  `requests <http://python-requests.org>`__
+
+
+License
 -------
 
-**Deis** rests on the shoulders of leading open source technologies:
+Copyright 2013, OpDemand LLC
 
--  Docker
--  Chef
--  Django
--  Heroku buildpacks
--  Gitosis
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at <http://www.apache.org/licenses/LICENSE-2.0>
 
-`OpDemand <http://www.opdemand.com/>`__ sponsors and maintains the
-**Deis** project.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.

client/deis/client.py

@@ -19,15 +19,15 @@
   rotate        rotate in fresh backends, proxies or containers
   balance       rebalance and converge the container formation
   destroy       destroy a container formation
-  
+
 Use `deis help [subcommand]` to learn about these subcommands:
-  
+
   formations    manage container formations
   containers    manage the containers running on backends
   backends      manage the backend nodes hosting containers
   proxies       manage the proxy nodes routing to containers
   nodes         manage nodes of all types
-  
+
   flavors       create and manage node flavors
   providers     create and manage cloud provider credentials
 
@@ -55,7 +55,7 @@
 import yaml
 
 
-__version__ = '0.0.1'
+__version__ = '0.0.4'
 
 
 USAGE = {
@@ -280,7 +280,7 @@ def auth_register(self, args):
             print('Registered {}'.format(username))
             login_args = {'--username': username, '--password': password,
                           '<controller>': controller}
-            # login after registering 
+            # login after registering
             if self.auth_login(login_args) is False:
                 print('Login failed')
                 return
@@ -327,7 +327,7 @@ def auth_logout(self, args):
         self._settings['controller'] = None
         self._settings.save()
         print('Logged out')
-    
+
     def backends_list(self, args):
         formation = args.get('--formation')
         if not formation:
@@ -523,7 +523,7 @@ def keys_remove(self, args):
             print('done')
         else:
             print('Error!', response.text)
-    
+
     def flavors_create(self, args):
         """Create a flavor using a provider"""
         body = {'id': args.get('--id'), 'provider': args.get('--provider')}
@@ -562,7 +562,7 @@ def flavors_info(self, args):
             print(json.dumps(response.json(), indent=2))
         else:
             print('Error!', response.text)
-    
+
     def flavors_list(self, args):
         """List flavors for a user."""
         response = self._session.get(
@@ -685,7 +685,7 @@ def formations_balance(self, args):
             print(json.dumps(databag, indent=2))
         else:
             print('Error!', response.text)
-    
+
     def formations_converge(self, args):
         formation = args.get('--formation')
         if not formation:
@@ -709,7 +709,7 @@ def nodes_info(self, args):
             print(json.dumps(response.json(), indent=2))
         else:
             print('Error!', response.text)
-    
+
     def nodes_list(self, args):
         """List nodes for this formation."""
         formation = args.get('--formation')
@@ -782,7 +782,7 @@ def providers_info(self, args):
             print(json.dumps(response.json(), indent=2))
         else:
             print('Error!', response.text)
-    
+
     def proxies_list(self, args):
         """List proxies for this formation."""
         formation = args.get('--formation')
@@ -827,7 +827,7 @@ def main():
                 'calculate': cli.formations_calculate,
                 'balance': cli.formations_balance,
                 'converge': cli.formations_converge}
-    # dispatch based on primary command 
+    # dispatch based on primary command
     if cmd == 'help':
         docopt(__doc__, argv=['--help'])
     elif hasattr(cli, cmd):

client/setup.py

@@ -35,13 +35,13 @@
 
 
 # pylint: disable=W0142
-setup(name='opdemand',
-      version=__version__,
+setup(name='deis',
+      version='0.0.4',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis',
       author='OpDemand',
       author_email='info@opdemand.com',
-      url='https://github.com/opdemand/deis-cli',
+      url='https://github.com/opdemand/deis',
       keywords=['opdemand', 'deis', 'cloud', 'aws', 'ec2', 'heroku'],
       classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -52,7 +52,6 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Internet',
         'Topic :: System :: Systems Administration',

deis/__init__.py

@@ -4,4 +4,4 @@
 the api, celerytasks, and web Django apps.
 """
 
-__version__ = '0.0.1'
+__version__ = '0.0.4'