Commit graph

111 commits

Author SHA1 Message Date
Daniel Wagner-Hall
c432396079 Add comment 2015-11-23 17:26:32 +00:00
Daniel Wagner-Hall
866fa58276 Rename 2015-11-23 17:22:53 +00:00
Daniel Wagner-Hall
e045f28b44 Pull out constant for permissions
Also, drop permissions from 0755 to 0700
2015-11-23 17:20:54 +00:00
Daniel Wagner-Hall
6f1d00097b Only bother trying to fetch if we need to 2015-11-19 16:15:13 -05:00
Daniel Wagner-Hall
8872e17f93 Fall back to last known HEAD sha if fetch fails 2015-11-19 16:14:22 -05:00
Daniel Wagner-Hall
dd53847211 Include command stderr in error text 2015-11-19 16:11:19 -05:00
Daniel Wagner-Hall
9ad64b02d1 speculator: guard against concurrent git commands 2015-11-19 15:41:15 -05:00
Daniel Wagner-Hall
0f0359d9c1 speculator: Nessle up some more if statements 2015-11-11 15:13:34 +00:00
Daniel Wagner-Hall
740cc66a7c speculator: Fetch before deciding head is fresh 2015-11-11 14:01:45 +00:00
Daniel Wagner-Hall
27ffe7bacd Don't serve rst diffs as HTML 2015-11-10 15:35:10 +00:00
Daniel Wagner-Hall
c3608b3a69 Merge branch 'master' into daniel/continuservconcurrency
Conflicts:
	scripts/continuserv/main.go
2015-11-09 16:11:34 +00:00
Daniel Wagner-Hall
bbf9e229a7 continuserv: guard concurrent accesses to wg 2015-11-06 16:09:09 +00:00
Daniel Wagner-Hall
1be5b856bd Preserve text/plain for errors
Newlines are nice
2015-11-06 16:05:07 +00:00
Daniel Wagner-Hall
7f6eafdce5 continuserv: set Content-Type header 2015-11-06 14:46:55 +00:00
Daniel Wagner-Hall
937ff046d8 Force / to be HTML too 2015-11-05 19:21:16 +00:00
Daniel Wagner-Hall
559747e77a speculator: Sent Content-Type: text/html header
Go is auto-detecting that this is XML (because for some reason we
generate XHTML), and serving it with a Content-Type header text/xml.

This causes the browser to render it as XHTML, which gives interesting
quirks like extra newlines.

This forces the browser to interpret it as HTML.

What we should probably do instead of stop generating XHTML and start
generating HTML. But in the mean time, this will fix the rendering
issues.
2015-11-05 19:18:28 +00:00
Mark Haines
71874870c8 Enable syntax highlighting for example http requests 2015-10-26 17:25:33 +00:00
Daniel Wagner-Hall
1aeddac319 Cache spec output
Does not cache inability to generate spec. Does not cache diffs or
anything fancy. Just the raw spec generation.
2015-10-26 10:28:14 +00:00
Mark Haines
df443c10ac Move css into a css subdirectory.
Add css to put a bar next to blockquotes.
2015-10-23 11:58:06 +01:00
Daniel Wagner-Hall
82d4ea199f Trust Leo 2015-10-22 16:09:01 +01:00
Kegsay
e5559e4ea5 Merge pull request #106 from matrix-org/erikj/newline_gendoc_STOP_BEING_CRANKY
gendoc should just add newlines rather than complaining about the lack thereof
2015-10-15 09:56:04 +01:00
Erik Johnston
70704240dc gendoc should just add newlines rather than complaining about the lack thereof 2015-10-14 16:29:18 +01:00
Richard van der Hoff
013b6db895 Add a note on building the speculator
... because the wiki says you need to read the README on how to build it.
2015-10-14 14:42:52 +01:00
Richard van der Hoff
270e1d7aa8 Add richvdh to list of trusted pushers for spectulator
richvdh is awesome, he should have all the permissions.
2015-10-14 14:29:36 +01:00
Oddvar Lovaas
1cfe4f784f special css for spec/howto 2015-10-12 19:57:41 +01:00
Oddvar Lovaas
ceebf34fca generate docs with new nav bar 2015-10-12 19:11:35 +01:00
Daniel Wagner-Hall
6922850643 Add missing return 2015-10-09 11:02:27 +01:00
Daniel Wagner-Hall
b46f0e30b8 Checkout SHA of origin/master rather than merging 2015-10-09 11:02:00 +01:00
Daniel Wagner-Hall
a0cf485919 speculator: Specify merge target 2015-10-09 10:43:27 +01:00
Kegan Dougal
7805ca87df If build.py throws, actually print stdout. Also run jenkins.sh in verbose mode. 2015-10-07 10:34:29 +01:00
Kegsay
8c092e3d11 Merge pull request #74 from matrix-org/module-presence
Presence module
2015-10-02 16:24:53 +01:00
Daniel Wagner-Hall
7df3d9090a Merge pull request #81 from matrix-org/daniel/speculatormerge
speculator: Merge after fetching, so that /spec/head works
2015-10-02 07:33:34 -05:00
Daniel Wagner-Hall
0e8f1b5475 Quote args 2015-10-02 07:33:26 -05:00
Daniel Wagner-Hall
a69e03f577 speculator: Report listening port 2015-10-01 19:15:30 -05:00
Daniel Wagner-Hall
30232f20aa speculator: Merge after fetching, so that /spec/head works 2015-10-01 19:13:09 -05:00
Kegan Dougal
cc6f256b24 Merge branch 'master' into module-presence
Conflicts:
	specification/modules/presence.rst
2015-10-01 15:46:52 +01:00
Kegsay
f74cb4d54c Merge pull request #76 from matrix-org/speculator-speedup
Modify how speculator uses git repos
2015-09-30 15:53:25 +01:00
Kegan Dougal
b6f0b67da6 Speed up continuserv
Ignore .git directory as that shouldn't affect spec generation. Also, when
we receive writes from the OS, wait a bit before re-generating the spec to
clump together multiple writes rather than re-generating one after another
and waiting for no more writes before serving the request.
2015-09-30 15:21:32 +01:00
Kegan Dougal
ede43fbe9f Modify how speculator uses git repos
Modified so it has a "master" repo and local A/B repos which pull from the
"master". This saves an extra git clone operation per HTTP request.
2015-09-30 14:31:26 +01:00
Kegan Dougal
52f6496cf0 Merge branch 'master' into module-presence 2015-09-30 10:56:17 +01:00
Kegan Dougal
a49d5f67f1 Delete rather than comment out the offending CSS 2015-09-30 10:54:06 +01:00
Kegan Dougal
4e1e82f995 Fix paragraph CSS and adjust where paragraphs are in the RST
The CSS for `nature.css` was such that it was preventing `p` tags from
having sufficient vertical whitespace. This meant that you couldn't insert
any kind of spacing between lengthy sections (they just appeared as new lines).

This PR fixes this so you can actually have some whitespace between paragraphs.
As a result of this change, some parts of the spec appeared to have too much
whitespace. These were often sections which shouldn't have begun a new
paragraph anyway (e.g. a single sentence being an entire paragraph, `TODO`
blocks resulting in new paragraphs). This PR fixes the most offending areas
where we shouldn't have been inserting new paragraphs.
2015-09-30 10:43:02 +01:00
Kegan Dougal
0a04672d76 Start converting the presence module. Add Rationale admonition. 2015-09-29 17:57:44 +01:00
Daniel Wagner-Hall
083a76096f Support viewing the spec at head 2015-09-29 12:41:07 +01:00
Daniel Wagner-Hall
2434dfaf1c Merge branch 'master' into speculator-htmldiff 2015-09-25 16:13:23 +01:00
Kegan Dougal
6afdfc0771 Add more logging and make logging context clearer
This is now actually useful if you want to debug why your swagger YAML
isn't producing a table you think it should be.
2015-09-23 15:36:13 +01:00
Kegan Dougal
f1adad5fb3 Add more logging with file prefixes
This makes the handoff between gendoc and batesian clearer in the logs.
2015-09-23 15:10:55 +01:00
Kegan Dougal
064a2c9172 Use argparse and log functions for gendoc.py
gendoc.py has become more complex such that we actually want to pass things
to it like `--verbose`, `--nodelete`, `--target`, so use `argparse` to do this
like we have `build.py`. Pass through `-v` flags to `build.py`.
2015-09-23 14:59:57 +01:00
Kegan Dougal
1da64db302 Use relative depths for groups instead of absolute ones
This means the group can be agnostic to how deeply nested it is,
improving reusability of groups.
2015-09-23 14:29:37 +01:00
Kegan Dougal
16693a644a Various review fixes 2015-09-22 16:59:49 +01:00