Merge branch 'develop'

vmware-archive · Sep 26, 2012 · 1f18d30 · 1f18d30
2 parents 3c73e18 + 9a79973
commit 1f18d30
Show file tree

Hide file tree

Showing 20 changed files with 1,189 additions and 114 deletions.
diff --git a/doc/Makefile b/doc/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build2
+SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -18,6 +18,9 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 
+from sphinx.directives import TocTree
+
+
 class Mock(object):
     '''
     Mock out specified imports
@@ -43,6 +46,7 @@ def __getattr__(self, name):
             return Mock()
 
 MOCK_MODULES = [
+    'paramiko',
     'salt',
     'salt.crypt',
     'yaml',
@@ -337,3 +341,21 @@ def __getattr__(self, name):
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'http://docs.python.org/': None}
+
+def _normalize_version(args):
+    _, path = args
+    return '.'.join([x.zfill(4) for x in (path.split('/')[-1].split('.'))])
+
+
+class ReleasesTree(TocTree):
+    option_spec = dict(TocTree.option_spec)
+
+    def run(self):
+        rst = super(ReleasesTree, self).run()
+        entries = rst[0][0]['entries'][:]
+        entries.sort(key=_normalize_version, reverse=True)
+        rst[0][0]['entries'][:] = entries
+        return rst
+
+def setup(app):
+    app.add_directive('releasestree', ReleasesTree)
diff --git a/doc/contents.rst b/doc/contents.rst
@@ -15,4 +15,5 @@ Salt Cloud Table of Contents
     ref/cli/man/salt-cloud
 
     topics/releases/index
-    topicstopics/releases/0.6.0
+    topics/releases/0.6.0
+    topics/releases/0.7.0
diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,4 +1,4 @@
-.TH "SALT-CLOUD" "1" "August 13, 2012" "0.7.0" "salt-cloud"
+.TH "SALT-CLOUD" "1" "September 25, 2012" "0.8.0" "salt-cloud"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.\" Man page generated from reStructuredText.
+.\" Man page generated from reStructeredText.
 .
 .sp
 Copy a file to a set of systems
@@ -131,6 +131,33 @@ minion RSA keys. Default location is /etc/salt/master.
 Specify an alternative location for the salt cloud profiles file.
 Default location is /etc/salt/cloud.profiles.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-raw\-out
+Print the output from the salt command in raw python
+form, this is suitable for re\-reading the output into
+an executing python script with eval.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-text\-out
+Print the output from the salt command in the same form the shell would.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-yaml\-out
+Print the output from the salt command in yaml.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-json\-out
+Print the output from the salt command in json.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-color
+Disable all colored output.
+.UNINDENT
 .SH EXAMPLES
 .sp
 To create 4 vms named web1, web2, db1 and db2 from specified profiles:
@@ -159,4 +186,5 @@ Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors fil
 .SH COPYRIGHT
 2012, Thomas S Hatch
 .\" Generated by docutils manpage writer.
+.\" 
 .