diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4ae4c31..2b065ab 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,6 +41,16 @@ jobs: with: repository: 'DefectDojo/django-DefectDojo' path: 'repotests/django-DefectDojo' + - uses: actions/checkout@v4 + with: + repository: 'bionomia/bionomia' + path: 'repotests/bionomia' + ref: '5ada8b5f4a5f68561a7195e2badc2f744dc4676e' + - uses: actions/checkout@v4 + with: + repository: 'OWASP/railsgoat' + path: 'repotests/railsgoat' + ref: 'c1e8ff1e3b24a1c48fcfc9fbee0f65dc296b49d9' - uses: coursier/cache-action@v6 - name: Set up JDK uses: graalvm/setup-graalvm@v1 @@ -62,6 +72,8 @@ jobs: ./atom.sh --remove-atom -o /tmp/py.atom -l python $GITHUB_WORKSPACE/repotests/DjanGoat -Dlog4j.configurationFile=log4j2.xml ./atom.sh --remove-atom -o /tmp/py2.atom -l python $GITHUB_WORKSPACE/repotests/django-DefectDojo -Dlog4j.configurationFile=log4j2.xml ./atom.sh --remove-atom -o /tmp/c.atom -l c $GITHUB_WORKSPACE/repotests/libexpat -Dlog4j.configurationFile=log4j2.xml + ./atom.sh --remove-atom -o /tmp/railsgoat.atom -l ruby $GITHUB_WORKSPACE/repotests/railsgoat -Dlog4j.configurationFile=log4j2.xml + ./atom.sh --remove-atom -o /tmp/bionomia.atom -l ruby $GITHUB_WORKSPACE/repotests/bionomia -Dlog4j.configurationFile=log4j2.xml ./atom.sh data-flow -o /tmp/java2.atom -l java $GITHUB_WORKSPACE/repotests/shiftleft-java-example -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/java.slices.json # ./atom.sh data-flow --remove-atom -o /tmp/juice2.atom -l js $GITHUB_WORKSPACE/repotests/juice-shop -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/juice.slices.json @@ -75,6 +87,8 @@ jobs: ./atom.sh usages -o /tmp/py2.atom -l python $GITHUB_WORKSPACE/repotests/DjanGoat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/py.usages.json ./atom.sh usages -o /tmp/py3.atom -l python $GITHUB_WORKSPACE/repotests/django-DefectDojo -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/py4.usages.json ./atom.sh usages -o /tmp/c2.atom -l c $GITHUB_WORKSPACE/repotests/libexpat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/c.usages.json + ./atom.sh usages --remove-atom -o /tmp/railsgoat2.atom -l ruby $GITHUB_WORKSPACE/repotests/railsgoat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/railsgoat2.usages.json + ./atom.sh usages --remove-atom -o /tmp/bionomia2.atom -l ruby $GITHUB_WORKSPACE/repotests/bionomia -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/bionomia2.usages.json env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index f5f663a..39db212 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -60,6 +60,16 @@ jobs: with: repository: 'awsdocs/aws-doc-sdk-examples' path: 'repotests/aws-doc-sdk-examples' + - uses: actions/checkout@v4 + with: + repository: 'bionomia/bionomia' + path: 'repotests/bionomia' + ref: '5ada8b5f4a5f68561a7195e2badc2f744dc4676e' + - uses: actions/checkout@v4 + with: + repository: 'OWASP/railsgoat' + path: 'repotests/railsgoat' + ref: 'c1e8ff1e3b24a1c48fcfc9fbee0f65dc296b49d9' - uses: coursier/cache-action@v6 - name: Set up JDK uses: actions/setup-java@v4 @@ -106,6 +116,8 @@ jobs: ./atom.sh parsedeps --remove-atom -o /tmp/py.atom -l python $GITHUB_WORKSPACE/repotests/DjanGoat -Dlog4j.configurationFile=log4j2.xml ./atom.sh --remove-atom -o /tmp/py2.atom -l python $GITHUB_WORKSPACE/repotests/django-DefectDojo -Dlog4j.configurationFile=log4j2.xml ./atom.sh --remove-atom -o /tmp/c.atom -l c $GITHUB_WORKSPACE/repotests/libexpat -Dlog4j.configurationFile=log4j2.xml + ./atom.sh --remove-atom -o /tmp/railsgoat.atom -l ruby $GITHUB_WORKSPACE/repotests/railsgoat -Dlog4j.configurationFile=log4j2.xml + ./atom.sh --remove-atom -o /tmp/bionomia.atom -l ruby $GITHUB_WORKSPACE/repotests/bionomia -Dlog4j.configurationFile=log4j2.xml ./atom.sh data-flow --remove-atom -o /tmp/java2.atom -l java $GITHUB_WORKSPACE/repotests/shiftleft-java-example -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/java.slices.json # ./atom.sh data-flow --remove-atom -o /tmp/juice2.atom -l js $GITHUB_WORKSPACE/repotests/juice-shop -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/juice.slices.json @@ -120,6 +132,8 @@ jobs: python -m json.tool $GITHUB_WORKSPACE/repotests/DjanGoat/openapi.generated.json ./atom.sh usages --remove-atom -o /tmp/py4.atom -l python $GITHUB_WORKSPACE/repotests/django-DefectDojo -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/py4.usages.json ./atom.sh usages --remove-atom -o /tmp/c3.atom -l c $GITHUB_WORKSPACE/repotests/libexpat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/c.usages.json + ./atom.sh usages --remove-atom -o /tmp/railsgoat2.atom -l ruby $GITHUB_WORKSPACE/repotests/railsgoat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/railsgoat2.usages.json + ./atom.sh usages --remove-atom -o /tmp/bionomia2.atom -l ruby $GITHUB_WORKSPACE/repotests/bionomia -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/bionomia2.usages.json ./atom.sh --remove-atom -o /tmp/java-sec-code.atom -l java $GITHUB_WORKSPACE/repotests/java-sec-code -Dlog4j.configurationFile=log4j2.xml -x --export-dir gml_exports if: runner.os != 'Windows' diff --git a/README.md b/README.md index 30ea443..d97ed46 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ atom -o app.atom -l java --export-atom --export-dir --with-data-dep - TypeScript - Python - PHP (Requires PHP >= 7.0. Supports PHP 5.2 to 8.3) -- Ruby (Requires Ruby 3.4.0. Supports Ruby 1.8 - 3.4.0 syntax) +- Ruby (Supports Ruby 1.8 - 3.3 syntax) ## Atom Specification diff --git a/ci/Dockerfile b/ci/Dockerfile index b55ee89..ee0e0c6 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -12,7 +12,7 @@ LABEL maintainer="appthreat" \ org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -v $HOME:$HOME -v $(pwd):/app:rw -it ghcr.io/appthreat/atom atom -o /app/app.atom -l java /app" ARG MAVEN_VERSION=3.9.9 -ARG RUBY_VERSION=3.4.0 +ARG RUBY_VERSION=3.4.1 ENV MAVEN_VERSION=$MAVEN_VERSION \ MAVEN_HOME="/opt/maven/${MAVEN_VERSION}" \ diff --git a/docs/docs/languages.md b/docs/docs/languages.md index cd6a918..0ad8857 100644 --- a/docs/docs/languages.md +++ b/docs/docs/languages.md @@ -14,4 +14,4 @@ title: Languages supported - TypeScript - Python - PHP (Requires PHP >= 7.0. Supports PHP 5.2 to 8.3) -- Ruby (Requires Ruby 3.4.0. Supports Ruby 1.8 - 3.4.0 syntax) +- Ruby (Supports Ruby 1.8 - 3.3 syntax) diff --git a/wrapper/nodejs/plugins/rubyastgen/Gemfile b/wrapper/nodejs/plugins/rubyastgen/Gemfile index 8e6a0f0..dd49a71 100644 --- a/wrapper/nodejs/plugins/rubyastgen/Gemfile +++ b/wrapper/nodejs/plugins/rubyastgen/Gemfile @@ -1,5 +1,7 @@ # frozen_string_literal: true +ruby ">=3.4.1" + source "https://rubygems.org" group :frontend do diff --git a/wrapper/nodejs/plugins/rubyastgen/Gemfile.lock b/wrapper/nodejs/plugins/rubyastgen/Gemfile.lock index 09b63f7..a42b9b1 100644 --- a/wrapper/nodejs/plugins/rubyastgen/Gemfile.lock +++ b/wrapper/nodejs/plugins/rubyastgen/Gemfile.lock @@ -14,14 +14,9 @@ GEM ast (~> 2.4.1) racc racc (1.8.1) - racc (1.8.1-java) PLATFORMS - java - mswin64 ruby - unknown - unknown x86_64-darwin-23 DEPENDENCIES @@ -29,5 +24,8 @@ DEPENDENCIES parser ruby_ast_gen! +RUBY VERSION + ruby 3.4.1p0 + BUNDLED WITH 2.6.2