Skip to content

Commit ee37d6b

Browse files
committed
Merge pull request #45 from inaka/elbrujohalcon.45.hex_package
Hex Package
2 parents ae1e6b1 + f2e01b3 commit ee37d6b

File tree

10 files changed

+291
-267
lines changed

10 files changed

+291
-267
lines changed

.awconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
---

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99

1010
**Closed issues:**
1111

12+
- Bump version to 0.1.0 [\#49](https://github.com/inaka/cowboy-trails/issues/49)
1213
- Add Meta Testing [\#46](https://github.com/inaka/cowboy-trails/issues/46)
1314
- Allow the user to set a global api-root path [\#42](https://github.com/inaka/cowboy-trails/issues/42)
1415
- Improve Example [\#27](https://github.com/inaka/cowboy-trails/issues/27)
1516
- Allow more than one server running on the same node [\#19](https://github.com/inaka/cowboy-trails/issues/19)
1617

1718
**Merged pull requests:**
1819

20+
- \[Fix \#49\] Bump version to 0.1.0 [\#51](https://github.com/inaka/cowboy-trails/pull/51) ([harenson](https://github.com/harenson))
1921
- \[Fix \#19\] Allow more than one server running on the same node [\#50](https://github.com/inaka/cowboy-trails/pull/50) ([harenson](https://github.com/harenson))
2022
- \[Fix \#46\] Add meta testing [\#48](https://github.com/inaka/cowboy-trails/pull/48) ([harenson](https://github.com/harenson))
2123
- Allow the user to set and get global api-root path [\#47](https://github.com/inaka/cowboy-trails/pull/47) ([harenson](https://github.com/harenson))

Makefile

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,29 @@
11
PROJECT = trails
22

33
DEPS = cowboy ranch
4-
TEST_DEPS = xref_runner katana mixer elvis meck
4+
TEST_DEPS = katana mixer meck
55
SHELL_DEPS = sync
6+
BUILD_DEPS = inaka_mk hexer_mk
67

78
dep_cowboy = git https://github.com/ninenines/cowboy.git 1.0.4
89
dep_ranch = git https://github.com/ninenines/ranch.git 1.2.0
9-
dep_sync = git https://github.com/rustyio/sync.git 9c78e7b
10-
dep_xref_runner = git https://github.com/inaka/xref_runner.git 0.2.2
10+
dep_sync = git https://github.com/rustyio/sync.git 9c78e7b
1111
dep_mixer = git https://github.com/inaka/mixer.git 0.1.4
12-
dep_elvis = git https://github.com/inaka/elvis.git b69eea4
13-
dep_katana = git https://github.com/inaka/erlang-katana.git 07efe94
14-
dep_meck = git https://github.com/eproxus/meck 0.8.3
12+
dep_katana = hex 0.2.18
13+
dep_meck = hex 0.8.4
14+
dep_inaka_mk = git https://github.com/inaka/inaka.mk.git 1.0.0
15+
dep_hexer_mk = git https://github.com/inaka/hexer.mk.git 1.0.0
1516

16-
include erlang.mk
17-
18-
CT_OPTS = -cover test/trails.coverspec -erl_args
17+
DEP_PLUGINS = inaka_mk hexer_mk
1918

20-
LOCAL_DEPS := xmerl tools compiler syntax_tools common_test inets crypto ssl public_key test_server dialyzer wx
21-
DIALYZER_DIRS := ebin/ test/
22-
DIALYZER_OPTS := --verbose --statistics -Wunmatched_returns
19+
include erlang.mk
2320

24-
ERLC_OPTS += +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_import +warn_unused_function
21+
ERLC_OPTS := +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_import +warn_unused_function
2522
ERLC_OPTS += +warn_bif_clash +warn_unused_record +warn_deprecated_function +warn_obsolete_guard +strict_validation
2623
ERLC_OPTS += +warn_export_vars +warn_exported_vars +warn_missing_spec +warn_untyped_record +debug_info
2724

2825
TEST_ERLC_OPTS += +debug_info
2926

3027
SHELL_OPTS = -s sync
3128

32-
quicktests: app
33-
@$(MAKE) --no-print-directory app-build test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
34-
$(verbose) mkdir -p $(CURDIR)/logs/
35-
$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)
36-
37-
test-build-plt: ERLC_OPTS=$(TEST_ERLC_OPTS)
38-
test-build-plt:
39-
@$(MAKE) --no-print-directory test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
40-
$(gen_verbose) touch ebin/test
41-
42-
plt-all: PLT_APPS := $(TEST_DEPS)
43-
plt-all: test-deps test-build-plt plt
44-
45-
dialyze-all: app test-build-plt dialyze
29+
CT_OPTS = -cover test/cover.spec

elvis.config

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{elvis_style, nesting_level, #{level => 3}},
1818
{elvis_style, god_modules, #{limit => 25}},
1919
{elvis_style, no_if_expression},
20-
{elvis_style, invalid_dynamic_call, #{ignore => [elvis]}},
20+
{elvis_style, invalid_dynamic_call},
2121
{elvis_style, used_ignored_variable},
2222
{elvis_style, no_behavior_info},
2323
{
@@ -26,20 +26,26 @@
2626
#{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$",
2727
ignore => []}
2828
},
29+
{
30+
elvis_style,
31+
function_naming_convention,
32+
#{regex => "^([a-z][a-z0-9]*_?)*$"}
33+
},
2934
{elvis_style, state_record_and_type},
3035
{elvis_style, no_spec_with_records},
31-
{elvis_style, dont_repeat_yourself, #{min_complexity => 10}}
36+
{elvis_style, dont_repeat_yourself, #{min_complexity => 10}},
37+
{elvis_style, no_debug_call}
3238
]
3339
},
3440
#{dirs => ["."],
3541
filter => "Makefile",
36-
rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}},
37-
{elvis_project, git_for_deps_erlang_mk, #{regex => "^https://.*"}}]
42+
rules => [{elvis_project, no_deps_master_erlang_mk},
43+
{elvis_project, protocol_for_deps_erlang_mk, #{regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
3844
},
3945
#{dirs => ["."],
4046
filter => "rebar.config",
41-
rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}},
42-
{elvis_project, git_for_deps_rebar, #{regex => "^https://.*"}}]
47+
rules => [{elvis_project, no_deps_master_rebar},
48+
{elvis_project, protocol_for_deps_rebar}]
4349
},
4450
#{dirs => ["."],
4551
filter => "elvis.config",

0 commit comments

Comments
 (0)