Merge pull request #20 from clarkperkins/feature/upgrade-to-0.7

Upgrade client to work with server v0.7.0

Author: clarkperkins

.gitignore

@@ -55,3 +55,5 @@ target/
 
 # PyCharm
 .idea/
+
+.vagrant/

MANIFEST.in

@@ -0,0 +1 @@
+include README.md

README.md

@@ -1,4 +1,103 @@
 stackdio-python-client
 ======================
 
-The canonical Python client for the stackd.io API
+The canonical Python client and cli for the stackd.io API
+
+
+## Overview
+This is a small set of tools for internal use of stackd.io.  After cloning
+this repo, you should be able to quickly get up and running with your own
+stacks.  
+
+Advanced usage like creating custom blueprints or writing your own formulas is
+beyond the scope of this.
+
+## Installation
+We recommend using virtualenv via [virtualenvwrapper] to install this in a
+virtualenv.  If you consider yourself a knowledgeable Pythonista, feel free to
+install this however you'd like, but this document will assume that you are 
+using virtualenvwrapper.  See the full [virtualenvwrapper] docs for details,
+but in short you can install it on most systems like:
+
+    pip install virtualenvwrapper
+
+Once you've got it, installing this tool goes something like:
+
+    mkvirtualenv stackdio-client
+
+    # assuming you are in whatever dir you cloned this repo to:
+    pip install .
+
+You'll see a few things scrolling by, but should be set after this.  To use 
+this later, you'll need to re-activate the virtualenv like:
+
+    workon stackdio-client
+
+Whenever it's activated, `stackdio-cli` should be on your path.
+
+## First Use
+The first time that you fire up `stackdio-cli`, you'll need to run the
+`initial_setup` command.  This will prompt you for your LDAP username and
+password, and store them securely in your OS keychain for later use.  It will
+import some standard formula, and create a few commonly used blueprints.
+
+    $ stackdio-cli
+    None @ None
+    > initial_setup
+    # YOU WILL BE WALKED THROUGH A SIMPLE SET OF QUESTIONS
+
+## Stack Operations
+All of the following assume that you have run `initial_setup` successfully.  To
+launch the cli, simply type:
+
+    $ stackdio-cli
+
+You can run `help` at any point to see available commands.  For details on a
+specific command you can run `help COMMAND`, e.g. `help stacks`.  The rest of 
+these commands assume you have the cli running.
+
+### Launching Stacks
+Stacks are launched from blueprints.  To launch the 3 node HBase stack that's
+included with this you do:
+
+    > stacks launch cdh450-ipa-3 MYSTACKNAME
+
+**NOTE:** To avoid DNS namespace collisions, the stack name needs to be unique.
+An easy way to ensure this is to include your name in the stack name.
+
+### Deleting Stacks
+When you are done with a stack you can delete it.  This is destructive and
+cannot be recovered from, so think carefully before deleting your stack!
+
+    > stacks delete STACK_NAME
+
+Alternatively you can `terminate` a stack which will terminate all instances,
+but leave the stack definition in place.
+
+### Provisioning Stacks
+Occassionally something will go wrong when launching your stack, e.g. network
+connections may flake out causing some package installations to fail.  If this
+happens you can manually provision your stack, causing everything to be brought
+back up to date:
+
+    > stacks provision STACK_NAME
+
+### Stack Info
+Once you have launched a stack, you can then monitor the status of it like:
+
+    > stacks history STACK_NAME
+
+This displays the top level information for a stack.  You can supply additional
+arguments to pull back additional info about a stack.  For example, to get a
+list of FQDNs (aka hostnames) for a stack:
+
+    > stacks hostnames STACK_NAME
+
+There are various logs available that you can access with the `stacks logs`
+command.
+
+## What's Next?
+For anything not covered by this tool, you'll need to use the stackdio-server web UI or 
+API directly.  For more information on that, check out http://docs.stackd.io.
+
+[virtualenvwrapper]: https://pypi.python.org/pypi/virtualenvwrapper

Vagrantfile

@@ -0,0 +1,13 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "precise64"
+
+  config.vm.provision "shell", path: "vbox_setup.sh"
+
+  config.vm.synced_folder "~/Workspace/pi/stackdio-blueprints", "/home/vagrant/.stackdio-blueprints", create: true
+end

blueprints/.keep

@@ -0,0 +1,6 @@
+blueprints: {}
+
+formulas:
+  java: https://github.com/stackdio-formulas/java-formula.git
+  cdh5: https://github.com/stackdio-formulas/cdh5-formula.git
+  elasticsearch: https://github.com/stackdio-formulas/elasticsearch-formula.git

bootstrap.yaml

@@ -0,0 +1,5 @@
+[bdist_wheel]
+# This flag says that the code is written to work on both Python 2 and Python
+# 3. If at all possible, it is good practice to do this. If you cannot, you
+# will need to generate wheels for each Python version that you support.
+universal=1

setup.cfg

@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
+import os
 import sys
 
 from setuptools import setup, find_packages
@@ -42,9 +43,15 @@ def test_python_version():
 with open('README.md') as f:
     LONG_DESCRIPTION = f.read()
 
+CFG_DIR = os.path.expanduser("~/.stackdio-cli")
+
 requirements = [
-    'simplejson',
+    'Jinja2==2.7.3',
+    'PyYAML==3.11',
+    'cmd2==0.6.7',
+    'keyring==3.7',
     'requests>=2.4.0,<2.6.0',
+    'simplejson==3.4.0',
 ]
 
 if __name__ == "__main__":
@@ -63,9 +70,23 @@ def test_python_version():
         license='Apache 2.0',
         include_package_data=True,
         packages=find_packages(),
+        data_files=[
+            (CFG_DIR,
+                [
+                    'bootstrap.yaml',
+                ]),
+            (os.path.join(CFG_DIR, "blueprints"),
+                ["blueprints/%s" % f for f in os.listdir("blueprints")]),
+        ],
         zip_safe=False,
         install_requires=requirements,
         dependency_links=[],
+        entry_points={
+            'console_scripts': [
+                'stackdio-cli=stackdio.cli:main',
+                'blueprint-generator=stackdio.cli.blueprints:main',
+            ],
+        },
         classifiers=[
             'Development Status :: 4 - Beta',
             'Environment :: Web Environment',
@@ -78,6 +99,11 @@ def test_python_version():
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.2',
+            'Programming Language :: Python :: 3.3',
+            'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
             'Topic :: System :: Clustering',
             'Topic :: System :: Distributed Computing',
         ]