Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config file #310

Merged
merged 27 commits into from
Nov 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e9f9a02
Generic config structure to handle both cmd line and config file
pcantrell Sep 26, 2015
318e980
Moved defaults from initializer to config_attr
pcantrell Sep 26, 2015
48854b8
Custom config file
pcantrell Sep 27, 2015
dc1d313
Tidying
pcantrell Sep 27, 2015
20294db
Intelligent resolving of relative config paths
pcantrell Sep 27, 2015
8c0d2e5
Help for config files
pcantrell Sep 27, 2015
16ac375
Help for individual options
pcantrell Sep 27, 2015
4fe1f97
Cleanup & unified options help
pcantrell Sep 27, 2015
0fc61bc
-t spec consistent with other options
pcantrell Sep 27, 2015
2e08238
Tidying
pcantrell Sep 27, 2015
372efb1
Tidied code artifacts in option help output
pcantrell Sep 27, 2015
f6548cc
custom_categories help
pcantrell Sep 28, 2015
ca57199
Fixed custom_categories default
pcantrell Sep 28, 2015
beedba6
Better category help formatting
pcantrell Sep 28, 2015
ff45d9b
Fixed copy & paste mistake
pcantrell Sep 28, 2015
a68f5fb
Fixed podspec handling
pcantrell Sep 28, 2015
9b923eb
Distinguish non-nil from unconfigured in podspec-based config
pcantrell Sep 28, 2015
3af5636
Show output path relative to working dir when appropriate
pcantrell Oct 5, 2015
0a06ac8
MAN, Rubocop is irritating
pcantrell Oct 5, 2015
7fa3c31
Mentioned config file & options help in README
pcantrell Oct 30, 2015
8d8aec2
Added changelog note for config file
pcantrell Oct 30, 2015
3668b29
Adjusted rubocop rules to taste
pcantrell Oct 30, 2015
5acda29
Merge
pcantrell Oct 30, 2015
3e68433
Clarified config file message on console
pcantrell Oct 30, 2015
135e0ea
misc_jazzy_features now exercises config file & custom categories
pcantrell Oct 30, 2015
49cc8a2
Merge
pcantrell Nov 3, 2015
6236685
Bumped integration specs after merge
pcantrell Nov 3, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,23 @@ TrailingComma:
Style/SpecialGlobalVars:
Enabled: false

# For lambdas nested within certain expressions, this rule forces either ugly
# parens or curly braces that violate the "do/end for multiline blocks" rule.
Lambda:
Enabled: false

# Disallowing indented "when" clauses destroys readability when using the
# single-line "when/then" style.
CaseIndentation:
Enabled: false

# These are both subjective judgements that depend on the situation, and are
# not appropriate as absolute rules.
GuardClause:
Enabled: false
Next:
Enabled: false

#- Jazzy specs -----------------------------------------------------------#

# Allow for `should.match /regexp/`.
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
automatically hyperlinked to their reference.
[JP Simard](https://github.com/jpsim)

* Jazzy can now read options from a configuration file. The command line
provides comprehensive help for available options via `jazzy -h config`.
[pcantrell](https://github.com/pcantrell)
[310](https://github.com/realm/jazzy/pull/310)

* Render special list items (e.g. Throws, See, etc.). See
http://ericasadun.com/2015/06/14/swift-header-documentation-in-xcode-7/ for
a complete list.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ To install jazzy, run `[sudo] gem install jazzy` from your command line.
Run `jazzy` from your command line. Run `jazzy -h` for a list of additional
options.

You can set options for your project’s documentation in a configuration file, `.jazzy.yaml` by default. For a detailed explanation and an exhaustive list of all available options, run `jazzy --help config`.

### Troubleshooting

#### Only extensions are listed in the documentation.
Expand Down
Loading