Skip to content

Commit

Permalink
Merge pull request #45 from inaka/elbrujohalcon.45.hex_package
Browse files Browse the repository at this point in the history
Hex Package
  • Loading branch information
cabol committed Jan 6, 2016
2 parents ae1e6b1 + f2e01b3 commit ee37d6b
Show file tree
Hide file tree
Showing 10 changed files with 291 additions and 267 deletions.
1 change: 1 addition & 0 deletions .awconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
---
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

**Closed issues:**

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

**Merged pull requests:**

- \[Fix \#49\] Bump version to 0.1.0 [\#51](https://github.com/inaka/cowboy-trails/pull/51) ([harenson](https://github.com/harenson))
- \[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))
- \[Fix \#46\] Add meta testing [\#48](https://github.com/inaka/cowboy-trails/pull/48) ([harenson](https://github.com/harenson))
- 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))
Expand Down
38 changes: 11 additions & 27 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,45 +1,29 @@
PROJECT = trails

DEPS = cowboy ranch
TEST_DEPS = xref_runner katana mixer elvis meck
TEST_DEPS = katana mixer meck
SHELL_DEPS = sync
BUILD_DEPS = inaka_mk hexer_mk

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

include erlang.mk

CT_OPTS = -cover test/trails.coverspec -erl_args
DEP_PLUGINS = inaka_mk hexer_mk

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

ERLC_OPTS += +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_import +warn_unused_function
ERLC_OPTS := +warn_unused_vars +warn_export_all +warn_shadow_vars +warn_unused_import +warn_unused_function
ERLC_OPTS += +warn_bif_clash +warn_unused_record +warn_deprecated_function +warn_obsolete_guard +strict_validation
ERLC_OPTS += +warn_export_vars +warn_exported_vars +warn_missing_spec +warn_untyped_record +debug_info

TEST_ERLC_OPTS += +debug_info

SHELL_OPTS = -s sync

quicktests: app
@$(MAKE) --no-print-directory app-build test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
$(verbose) mkdir -p $(CURDIR)/logs/
$(gen_verbose) $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS)

test-build-plt: ERLC_OPTS=$(TEST_ERLC_OPTS)
test-build-plt:
@$(MAKE) --no-print-directory test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)"
$(gen_verbose) touch ebin/test

plt-all: PLT_APPS := $(TEST_DEPS)
plt-all: test-deps test-build-plt plt

dialyze-all: app test-build-plt dialyze
CT_OPTS = -cover test/cover.spec
18 changes: 12 additions & 6 deletions elvis.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{elvis_style, nesting_level, #{level => 3}},
{elvis_style, god_modules, #{limit => 25}},
{elvis_style, no_if_expression},
{elvis_style, invalid_dynamic_call, #{ignore => [elvis]}},
{elvis_style, invalid_dynamic_call},
{elvis_style, used_ignored_variable},
{elvis_style, no_behavior_info},
{
Expand All @@ -26,20 +26,26 @@
#{regex => "^([a-z][a-z0-9]*_?)*(_SUITE)?$",
ignore => []}
},
{
elvis_style,
function_naming_convention,
#{regex => "^([a-z][a-z0-9]*_?)*$"}
},
{elvis_style, state_record_and_type},
{elvis_style, no_spec_with_records},
{elvis_style, dont_repeat_yourself, #{min_complexity => 10}}
{elvis_style, dont_repeat_yourself, #{min_complexity => 10}},
{elvis_style, no_debug_call}
]
},
#{dirs => ["."],
filter => "Makefile",
rules => [{elvis_project, no_deps_master_erlang_mk, #{ignore => []}},
{elvis_project, git_for_deps_erlang_mk, #{regex => "^https://.*"}}]
rules => [{elvis_project, no_deps_master_erlang_mk},
{elvis_project, protocol_for_deps_erlang_mk, #{regex => "(https://.*|[0-9]+([.][0-9]+)*)"}}]
},
#{dirs => ["."],
filter => "rebar.config",
rules => [{elvis_project, no_deps_master_rebar, #{ignore => []}},
{elvis_project, git_for_deps_rebar, #{regex => "^https://.*"}}]
rules => [{elvis_project, no_deps_master_rebar},
{elvis_project, protocol_for_deps_rebar}]
},
#{dirs => ["."],
filter => "elvis.config",
Expand Down
Loading

0 comments on commit ee37d6b

Please sign in to comment.