Skip to content

Commit

Permalink
Merge pull request #372 from inaka/elbrujohalcon.372.version_bump_to_…
Browse files Browse the repository at this point in the history
…0_2_11

Version Bump to 0.2.11
  • Loading branch information
harenson committed Apr 7, 2016
2 parents 6259a5d + 62f4e4a commit 8af7b64
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 31 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_build/
.erlang.mk/
elvis_shell.d
.eunit
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## [0.2.11](https://github.com/inaka/elvis/tree/0.2.11) (2016-04-07)
[Full Changelog](https://github.com/inaka/elvis/compare/0.2.10...0.2.11)

**Closed issues:**

- Update katana\_code to 0.0.3 in elvis\_core [\#371](https://github.com/inaka/elvis/issues/371)

## [0.2.10](https://github.com/inaka/elvis/tree/0.2.10) (2016-03-30)
[Full Changelog](https://github.com/inaka/elvis/compare/0.2.8...0.2.10)

Expand All @@ -23,6 +30,8 @@

**Merged pull requests:**

- Fix katana\_code version [\#370](https://github.com/inaka/elvis/pull/370) ([elbrujohalcon](https://github.com/elbrujohalcon))
- Version Bump to 0.2.10 [\#369](https://github.com/inaka/elvis/pull/369) ([elbrujohalcon](https://github.com/elbrujohalcon))
- \[Fix \#359\] Update dependencies; Update erlang.mk; Add meta testing [\#366](https://github.com/inaka/elvis/pull/366) ([harenson](https://github.com/harenson))
- \[Fix \#354\] Update katana [\#355](https://github.com/inaka/elvis/pull/355) ([harenson](https://github.com/harenson))

Expand Down
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
PROJECT = elvis_shell

DEPS = lager elvis_core getopt jiffy ibrowse egithub katana katana_code
DEPS = elvis_core getopt jiffy egithub katana katana_code
SHELL_DEPS = sync
TEST_DEPS = katana_test mixer meck xref_runner
BUILD_DEPS = inaka_mk hexer_mk
DEP_PLUGINS = inaka_mk hexer_mk

dep_lager = hex 3.0.2
dep_elvis_core = git https://github.com/inaka/elvis_core 0.2.10
dep_elvis_core = git https://github.com/inaka/elvis_core 0.2.11
dep_getopt = hex 0.8.2
dep_jiffy = hex 0.14.7
dep_ibrowse = hex 4.2.2
dep_egithub = hex 0.2.2
dep_katana = git https://github.com/inaka/erlang-katana 0.2.23
dep_katana_test = git https://github.com/inaka/katana-test 0.0.5
dep_katana_code = git https://github.com/inaka/katana-code 0.0.2
dep_katana_code = git https://github.com/inaka/katana-code 0.0.3
dep_sync = git https://github.com/rustyio/sync 11df81d
dep_meck = git https://github.com/eproxus/meck 0.8.4
dep_xref_runner = git https://github.com/inaka/xref_runner 0.2.6
Expand All @@ -24,24 +22,22 @@ dep_hexer_mk = git https://github.com/inaka/hexer.mk 1.1.0

include erlang.mk

ERLC_OPTS += +'{parse_transform, lager_transform}'
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

# Commont Test Config

TEST_ERLC_OPTS += +'{parse_transform, lager_transform}'
CT_OPTS = -cover test/elvis.coverspec -erl_args -config config/test.config
SHELL_OPTS = -name elvis@`hostname` -s sync -s elvis -s lager -config config/elvis.config
SHELL_OPTS = -name elvis@`hostname` -s sync -s elvis -config config/elvis.config
ESCRIPT_NAME = elvis

# Builds the elvis escript.
escript::
./elvis help

test-shell: build-ct-suites app
erl -pa ebin -pa deps/*/ebin -name elvis-test@`hostname` -pa test -s sync -s elvis -s lager -config config/test.config
erl -pa ebin -pa deps/*/ebin -name elvis-test@`hostname` -pa test -s sync -s elvis -config config/test.config

install: escript
cp elvis /usr/local/bin
23 changes: 11 additions & 12 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{erl_opts,
[
{parse_transform, lager_transform},
{src_dirs, ["src"]},
warn_unused_vars,
warn_export_all,
Expand All @@ -21,17 +20,17 @@
{deps_dir, "deps"}.
{deps,
[
{lager, ".*", {git, "https://github.com/basho/lager.git", "3.0.2"}},
{elvis_core, ".*", {git, "https://github.com/inaka/elvis_core", "0.2.7"}},
{getopt, "0.*", {git, "https://github.com/jcomellas/getopt.git", "v0.8.2"}},
{meck, "0.*", {git, "https://github.com/eproxus/meck.git", "0.8.2"}},
{jiffy, "0.*", {git, "https://github.com/davisp/jiffy.git", "0.14.3"}},
{ibrowse, "4.*", {git, "https://github.com/cmullaparthi/ibrowse.git", "v4.1.2"}},
{aleppo, "0.*", {git, "https://github.com/inaka/aleppo.git", "0.9.0"}},
{zipper, ".*", {git, "https://github.com/inaka/zipper.git", "0.1.2"}},
{egithub, ".*", {git, "https://github.com/inaka/erlang-github.git", "0.1.1"}},
{katana, ".*", {git, "https://github.com/inaka/erlang-katana.git", "0.2.13"}}
{lager, ".*", {git, "https://github.com/basho/lager.git", "3.0.2"}},
{elvis_core, ".*", {git, "https://github.com/inaka/elvis_core", "0.2.11"}},
{getopt, "0.*", {git, "https://github.com/jcomellas/getopt.git", "v0.8.2"}},
{meck, "0.*", {git, "https://github.com/eproxus/meck.git", "0.8.4"}},
{jiffy, "0.*", {git, "https://github.com/davisp/jiffy.git", "0.14.3"}},
{ibrowse, "4.*", {git, "https://github.com/cmullaparthi/ibrowse.git", "v4.1.2"}},
{aleppo, "0.*", {git, "https://github.com/inaka/aleppo.git", "0.9.10"}},
{egithub, ".*", {git, "https://github.com/inaka/erlang-github.git", "0.2.2"}},
{katana, ".*", {git, "https://github.com/inaka/erlang-katana.git", "0.2.23"}},
{katana_code, ".*", {git, "https://github.com/inaka/katana-code.git", "0.0.3"}}
]
}.
{escript_name, "elvis"}.
{escript_incl_apps, [getopt, jiffy, ibrowse, aleppo, zipper, katana]}.
{escript_incl_apps, [getopt, jiffy, aleppo, zipper, katana, katana_code]}.
20 changes: 14 additions & 6 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[{<<"aleppo">>,
{git,"https://github.com/inaka/aleppo.git",
{ref,"95e7bc6a2ff0de0cde4d0af353ae86d7dea03095"}},
{ref,"17701f4dbb857e90e8852618aa5e02f1ff7c5bd2"}},
0},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},2},
{<<"egithub">>,
{git,"https://github.com/inaka/erlang-github.git",
{ref,"2b8e5296f3be4871abdb979b0c80ea08744e5de3"}},
{ref,"285e32f111635d63ba8c287b7775f76fe765c054"}},
0},
{<<"elvis_core">>,
{git,"https://github.com/inaka/elvis_core",
{ref,"9505ea379570e34d9429f1c35c7d4de52e64a1be"}},
{ref,"fbc8385b4088fe870cac23dac9d2c45fe9f35ec7"}},
0},
{<<"getopt">>,
{git,"https://github.com/jcomellas/getopt.git",
Expand All @@ -18,6 +19,7 @@
{git,"git://github.com/DeadZen/goldrush.git",
{ref,"64864ba7fcf40988361340e48680b49a2c2938cf"}},
1},
{<<"gun">>,{pkg,<<"gun">>,<<"1.0.0-pre.1">>},2},
{<<"ibrowse">>,
{git,"https://github.com/cmullaparthi/ibrowse.git",
{ref,"ea3305d21f37eced4fac290f64b068e56df7de80"}},
Expand All @@ -28,17 +30,23 @@
0},
{<<"katana">>,
{git,"https://github.com/inaka/erlang-katana.git",
{ref,"4ed813673c96c0926bcb002516087c018b8f428c"}},
{ref,"a8aa98337dd365949924d603cdb3f4c0959944b1"}},
0},
{<<"katana_code">>,
{git,"https://github.com/inaka/katana-code.git",
{ref,"58f0a9ef7dbcaa6233bd72c71fb3e31d53ff92e6"}},
0},
{<<"lager">>,
{git,"https://github.com/basho/lager.git",
{ref,"599dda6786a81200e00b3d9b4b36951e052727a3"}},
0},
{<<"meck">>,
{git,"https://github.com/eproxus/meck.git",
{ref,"dde759050eff19a1a80fd854d7375174b191665d"}},
{ref,"70d6a33ce7407029dc59e22a5b3c1c61c1348b23"}},
0},
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.1.0">>},3},
{<<"shotgun">>,{pkg,<<"shotgun">>,<<"0.2.3">>},1},
{<<"zipper">>,
{git,"https://github.com/inaka/zipper.git",
{ref,"7b155ca851b3167b3e0031e52129901663e86a83"}},
0}].
1}].
4 changes: 2 additions & 2 deletions src/elvis_shell.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
application, elvis_shell,
[
{description, "CLI for the Elvis Erlang Style Reviewer"},
{vsn, "0.2.10"},
{applications, [kernel, elvis, stdlib, ibrowse, ssl, jiffy, lager, zipper]},
{vsn, "0.2.11"},
{applications, [kernel, stdlib, ssl, elvis, egithub, jiffy, katana, katana_code]},
{modules,
[
elvis,
Expand Down
5 changes: 3 additions & 2 deletions src/elvis_webhook.erl
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ messages_from_item(Item, File) ->
];
not_found ->
Args = [Line],
ok = lager:info("Line ~p does not belong to file's diff.",
Args),
ok =
error_logger:info_msg(
"Line ~p does not belong to file's diff.", Args),
[]
end
end.

0 comments on commit 8af7b64

Please sign in to comment.