diff --git a/.travis.yml b/.travis.yml index edb7f4b..aba1741 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_script: - wget https://s3.amazonaws.com/rebar3/rebar3 - chmod 755 rebar3 script: - - ./rebar3 eunit -v + - erl +t 10000000 -pa _build/default/lib/*/ebin -noshell -eval 'eunit:test({application, lodox}, [verbose]).' -s init stop notifications: email: - quasiquoting@gmail.com diff --git a/README.md b/README.md index e5811ea..44ae88f 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Finally, add Lodox to your `plugins` list: [% ... {lodox, ".*", {git, "git://github.com/quasiquoting/lodox.git", - {tag, "0.12.3"}}}]}. + {tag, "0.12.4"}}}]}. ``` The recommended place for the Lodox plugin entry is the global [rebar3](https://github.com/rebar/rebar3) config, `~/.config/rebar3/rebar.config`, @@ -60,7 +60,7 @@ rebar3 do compile, lfe lodox If all goes well, the output will look something like: - Generated lodox v0.12.3 docs in /path/to/lodox/doc + Generated lodox v0.12.4 docs in /path/to/lodox/doc And, as promised, [generated documentation](http://quasiquoting.org/lodox/) will be in the `doc` subdirectory of your project. diff --git a/doc b/doc index c4d5041..70e8d3b 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit c4d5041c8487ecbfc41469d1a935b04d24a27caa +Subproject commit 70e8d3be7337f5d77d60a9f6fe58baef433c8aea diff --git a/org/Lodox.org b/org/Lodox.org index 4f54dfc..f197d9f 100644 --- a/org/Lodox.org +++ b/org/Lodox.org @@ -134,7 +134,7 @@ branch = gh-pages :noweb: yes :padline: no :END: -*Describe =rebar.config= here.* +TODO: Describe =rebar.config= here. #+BEGIN_SRC erlang :tangle ../rebar.config <> @@ -1549,9 +1549,9 @@ parse_test_() -> , {"A simple function with a docstring is correctly parsed.", prop_defun_simple_doc(), 500} , {"A function with pattern clauses produces an empty docstring.", - prop_defun_match(), 30} + prop_defun_match(), 100} , {"A function with pattern clauses and a docstring is correctly parsed.", - prop_defun_match_doc(), 30} + prop_defun_match_doc(), 100} ], [{timeout, ?TIMEOUT, {Title, ?_assert(proper:quickcheck(Property, ?OPTIONS(NumTests)))}} @@ -1644,7 +1644,9 @@ pattern_form() -> match_fun()]) | non_empty(list())]. -match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +%% Don't waste atoms, since we're already running out. +%% match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +match_fun() -> 'match-record'. pattern_clause(Arity) -> [arglist_patterns(Arity) | @@ -1833,7 +1835,7 @@ before_script: - wget https://s3.amazonaws.com/rebar3/rebar3 - chmod 755 rebar3 script: - - ./rebar3 eunit -v + - erl +t 10000000 -pa _build/default/lib/*/ebin -noshell -eval 'eunit:test({application, lodox}, [verbose]).' -s init stop notifications: email: - quasiquoting@gmail.com diff --git a/org/README.md b/org/README.md index d055775..ae6299f 100644 --- a/org/README.md +++ b/org/README.md @@ -110,7 +110,7 @@ branch = gh-pages ```erlang {application, 'lodox', [{description, "The LFE rebar3 Lodox plugin"}, - {vsn, "0.12.3"}, + {vsn, "0.12.4"}, {modules, [lodox, 'lodox-html-writer', 'lodox-p', 'lodox-parse', 'lodox-util', 'unit-lodox-tests']}, @@ -124,7 +124,7 @@ branch = gh-pages # Rebar3 Configuration -**Describe `rebar.config` here.** +TODO: Describe `rebar.config` here. ```erlang {erl_opts, [debug_info, {src_dirs, ["test"]}]}. @@ -341,8 +341,10 @@ If `name` is a binary, convert it to an atom first." ([name rebar-opts] (when (is_binary name)) (get-lodox-opts (binary_to_atom name 'latin1) rebar-opts)) ([app rebar-opts] (when (is_atom app)) - (let* ((lodox-config (dict:fetch 'lodox rebar-opts)) - (lodox-apps (proplists:get_value 'apps lodox-config))) + (let* ((lodox-config (if (dict:is_key 'lodox rebar-opts) + (dict:fetch 'lodox rebar-opts) + [])) + (lodox-apps (proplists:get_value 'apps lodox-config []))) (maps:from_list (proplists:get_value app lodox-apps []))))) ``` @@ -832,7 +834,7 @@ Use [pandoc] if available, otherwise [erlmarkdown]. ```commonlisp '#m(name #\"lodox\" - version \"0.12.3\" + version \"0.12.4\" description \"The LFE rebar3 Lodox plugin\" documents () modules {{list of maps of module metadata}} @@ -1423,9 +1425,9 @@ parse_test_() -> , {"A simple function with a docstring is correctly parsed.", prop_defun_simple_doc(), 500} , {"A function with pattern clauses produces an empty docstring.", - prop_defun_match(), 30} + prop_defun_match(), 100} , {"A function with pattern clauses and a docstring is correctly parsed.", - prop_defun_match_doc(), 30} + prop_defun_match_doc(), 100} ], [{timeout, ?TIMEOUT, {Title, ?_assert(proper:quickcheck(Property, ?OPTIONS(NumTests)))}} @@ -1518,7 +1520,9 @@ pattern_form() -> match_fun()]) | non_empty(list())]. -match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +%% Don't waste atoms, since we're already running out. +%% match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +match_fun() -> 'match-record'. pattern_clause(Arity) -> [arglist_patterns(Arity) | @@ -1677,7 +1681,7 @@ before_script: - wget https://s3.amazonaws.com/rebar3/rebar3 - chmod 755 rebar3 script: - - ./rebar3 eunit -v + - erl +t 10000000 -pa _build/default/lib/*/ebin -noshell -eval 'eunit:test({application, lodox}, [verbose]).' -s init stop notifications: email: - quasiquoting@gmail.com diff --git a/org/VERSION b/org/VERSION index d61567c..7fd0b1e 100644 --- a/org/VERSION +++ b/org/VERSION @@ -1 +1 @@ -0.12.3 \ No newline at end of file +0.12.4 \ No newline at end of file diff --git a/src/lodox-parse.lfe b/src/lodox-parse.lfe index a0b9942..414f2d0 100644 --- a/src/lodox-parse.lfe +++ b/src/lodox-parse.lfe @@ -33,7 +33,7 @@ ```commonlisp '#m(name #\"lodox\" - version \"0.12.3\" + version \"0.12.4\" description \"The LFE rebar3 Lodox plugin\" documents () modules {{list of maps of module metadata}} diff --git a/src/lodox.app.src b/src/lodox.app.src index ccd586a..6396863 100644 --- a/src/lodox.app.src +++ b/src/lodox.app.src @@ -5,7 +5,7 @@ {application, 'lodox', [{description, "The LFE rebar3 Lodox plugin"}, - {vsn, "0.12.3"}, + {vsn, "0.12.4"}, {modules, [lodox, 'lodox-html-writer', 'lodox-p', 'lodox-parse', 'lodox-util', 'unit-lodox-tests']}, diff --git a/test/lodox_parse_tests.erl b/test/lodox_parse_tests.erl index 7c13be9..af59202 100644 --- a/test/lodox_parse_tests.erl +++ b/test/lodox_parse_tests.erl @@ -27,9 +27,9 @@ parse_test_() -> , {"A simple function with a docstring is correctly parsed.", prop_defun_simple_doc(), 500} , {"A function with pattern clauses produces an empty docstring.", - prop_defun_match(), 30} + prop_defun_match(), 100} , {"A function with pattern clauses and a docstring is correctly parsed.", - prop_defun_match_doc(), 30} + prop_defun_match_doc(), 100} ], [{timeout, ?TIMEOUT, {Title, ?_assert(proper:quickcheck(Property, ?OPTIONS(NumTests)))}} @@ -122,7 +122,9 @@ pattern_form() -> match_fun()]) | non_empty(list())]. -match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +%% Don't waste atoms, since we're already running out. +%% match_fun() -> ?LET(F, printable_string(), list_to_atom("match-" ++ F)). +match_fun() -> 'match-record'. pattern_clause(Arity) -> [arglist_patterns(Arity) |