Skip to content

Commit 4f72d08

Browse files
authored
Merge pull request #375 from github/rc/3.3
Merge rc/3.3 into main
2 parents f9f0fab + 62d25b6 commit 4f72d08

File tree

7 files changed

+26
-3
lines changed

7 files changed

+26
-3
lines changed

.codeqlmanifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ "provide": [ "*/ql/src/qlpack.yml",
1+
{ "provide": [ "ruby/.codeqlmanifest.json",
2+
"*/ql/src/qlpack.yml",
23
"*/ql/lib/qlpack.yml",
34
"*/ql/test/qlpack.yml",
45
"cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml",

docs/codeql/query-help/codeql-cwe-coverage.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ Note that the CWE coverage includes both "`supported queries <https://github.com
3333
java-cwe
3434
javascript-cwe
3535
python-cwe
36+
ruby-cwe

docs/codeql/query-help/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ View the query help for the queries included in the ``code-scanning``, ``securit
99
- :doc:`CodeQL query help for Java <java>`
1010
- :doc:`CodeQL query help for JavaScript <javascript>`
1111
- :doc:`CodeQL query help for Python <python>`
12+
- :doc:`CodeQL query help for Ruby <ruby>`
1213

1314

1415
.. pull-quote:: Information
@@ -33,5 +34,6 @@ For a full list of the CWEs covered by these queries, see ":doc:`CodeQL CWE cove
3334
java
3435
javascript
3536
python
37+
ruby
3638
codeql-cwe-coverage
3739

docs/codeql/query-help/ruby-cwe.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# CWE coverage for Ruby
2+
3+
An overview of CWE coverage for Ruby in the latest release of CodeQL.
4+
5+
## Overview
6+
7+
<!-- autogenerated CWE coverage table will be added below -->
8+

docs/codeql/query-help/ruby.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CodeQL query help for Ruby
2+
============================
3+
4+
.. include:: ../reusables/query-help-overview.rst
5+
6+
For shorter queries that you can use as building blocks when writing your own queries, see the `example queries in the CodeQL repository <https://github.com/github/codeql/tree/main/ruby/ql/examples>`__.
7+
8+
.. include:: toc-ruby.rst

ruby/extractor/src/main.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,12 @@ fn main() -> std::io::Result<()> {
7979
.with_target(false)
8080
.without_time()
8181
.with_level(true)
82-
.with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
82+
.with_env_filter(
83+
tracing_subscriber::EnvFilter::try_from_default_env()
84+
.unwrap_or(tracing_subscriber::EnvFilter::new("ruby_extractor=warn")),
85+
)
8386
.init();
84-
87+
tracing::warn!("Support for Ruby is currently in Beta: https://git.io/codeql-language-support");
8588
let num_threads = num_codeql_threads();
8689
tracing::info!(
8790
"Using {} {}",
File renamed without changes.

0 commit comments

Comments
 (0)