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.

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

Run rubocop with bundle exec #618

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ RUN bundle config set --local path 'vendor/bundle' && bundle install && gem clea

FROM $BASE_IMAGE

ARG GEM_FOLDER
ENV GEM_HOME=$GEM_FOLDER
ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH

RUN apk add --no-cache ruby ruby-etc ruby-dev ruby-irb ruby-rake ruby-io-console ruby-bigdecimal ruby-json \
openjdk17-jre \
bash
Expand Down
44 changes: 38 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ GEM
git_diff_parser (3.2.0)
globalid (1.2.1)
activesupport (>= 6.1)
graphql (2.3.6)
graphql (2.3.7)
base64
haml (6.3.0)
temple (>= 0.8.2)
Expand Down Expand Up @@ -143,7 +143,7 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.24.0)
minitest (5.24.1)
mocha (2.4.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
Expand All @@ -158,8 +158,18 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nokogiri (1.16.6-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm-linux)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86-linux)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
parallel (1.25.1)
parser (3.3.3.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -266,7 +276,7 @@ GEM
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.0)
rubocop-rails (2.25.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
Expand Down Expand Up @@ -313,7 +323,16 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (2.0.2-aarch64-linux-gnu)
sqlite3 (2.0.2-aarch64-linux-musl)
sqlite3 (2.0.2-arm-linux-gnu)
sqlite3 (2.0.2-arm-linux-musl)
sqlite3 (2.0.2-arm64-darwin)
sqlite3 (2.0.2-x86-linux-gnu)
sqlite3 (2.0.2-x86-linux-musl)
sqlite3 (2.0.2-x86_64-darwin)
sqlite3 (2.0.2-x86_64-linux-gnu)
sqlite3 (2.0.2-x86_64-linux-musl)
standard (1.39.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
Expand Down Expand Up @@ -342,7 +361,7 @@ GEM
syntax_tree (>= 2.0.1)
temple (0.10.3)
thor (1.3.1)
tilt (2.3.0)
tilt (2.4.0)
timeout (0.4.1)
turbo-rails (2.0.5)
actionpack (>= 6.0.0)
Expand All @@ -368,7 +387,20 @@ GEM
zeitwerk (2.6.16)

PLATFORMS
x86_64-darwin-23
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux
arm-linux-gnu
arm-linux-musl
arm64-darwin
x86-linux
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
actioncable
Expand Down Expand Up @@ -425,4 +457,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.5.7
2.5.14
2 changes: 1 addition & 1 deletion docs/description/Rails_LinkToBlank.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions docs/description/Rails_Validation.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion docs/description/description.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions docs/patterns.json
Original file line number Diff line number Diff line change
Expand Up @@ -9816,6 +9816,10 @@
"level": "Warning",
"category": "ErrorProne",
"parameters": [
{
"name": "Safe",
"default": "false"
},
{
"name": "ForbiddenMethods",
"default": [
Expand Down Expand Up @@ -10155,6 +10159,12 @@
"patternId": "Rails_WhereRange",
"level": "Warning",
"category": "ErrorProne",
"parameters": [
{
"name": "SafeAutoCorrect",
"default": "false"
}
],
"enabled": false
},
{
Expand Down
55 changes: 20 additions & 35 deletions src/main/scala/codacy/rubocop/Rubocop.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import com.codacy.tools.scala.seed.utils.CommandRunner
import play.api.libs.json._

import scala.io.Source
import scala.util.{Failure, Properties, Success, Try}
import scala.util.{Failure, Properties, Try}

object Rubocop extends Tool {
private val plugins: List[String] =
Expand Down Expand Up @@ -45,51 +45,36 @@ object Rubocop extends Tool {
files: Option[Set[api.Source.File]],
options: Map[Options.Key, Options.Value]
)(implicit specification: Tool.Specification): Try[List[Result]] = {

val cmd = getCommandFor(Paths.get(source.path), configuration, files, specification, resultFilePath)
CommandRunner.exec(cmd, Some(new File(source.path))) match {

case Right(resultFromTool) if resultFromTool.exitCode < 2 =>
parseResult(resultFilePath.toFile) match {
case s @ Success(_) => s
case Failure(e) =>
case Right(resultFromTool) =>
Try(parseResult(resultFilePath.toFile)).recover {
case e =>
val msg =
s"""
|Rubocop exited with code ${resultFromTool.exitCode}
|message: ${e.getMessage}
|stdout: ${resultFromTool.stdout.mkString(Properties.lineSeparator)}
|stderr: ${resultFromTool.stderr.mkString(Properties.lineSeparator)}
""".stripMargin
Failure(new Exception(msg))
|Rubocop exited with code ${resultFromTool.exitCode}
|message: ${e.getMessage}
|stdout: ${resultFromTool.stdout.mkString(Properties.lineSeparator)}
|stderr: ${resultFromTool.stderr.mkString(Properties.lineSeparator)}
""".stripMargin
List.empty[Result]
}

case Right(resultFromTool) =>
val msg =
s"""
|Rubocop exited with code ${resultFromTool.exitCode}
|stdout: ${resultFromTool.stdout.mkString(Properties.lineSeparator)}
|stderr: ${resultFromTool.stderr.mkString(Properties.lineSeparator)}
""".stripMargin
Failure(new Exception(msg))

case Left(e) =>
Failure(e)
}
}

private[this] def parseResult(filename: File): Try[List[Result]] = {
Try {
val resultFromTool = Source.fromFile(filename).getLines().mkString
Json.parse(resultFromTool)
}.flatMap { json =>
json.validate[RubocopResult] match {
case JsSuccess(rubocopResult, _) =>
Success(rubocopResult.files.getOrElse(List.empty).flatMap { file =>
ruboFileToResult(file)
})
case JsError(err) =>
Failure(new Throwable(Json.stringify(JsError.toJson(err))))
}
private[this] def parseResult(filename: File): List[Result] = {
val resultFromTool = Source.fromFile(filename).getLines().mkString
val json = Json.parse(resultFromTool)
json.validate[RubocopResult] match {
case JsSuccess(rubocopResult, _) =>
Success(rubocopResult.files.getOrElse(List.empty).flatMap { file =>
ruboFileToResult(file)
})
case JsError(_) =>
List.empty[Result] // Return an empty list in case of parsing errors
}
}

Expand Down