Merge lp:~blr/rutabaga/doc-update into lp:rutabaga

Proposed by Kit Randel
Status: Merged
Merged at revision: 55
Proposed branch: lp:~blr/rutabaga/doc-update
Merge into: lp:rutabaga
Diff against target: 136 lines (+88/-16)
4 files modified
docs/api.rst (+22/-0)
docs/conf.py (+1/-1)
docs/getting_started.rst (+40/-0)
docs/index.rst (+25/-15)
To merge this branch: bzr merge lp:~blr/rutabaga/doc-update
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+275794@code.launchpad.net

Description of the change

This branch splits Rutabaga's docs into 'Getting Started' and 'API documentation' sections. Currently Cornice API docs will render weirdly unfortunately (displaying str.__doc__), however I have provided a pull request on github to fix the issue (https://github.com/mozilla-services/cornice/pull/341).

A few trivial changes as well:

* Removed docstring references to lp specific infrastructure (builders).
* Added iso8601 dep to test-requirements.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
lp:~blr/rutabaga/doc-update updated
45. By Kit Randel

Trivial grammar.

46. By Kit Randel

Merge devel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'docs/api.rst'
2--- docs/api.rst 1970-01-01 00:00:00 +0000
3+++ docs/api.rst 2015-11-19 21:45:01 +0000
4@@ -0,0 +1,22 @@
5+.. _api:
6+
7+API Documentation
8+=================
9+
10+Web Token REST API
11+##################
12+
13+The Rutabaga API provides the following endpoints:
14+
15+.. cornice-autodoc::
16+ :modules: rutabaga.views
17+
18+
19+Auth API
20+########
21+
22+The auth module provides methods for creating, persisting, invaliding
23+and deleting tokens. Tokens are persisted to a sqlite3 store.
24+
25+.. automodule:: rutabaga.auth
26+ :members:
27
28=== modified file 'docs/conf.py'
29--- docs/conf.py 2015-07-24 05:33:16 +0000
30+++ docs/conf.py 2015-11-19 21:45:01 +0000
31@@ -100,7 +100,7 @@
32
33 # The theme to use for HTML and HTML Help pages. See the documentation for
34 # a list of builtin themes.
35-html_theme = 'default'
36+html_theme = 'alabaster'
37
38 # Theme options are theme-specific and customize the look and feel of a theme
39 # further. For a list of options available for each theme, see the
40
41=== added file 'docs/getting_started.rst'
42--- docs/getting_started.rst 1970-01-01 00:00:00 +0000
43+++ docs/getting_started.rst 2015-11-19 21:45:01 +0000
44@@ -0,0 +1,40 @@
45+.. _getting_started:
46+
47+Getting Started
48+===============
49+
50+Get the source
51+##############
52+
53+Rutabaga's source is available from `launchpad <https://launchpad.net/rutabaga>`_::
54+
55+ $ bzr branch lp:rutabaga
56+
57+Install Dependencies
58+####################
59+
60+Ideally in a python3 virtualenv::
61+
62+ $ pip install -r requirements.txt
63+ $ pip install -r test-requirements.txt
64+
65+
66+Common Tasks
67+############
68+
69+Create a new sqlite3 database::
70+
71+ $ make schema
72+
73+Starting the dev server::
74+
75+ $ python3 setup.py develop
76+ $ make start-api
77+
78+Running tests::
79+
80+ $ make
81+
82+The default make target (check) will run all of Rutabaga's tests.
83+
84+* :ref:`genindex`
85
86=== modified file 'docs/index.rst'
87--- docs/index.rst 2015-07-24 05:33:16 +0000
88+++ docs/index.rst 2015-11-19 21:45:01 +0000
89@@ -1,23 +1,33 @@
90-.. Rutabaga documentation master file, created by
91- sphinx-quickstart on Thu Jul 16 11:11:38 2015.
92- You can adapt this file completely to your liking, but it should at least
93- contain the root `toctree` directive.
94-
95-Welcome to Rutabaga's documentation!
96-====================================
97-
98-Contents:
99+Rutabaga Documentation
100+======================
101+
102+`Rutabaga <https://launchpad.net/rutabaga>`_ is comprised of a `Cornice
103+<https://github.com/mozilla-services/cornice>`_
104+REST API and Squid addon helper, providing time limited tokens for
105+squid basic authentication to consuming services.
106+
107+Tokens can be manually revoked, or in a typical deployment scenario,
108+revoked from a cron job. This is particularly useful in scenarios
109+where consuming services may be running untrusted code but
110+require restricted internet access for a particular process e.g. fetching
111+a data payload, or software dependencies.
112
113 .. toctree::
114 :maxdepth: 2
115
116-.. services::
117- :modules: rutabaga.views
118-
119-Indices and tables
120+ getting_started
121+ api
122+
123+
124+
125+Squid Addon Helper
126+##################
127+
128+Rutabaga's `squid helper <http://bazaar.launchpad.net/~canonical-launchpad-branches/rutabaga/devel/view/head:/rutabaga/scripts/rutabaga_auth_helper.py>`_ conforms to the squid addon helper `basic auth protocol
129+<http://wiki.squid-cache.org/Features/AddonHelpers#Basic_Scheme>`_.
130+
131+Search
132 ==================
133
134-* :ref:`genindex`
135-* :ref:`modindex`
136 * :ref:`search`
137

Subscribers

People subscribed via source and target branches

to all changes: