Skip to content

Commit

Permalink
Updated docs
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanjos committed May 10, 2015
1 parent 7353ffc commit 9c2946d
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 26 deletions.
36 changes: 24 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,28 @@ or looks for the following environment variables
Usage for CLI Client:

```
usage: marvel <command> [options]
commands:
characters Gets character data
options:
-s --search [searchText] searches for characters that begin with the searchText
-i --id [id] the id of the character
-co --comics the comics for the character
-ev --events the events for the character
-se --series the series for the character
-st --stories the stories for the character
usage: marvel <command> [options]
commands:
characters Gets character data.
comics Gets comic data.
creators Gets creator data.
events Gets event data.
series Gets series data.
stories Gets story data.
"entity" in the options below correspond to the commands above.
You cannot the option if it has the same name as the command
invalid ex: marvel characters --characters
options:
-s --search [searchText] searches for entities that begin with the searchText
-i --id [id] the id of the entity
-co --comics the comics for the entity
-ev --events the events for the entity
-se --series the series for the entity (does not work for comics)
-st --stories the stories for the entity
-ch --characters the characters for the entity (does not work for creators)
-ch --creators the creators for the entity (does not work for characters)
```
41 changes: 27 additions & 14 deletions lib/marvel.ex
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,42 @@ defmodule Marvel do
* `public_key` - Your Marvel Public Key
* `private_key` - Your Marvel Private Key
<br/>
or looks for the following environment variables
<br/>
* `MARVEL_PUBLIC_KEY` - Your Marvel Public Key
* `MARVEL_PRIVATE_KEY` - Your Marvel Private Key
<br/>
Usage for CLI Client:
```
usage: marvel <command> [options]
commands:
characters Gets character data
options:
-s --search [searchText] searches for characters that begin with the searchText
-i --id [id] the id of the character
-co --comics the comics for the character
-ev --events the events for the character
-se --series the series for the character
-st --stories the stories for the character
usage: marvel <command> [options]
commands:
characters Gets character data.
comics Gets comic data.
creators Gets creator data.
events Gets event data.
series Gets series data.
stories Gets story data.
"entity" in the options below correspond to the commands above.
You cannot the option if it has the same name as the command
invalid ex: marvel characters --characters
options:
-s --search [searchText] searches for entities that begin with the searchText
-i --id [id] the id of the entity
-co --comics the comics for the entity
-ev --events the events for the entity
-se --series the series for the entity (does not work for comics)
-st --stories the stories for the entity
-ch --characters the characters for the entity (does not work for creators)
-ch --creators the creators for the entity (does not work for characters)
```
"""
end
1 change: 1 addition & 0 deletions lib/marvel/api/base.ex
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
defmodule Marvel.API.Base do
@moduledoc false

defmacro __using__(opts) do
quote do
Expand Down

0 comments on commit 9c2946d

Please sign in to comment.