Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version Bump to 0.2.11 #372

Merged
merged 4 commits into from
Apr 7, 2016
Merged

Version Bump to 0.2.11 #372

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ec9a08
Remove and sort deps.
Apr 7, 2016
0e95329
Remove ibrwose dep, which was not needed
Apr 7, 2016
ddf6494
Version Bump to 0.2.11
Apr 7, 2016
62f4e4a
Patch rebar.config to compile with rebar3
Apr 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
5 changes: 1 addition & 4 deletions rebar.config
View file
Open in desktop
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,15 @@
{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"}},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You updated elvis_core in the Makefile, so please update it here. Also add katana_code here, please.

{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"}},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove zipper, it is not an elvis dependency.

{egithub, ".*", {git, "https://github.com/inaka/erlang-github.git", "0.1.1"}},
{katana, ".*", {git, "https://github.com/inaka/erlang-katana.git", "0.2.13"}}
]
}.
{escript_name, "elvis"}.
{escript_incl_apps, [getopt, jiffy, ibrowse, aleppo, zipper, katana]}.
{escript_incl_apps, [getopt, jiffy, aleppo, zipper, katana, katana_code]}.
44 changes: 0 additions & 44 deletions rebar.lock
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/elvis_shell.app.src
View file
Open in desktop
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
View file
Open in desktop
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.