Integrate emilio #1944

iilyak · 2019-02-26T18:41:40Z

Overview

Add emilio erlang linter to ensure unified style.

Testing recommendations

do a fresh clone and run ./configure (make sure bin/emilio script is created)
run ./configure again and make sure it doesn't try to install emilio again
Update any erlang files in any dependency (except files mentioned in ignore section of emilio.config)
Run make emilio and make sure that:
- produced warnings are only for (± 3) updated lines
- make fails with non 0 exit code
Run bin/emilio -c emilio.config src | bin/warnings_in_scope -s 0 to see warnings from emilio
- make sure produced warnings are only for updated lines
Run bin/emilio -c emilio.config src and make sure dependencies mentioned in ignore section of emilio.config are ignored
test it on windows if you have access to it (I don't have access to windows :-()

Related Issues or Pull Requests

Checklist

Code is written and works correctly;
Changes are covered by tests;
Documentation reflects the changes;

configure

wohali · 2019-02-26T18:52:13Z

Interesting, will look at this in more detail later

iilyak · 2020-01-17T17:18:57Z

@wohali I know you are busy with 3.0. Should I rebase against latest master or wait couple months (the release process is exhausting I am sure)?

wohali · 2020-01-17T17:20:50Z

Hey @iilyak , it was @davisp who was initially against this. If you can get his +1, I'd love to see it in 3.0, go ahead and rebase.

wohali

Needs a bit more Windows love.

Makefile.win

.gitignore

wohali · 2020-01-17T17:23:43Z

configure

@@ -217,12 +217,25 @@ install_local_rebar() {
 fi
 }

+install_local_emilio() {


You need to add all of this to configure.ps1 too. Are you up to the challenge? 🥊

This is a challenge indeed.

Here's the diff, feel free to add to this PR:

diff --git a/configure.ps1 b/configure.ps1 index c74fbcf41..21c079f67 100644 --- a/configure.ps1 +++ b/configure.ps1 @@ -205,6 +205,20 @@ if ((Get-Command "rebar.cmd" -ErrorAction SilentlyContinue) -eq $null) $env:Path += ";$rootdir\bin" } +# check for emilio; if not found, get it and build it +if ((Get-Command "emilio.cmd" -ErrorAction SilentlyContinue) -eq $null) +{ + Write-Verbose "==> emilio.cmd not found; bootstrapping..." + if (-Not (Test-Path "src\emilio")) + { + git clone --depth 1 https://github.com/wohali/emilio $rootdir\src\emilio + } + cmd /c "cd $rootdir\src\emilio && rebar compile escriptize" + cp $rootdir\src\emilio\emilio $rootdir\bin\emilio + cp $rootdir\src\emilio\bin\emilio.cmd $rootdir\bin\emilio.cmd + cmd /c "cd $rootdir\src\emilio && rebar clean" +} + # only update dependencies, when we are not in a release tarball if ( (Test-Path .git -PathType Container) -and (-not $SkipDeps) ) { Write-Verbose "==> updating dependencies"

Note this depends on cloudant-labs/emilio#3 being merged.

Thank you very much.

garrensmith · 2020-04-02T13:03:07Z

I'm digging this up again. Could we look at adding this into the CI flow without adding support for windows? Its going to be hard to do that.

wohali · 2020-04-02T15:15:46Z

@garrensmith If you or @iilyak can freshen this PR to not have a conflict on Makefile, I'll have a look at configure.ps1.

wohali · 2020-04-02T16:25:34Z

Also, if you can move the source branch into the apache/couchdb repo, I can PR against it with the Windows changes. Otherwise, I'll just post a diff here that you can apply yourself.

garrensmith · 2020-04-02T16:38:10Z

Awesome thanks that will be great

…

________________________________ From: Joan Touzet <[email protected]> Sent: Thursday, April 2, 2020 6:25:51 PM To: apache/couchdb <[email protected]> Cc: garren smith <[email protected]>; Mention <[email protected]> Subject: Re: [apache/couchdb] Integrate emilio (#1944) Also, if you can move the source branch into the apache/couchdb repo, I can PR against it with the Windows changes. Otherwise, I'll just post a diff here that you can apply yourself. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#1944 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AABL2AWI62VREKF2UT6BBPLRKS4A7ANCNFSM4G2LMMSA>.

wohali · 2020-04-02T17:02:32Z

configure

+ cwd=`pwd`
+ cd ${rootdir}/src/emilio && ${REBAR} compile escriptize; cd ${cwd}
+ mv ${rootdir}/src/emilio/emilio ${rootdir}/bin/emilio
+ chmod +x ${rootdir}/bin/emilio


Should also do a cd ${rootdir}/src/emilio && ${REBAR} clean at this point, like we do on L216 for rebar.

wohali

Pre-approved, once requested changes / linked PR are applied.

FYI: As emilio is an optional testing component, and we don't ship the code, it does not need to live in an Apache repo.

wohali · 2020-04-02T17:14:43Z

configure

@@ -217,12 +217,25 @@ install_local_rebar() {
 fi
 }

+install_local_emilio() {


Here's the diff, feel free to add to this PR:

diff --git a/configure.ps1 b/configure.ps1 index c74fbcf41..21c079f67 100644 --- a/configure.ps1 +++ b/configure.ps1 @@ -205,6 +205,20 @@ if ((Get-Command "rebar.cmd" -ErrorAction SilentlyContinue) -eq $null) $env:Path += ";$rootdir\bin" } +# check for emilio; if not found, get it and build it +if ((Get-Command "emilio.cmd" -ErrorAction SilentlyContinue) -eq $null) +{ + Write-Verbose "==> emilio.cmd not found; bootstrapping..." + if (-Not (Test-Path "src\emilio")) + { + git clone --depth 1 https://github.com/wohali/emilio $rootdir\src\emilio + } + cmd /c "cd $rootdir\src\emilio && rebar compile escriptize" + cp $rootdir\src\emilio\emilio $rootdir\bin\emilio + cp $rootdir\src\emilio\bin\emilio.cmd $rootdir\bin\emilio.cmd + cmd /c "cd $rootdir\src\emilio && rebar clean" +} + # only update dependencies, when we are not in a release tarball if ( (Test-Path .git -PathType Container) -and (-not $SkipDeps) ) { Write-Verbose "==> updating dependencies"

Note this depends on cloudant-labs/emilio#3 being merged.

davisp · 2020-04-02T17:19:23Z

@wohali cloudant-labs/emilio#3 is merged.

iilyak · 2020-04-03T11:43:54Z

CI is failing with unrelated issue 😢

[2020-04-03T11:40:38.315Z] ==> couch_replicator (compile)

[2020-04-03T11:40:38.662Z] /home/****/workspace/****-cm1_PullRequests_PR-1944/src/couch_replicator/src/couch_replicator_httpc.erl:16: can't find include lib "ibrowse/include/ibrowse.hrl"

wohali · 2020-04-03T16:56:19Z

@iilyak

I also can't build your branch, either in the CI environment or locally. Here's what I'm doing:

rm -rf couchdb
git clone https://github.com/cloudant/couchdb
cd couchdb
git checkout integrate-emilio
./configure --with-curl
make dist

This fails in the same way as Jenkins is failing.

I don't get the same failure from apache/couchdb:master.

Also you still need to apply the diff I provided in comment.

Perhaps close this PR and reopen it by doing the branch off of apache/couchdb instead of cloudant/couchdb? Maybe it's because cloudant/couchdb:master is ~1400 commits behind, I don't know. @rnewson might have a better idea.

jaydoane · 2020-04-04T23:18:11Z

Possibly of interest: https://medium.com/@elbrujohalcon/are-formatters-better-than-linters-cbab91189be3

iilyak · 2020-04-15T11:37:27Z

@wohali: Thank you for your help with Windows part.

wohali reviewed Feb 26, 2019

View reviewed changes

configure Show resolved Hide resolved

wohali requested changes Jan 17, 2020

View reviewed changes

iilyak mentioned this pull request Mar 16, 2020

Use couch_rate application for couch_view #2662

Merged

4 tasks

wohali reviewed Apr 2, 2020

View reviewed changes

wohali mentioned this pull request Apr 2, 2020

Add Windows-compatible batch file cloudant-labs/emilio#3

Merged

wohali approved these changes Apr 2, 2020

View reviewed changes

iilyak force-pushed the integrate-emilio branch 2 times, most recently from 9cfc5e7 to fbf4710 Compare April 3, 2020 11:39

iilyak force-pushed the integrate-emilio branch 2 times, most recently from 97a7c7a to 7a11315 Compare April 15, 2020 10:58

Integrate emilio - erang linter

522627e

iilyak force-pushed the integrate-emilio branch from 7a11315 to 522627e Compare April 15, 2020 11:01

iilyak merged commit 7f24add into apache:master Apr 15, 2020

iilyak deleted the integrate-emilio branch April 15, 2020 11:36

iilyak mentioned this pull request Apr 15, 2020

Integrate emilio - erang linter #2789

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate emilio #1944

Integrate emilio #1944

iilyak commented Feb 26, 2019

wohali commented Feb 26, 2019

iilyak commented Jan 17, 2020

wohali commented Jan 17, 2020

wohali left a comment

wohali Jan 17, 2020

iilyak Jan 17, 2020

wohali Apr 2, 2020 •

edited

Loading

iilyak Apr 3, 2020

garrensmith commented Apr 2, 2020

wohali commented Apr 2, 2020

wohali commented Apr 2, 2020

garrensmith commented Apr 2, 2020 via email

wohali Apr 2, 2020

wohali left a comment

wohali Apr 2, 2020 •

edited

Loading

davisp commented Apr 2, 2020

iilyak commented Apr 3, 2020

wohali commented Apr 3, 2020

jaydoane commented Apr 4, 2020

iilyak commented Apr 15, 2020

Integrate emilio #1944

Integrate emilio #1944

Conversation

iilyak commented Feb 26, 2019

Overview

Testing recommendations

Related Issues or Pull Requests

Checklist

wohali commented Feb 26, 2019

iilyak commented Jan 17, 2020

wohali commented Jan 17, 2020

wohali left a comment

Choose a reason for hiding this comment

wohali Jan 17, 2020

Choose a reason for hiding this comment

iilyak Jan 17, 2020

Choose a reason for hiding this comment

wohali Apr 2, 2020 • edited Loading

Choose a reason for hiding this comment

iilyak Apr 3, 2020

Choose a reason for hiding this comment

garrensmith commented Apr 2, 2020

wohali commented Apr 2, 2020

wohali commented Apr 2, 2020

garrensmith commented Apr 2, 2020 via email

wohali Apr 2, 2020

Choose a reason for hiding this comment

wohali left a comment

Choose a reason for hiding this comment

wohali Apr 2, 2020 • edited Loading

Choose a reason for hiding this comment

davisp commented Apr 2, 2020

iilyak commented Apr 3, 2020

wohali commented Apr 3, 2020

jaydoane commented Apr 4, 2020

iilyak commented Apr 15, 2020

wohali Apr 2, 2020 •

edited

Loading

wohali Apr 2, 2020 •

edited

Loading